Commit Graph

225 Commits

Author SHA1 Message Date
Gaetan Nadon 41784e15d3 config: remove dead LINUXDOC macro usage
This module does not generate LINUXDOC documentation.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-02-06 11:03:02 -05:00
Carl Worth 0910351464 configure.ac: Bump version to 2.10.0.
In preparation for the 2.10.0 release.
2010-01-04 14:20:11 -08:00
Gaetan Nadon 25a6c8dfae configure.ac: use backticks rather than $() for cmd subs
Use "$PKG_CONFIG" rather than hard coded "pkg-config"

Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2009-12-28 15:17:11 -05:00
Carl Worth 2c142e421e Update version to 2.9.99.902.
For the second release-candidate snapshot in preparation for 2.10.
2009-12-10 15:25:44 -08:00
Kristian Høgsberg 8438372dcc Require libdrm 2.4.16
Needed for drmGetDeviceNameFromFd().
2009-12-03 14:39:43 -05:00
Carl Worth 813a910d7e configure.ac: Bump version to 2.9.99.901.
In preparation for a new snapshot.
2009-11-30 19:48:05 -08:00
Gaetan Nadon 12c4a22dd0 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
2009-11-14 09:23:55 -05:00
Gaetan Nadon ad40309324 Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
2009-11-14 09:23:55 -05:00
Eric Anholt dbb68168dc Revert "configure: make --disable-dri work even if the server supports DRI"
This reverts commit a851139c21.
It broke the build, and I don't see why we should be supporting this
anyway.

Conflicts:

	configure.ac
	src/Makefile.am
2009-11-05 16:02:02 -08:00
Rémi Cardona cbcfb71174 configure: drop some more cruft
DEBUGFLAGS wasn't used anywhere and the configure switch is useless.
"CFLAGS=-g ./configure" does the same thing and actually works.

PKG_CHECK_MODULES already calls AC_SUBST, no need to do it twice.

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-05 16:58:35 +01:00
Rémi Cardona 3c0a43b24c configure: use CWARNFLAGS from xorg-macros.m4
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-05 16:58:35 +01:00
Rémi Cardona a851139c21 configure: make --disable-dri work even if the server supports DRI
XF86DRI is defined by the SDK so not defining it here just breaks the
build. Define HAVE_DRI instead to avoid collisions.

Note: DRI2 is still enabled/disabled entirely by SDK defines.

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-05 16:58:34 +01:00
Rémi Cardona 07e0b2cff6 configure: group system header checks at the top
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-05 16:58:34 +01:00
Rémi Cardona 0401a4c314 configure: check for libdrm and libpciaccess earlier
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-11-05 16:58:34 +01:00
Eric Anholt 3e8f2eae3a XVMC: Use XCB DRI2 instead of cargo-culting our own copy of Xlib stuff. (v2)
v2: Incorporate comments from Jamey on device name handling and extension
detection.
2009-10-19 10:36:30 -07:00
Eric Anholt 1556c62e03 Replace dolt and shave with relying on current autotools. 2009-10-08 17:50:41 -07:00
Chris Wilson 03e8e64f86 Complete the removal of UMS build support
Eric missed removing the now dead references to the deleted subdirectories
in configure.ac with commit b9b159c

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-10-07 22:15:37 +01:00
Carl Worth 2841a4cd8c Increment version to 2.9.0
And add a reminder to RELEASING that the incremented version number
needs to be committed, (since I forgot to do this with 2.8.99.902).
2009-09-28 20:03:39 -07:00
Carl Worth a92bbcc949 Increment version to 2.8.99.902 2009-09-22 17:08:23 -07:00
Carl Worth efbcf29dd1 Update version to 2.8.99.901 for snapshot. 2009-09-09 09:32:48 -07:00
Jesse Barnes 1fc3f467ab Add KMS only build flag
Rather than refactoring all our init code only to have it go away when
we remove UMS, this patch adds a build time flag to allow the driver to
assume KMS support.

With this flag active, the driver will not request that I/O or MEM be
enabled at probe time, which can allow the server (if other drivers also
cooperate) to run as a non-root user.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2009-08-25 09:48:10 -07:00
Xiang, Haihao 7684adaa37 Check the version of intel-gen4asm tool in configure.ac 2009-07-24 10:47:28 +08:00
Carl Worth 840a787a19 Merge branch '2.8' 2009-07-20 23:00:06 -07:00
Carl Worth 5d50a949b3 Increment version number to 2.8.0 for release. 2009-07-20 22:59:37 -07:00
Peter Hutterer 0a4c4c5fe8 Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.

SHM is now shm.h instead of shmstr. Requires definition of ShmFuncs that's
not exported by the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-07-18 12:10:18 +10:00
Carl Worth 82905c7c0b Increment version to 2.7.99.902 2009-07-13 05:29:49 -07:00
Zhenyu Wang 9fb34012f6 Add new compiled shader program for IGDNG
Also check intel-gen4asm tool here for new -g option, which is
required to compile new programs.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2009-06-30 11:12:12 +08:00
Zhenyu Wang 488acc4595 Move shader programs under its own subdirectory
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
2009-06-30 11:12:12 +08:00
Julien Cristau 6d062e9e9f Fix xvmc build
If we don't find xext.pc, disable xvmc instead of failing configure
Also add dependencies on xfixes and dri2proto (src/xvmc/dri2.h includes
<X11/extensions/Xfixes.h> and <X11/extensions/dri2tokens.h>).
2009-06-11 17:51:38 +02:00
Carl Worth 9d3c3b056c Increment version to 2.7.99.901
This is the first release candidate for 2.8.0
2009-06-10 15:30:45 -07:00
Xiang Hai hao b622860429 DRI2 for XvMC 2009-05-18 17:12:30 +08:00
Zou Nan hai 50c10ededb Merge branch 'master' into xvmc-vld 2009-05-18 17:11:28 +08:00
Jesse Barnes ebe05200df Add --enable-debug flag to configure
Defaults to enabled.
2009-05-15 08:50:17 -07:00
Keith Packard 04772b6c09 If DRM can't figure out which pipe to sync on, then don't sync at all.
Syncing to the wrong pipe can wedge the hardware if the exclusion area is
larger than the vtotal

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-14 17:01:54 -07:00
Arkadiusz Miśkiewicz a8a771a853 Restore CFLAGS after tests.
Reverts single line of broken commit e5133a94dc.

Signed-off-by: Eric Anholt <eric@anholt.net>
2009-05-04 11:05:20 -07:00
Eric Anholt c231b41f3f Remove checks for xf86RotateFreeShadow, introduced in server 1.4. 2009-04-27 17:06:00 -07:00
Eric Anholt e5133a94dc unifdef LIBPCIACCESS and XSERVER_LIBPCIACCESS.
Depending on new server means these are always present.
2009-04-27 17:05:59 -07:00
Eric Anholt 1784efc1f0 Remove XF86DRM_MODE.
We now depend on server 1.6 and current libdrm, so no need to ifdef it.
2009-04-27 17:05:59 -07:00
Eric Anholt 30c226eeb3 Remove DRI1 support.
This was blocked on wide distribution of X Server 1.6 (now in the current or
next version of major distributions) and solutions for a couple of significant
architectural problems (vblank sync and frontbuffer rendering, which we now
have code or good plans for).

This includes disabling XVMC which is DRI1-only currently.
2009-04-27 17:05:55 -07:00
Eric Anholt 47591334a1 Remove pre-server-1.5 support. 2009-04-27 16:50:34 -07:00
Julien Cristau 84f69081ab Require xserver 1.3
I don't think anyone tests this against an old server anymore.

Signed-off-by: Eric Anholt <eric@anholt.net>
2009-04-21 15:25:58 -07:00
Carl Worth 2e3b95ed01 Increment version to 2.7.99.1
This is the number we want for any development snapshots along
what will eventually become 2.8.0. (Once we get to 'release
candidates' we'll bump this up to 2.7.99.901.)
2009-04-15 18:54:19 -07:00
Jesse Barnes 51cf8a453c Require libdrm 2.4.6 for GTT unmap support
Need the new functions available.
2009-03-30 11:27:56 -07:00
Zhenyu Wang 91886f82a1 xvmc: move 965 mc media programs to shader/mc directory
Also include some missed g4i files in Makefile.am, fix shader build.
2009-03-26 10:51:05 +08:00
Zou Nan hai ebcb64fdc8 XvMC VLD extension support for G4X 2009-03-25 16:11:33 +08:00
Eric Anholt d9dbdb3255 Add shave support, enabled by default.
This cuts down build system noise so that warnings are more visible.  The
old style output can be reenabled for build system debugging using
"make V=1", or --disable-shave at configure time.
2009-03-13 16:15:44 -07:00
Eric Anholt 22dc9a5580 Fix UXA for server 1.4. 2009-02-26 14:20:42 -08:00
Eric Anholt 0621ba12a3 uxa: Ask for BOs ready for rendering for pixmaps.
The assumption is that we're almost always accelerating our drawing to
new pixmaps (fill, copy, etc.).
2009-02-21 10:03:22 -08:00
Owain G. Ainsworth c7db320110 Remove the pageflipping infrastructure.
It was broken on current kernels, and deprecated anyway.
2009-01-20 12:11:01 -05:00
Eric Anholt fc46cb6403 Fix libdrm version number requirement regression that got spammed in. 2009-01-17 12:47:53 -08:00
Dave Airlie 1459f794e2 intel: fix DRI2 should be DRI_DRI2 2009-01-17 22:14:26 +10:00
Eric Anholt 934008a2cb Always enable KMS if server's new enough, and remove option.
The API should be stable at this point, and we don't want to allow mistakes.
2009-01-06 11:20:08 -08:00
Eric Anholt 8464fc285d Rely on libdrm 2.4.3 and stop checking for xf86drmMode.h. 2008-12-29 09:51:45 -08:00
Peter Alfredsen 74bc420940 xvmc: fix up needed libs 2008-12-19 08:12:07 +08:00
Zhenyu Wang df01d8f079 Change master version to 2.6.99.1 2008-12-04 16:12:05 +08:00
Julien Cristau b156b3165e Don't unconditionally define DRI2
xorg-server.h will define it if the server has dri2 support.
2008-12-03 22:04:16 -08:00
Eric Anholt 00ae7a571b UXA: Add support for tiled front/back/depth by cutting over to the GTT map. 2008-12-02 13:08:23 -08:00
Eric Anholt 34d54db945 Remove DRI_MM defines which are always true now. 2008-12-02 13:01:56 -08:00
Kristian Høgsberg ee87f7becc Merge commit 'origin/master' into dri2
Conflicts:
	src/i830_dri.c
	src/i830_driver.c
	src/i830_memory.c
2008-11-17 12:26:38 -05:00
Dave Airlie ee3df629ea Default kernel mode setting to off, add configure flag to enable
Should help avoid unpleasantness.
2008-10-20 18:46:49 -07:00
Kristian Høgsberg 282f51c3f0 Merge commit 'origin/master' into HEAD 2008-10-14 23:13:40 -04:00
Eric Anholt 3a4151b69d Fix driver build against server 1.4.2.
This disables UXA and DRM modesetting pre-1.5, due to privates handling
issues.
2008-10-06 17:26:43 -07:00
Jesse Barnes ffcbbb071f Merge branch 'master' into xf86-video-intel-2.5-branch 2008-09-30 16:59:35 -07:00
Jesse Barnes bf8a3ffeaa Revert "Use -Werror by default"
This reverts commit f315e9d1ad.  The world
isn't ready for a warning free build.
2008-09-30 16:59:02 -07:00
Jesse Barnes 1eb46d055b Merge branch 'master' into xf86-video-intel-2.5-branch 2008-09-30 12:54:27 -07:00
Jesse Barnes f315e9d1ad Use -Werror by default 2008-09-30 12:07:52 -07:00
Kristian Høgsberg fd6a9ca5b5 Add DRI2 support. 2008-08-29 14:31:02 -04:00
Jesse Barnes 94a86fa51a Fix UXA build for distcheck
Was missing proper path info in CFLAGS.
2008-08-25 16:59:56 -07:00
Jesse Barnes 1c224f72d5 Fix UXA build for distcheck
Was missing proper path info in CFLAGS.
2008-08-25 16:59:03 -07:00
Jesse Barnes 09a235af0f Update version to 2.4.97 for first 2.5 test release 2008-08-25 16:38:17 -07:00
Jesse Barnes 8e3243b8e5 Update version to post-2.5 2008-08-25 16:37:34 -07:00
Jesse Barnes 0de8ca3630 Merge branch 'master' into modesetting-gem
Conflicts:

	configure.ac
2008-08-20 12:11:00 -07:00
Julien Cristau 5eccb5ec7e Don't skip the checks for DRI headers with --enable-dri 2008-08-20 15:33:59 +08:00
Jesse Barnes 173b909a71 Make it actually build the kernel stuff if possible
Fixup the kernel stuff to have a slightly better chance of working.  Still need
to fixup the EXA pixmap functions.
2008-08-08 18:11:13 -07:00
Jesse Barnes b1aef6f63c Initial port of kernel modesetting from old intel-kernelmode branch
Thanks airlied!
2008-08-08 11:54:18 -07:00
Keith Packard 59774e9aca Add UXA - the unified memory acceleration architecture.
This eliminates the cost of EXA migration management while providing full
pixmap allocation control to the driver. The goal is to make something
useful for UMA drivers.
2008-08-05 15:29:50 -07:00
Jesse Barnes 4f1f308542 Merge branch 'master' into drm-gem
Conflicts:

	src/i830_driver.c
2008-08-05 13:02:47 -07:00
Eric Anholt 978abf84e8 Bump version number past the 2.4 stable branch. 2008-07-18 14:58:17 -07:00
Carl Worth a6ad50402c Merge branch 'master' into drm-gem
Conflicts:

	configure.ac
	src/reg_dumper/Makefile.am
2008-07-17 00:38:54 -07:00
Dave Airlie 55678c64bc intel: fix drm check.
The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed
with GEM etc.
2008-07-01 18:51:18 +10:00
Eric Anholt f07acbdaac Require libdrm 2.4.0 always since we need the bufmgr code.
This lets us remove a lot of conditional compile stuff in the DRI case, as
if we're doing DRI and have 2.4.0, we can rely on GEM ioctls existing.
2008-06-12 13:47:35 -07:00
Keith Packard c81050c005 Merge commit 'origin/master' into drm-gem 2008-05-17 23:26:14 -07:00
Keith Packard 9c9a5d0e48 Add check for GEM, use that to enable driver GEM support 2008-05-17 23:23:17 -07:00
Rémi Cardona e9532f3abf Add glproto to DRI dependencies 2008-05-14 14:52:37 +08:00
Zhenyu Wang c81a4687fc Only check xvmc lib when xvmc is enabled.
Don't check xvmc lib if user has already wanted to disable it.
Fix fdo bug #15762.
2008-05-06 13:52:22 +08:00
Keith Packard fff17b9d1b Use new xf86RotateFreeShadow function to clean up shadow buffers.
This simply moves code from the driver up into the X server; use it where
available.
2008-04-29 10:32:14 -07:00
Keith Packard c3fb62df4e Add a kludge-around to fix cd/wt bits in fb ptes on linux.
Mmap from /sys/devices/pci* on linux forces the cache-disable and
write-through bits, which turns our write-combining map into an
uncached-map, seriously impacting performance. It turns out that a bug in
mprotect allows us to fix this by disabling access to those pages and then
immediately re-enabling them.
2008-04-17 10:05:00 -07:00
Eric Anholt bd41d2bb85 Add dolt to speed up compile time and reduce insanity.
Hopefully some day we can be rid of libtool entirely.
2008-04-10 11:39:59 -07:00
Julien Cristau c1a2bc357f Don't try to build XvMC if DRI is disabled
Instead of failing the build, don't even try unless --enable-xvmc was used.
2008-03-24 13:29:24 +08:00
Joerg Sonnenberger e8da1a5418 Fix DRI config for NetBSD
Reported by Joerg. This does a little more clearn up.
2008-03-21 11:41:49 +08:00
Zhenyu Wang 31654f52b0 Merge branch 'master' into xvmc
Conflicts:

	man/intel.man
	src/i830_driver.c
2008-03-11 14:37:41 +08:00
Dave Airlie 13ae79b415 fixup pciaccess version detect 2008-03-07 08:04:37 +10:00
Julien Cristau 6935c732c3 Look for src/{modes,parser} in $srcdir, not in objdir
This makes the detection work in case configure is run from another directory.
2008-02-26 11:27:10 +01:00
Julien Cristau 94a18fa1f8 Don't build reg_dumper if we don't have pciaccess 0.10.0
The pci_device_map_range() function was added in libpciaccess 0.10.0, and
is used by the reg_dumper tool.  Don't try to build it if we have an older
libpciaccess.
Also make sure that util-macros >= 1.1.3 is available when running autoconf,
because it's required for the PACKAGE_VERSION_* macros.
2008-01-24 15:24:40 +01:00
Zhenyu Wang 216ad73987 xvmc: add disable xvmc build support
Move xvmc source files under XVMC config
2007-12-20 13:39:32 +08:00
Eric Anholt 0e554e6dd4 Remove extra have_libpciaccess=no that broke tools build with old servers. 2007-12-04 10:40:17 -08:00
Jesse Barnes 04b60b6d34 Bump version to 2.2.0 2007-11-15 11:49:53 -08:00
Jesse Barnes 177924e879 Bump driver version to 2.1.99 in preparation for 2.2 release 2007-11-08 18:16:48 -08:00
Eric Anholt 79636b8c77 Bump pciaccess version requirement for new API usage. 2007-10-17 17:10:46 -07:00
Eric Anholt 219354af21 Restore building of pciaccess-based tools even if the server doesn't use it. 2007-10-01 16:09:13 -07:00