Commit Graph

225 Commits

Author SHA1 Message Date
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
Keith Packard 3d3bf493a3 Intel driver configuration (only) changes for X server libpciaccess usage.
Detect whether the target X server uses libpciaccess, using it in the driver
compilation as necessary. This change means that utilities that used to use
libpciaccess will not do so unless the driver itself uses libpciaccess. Yes,
that could be fixed, but it doesn't seem that important.

This patch does not include any code changes necessary to actually have the
driver build against an X server using libpciaccess.
2007-08-26 22:27:34 -07:00
Brice Goglin 7431abee5f Define INTEL_VERSION_MAJOR/MINOR/PATCH using PACKAGE_VERSION_* 2007-08-07 09:13:00 +02:00
Dave Airlie 37652b6888 intel: oops I commited pixman local workaround - undo it 2007-07-17 14:03:21 +10:00
Dave Airlie e40f6a4923 intel: actually 2.3.1 should be good enough 2007-07-17 09:20:07 +10:00
Dave Airlie 1e169be25b intel: don't try and use TTM memory manager with old libdrm interface
I probably need to release a libdrm with this interface in it now..
2007-07-17 09:17:31 +10:00
Eric Anholt 3c552af65d Update documentation and bump driver version to 2.1.0. 2007-07-02 18:33:47 -07:00
Alan Coopersmith 6503eb4502 Add AM_PROG_CC_C_O to configure.ac
Clears automake-1.10 warning: src/bios_reader/Makefile.am:8: compiling
 `bios_dumper.c' with per-target flags requires `AM_PROG_CC_C_O' in
 `configure.ac'
2007-06-28 23:30:35 -07:00
Dave Mueller 66aa0e61e1 Bug #11171: Add support for the Ti TFP410 DVO TMDS transmitter. 2007-06-22 16:45:54 -07:00
Eric Anholt 6c29e0bae5 Improve the drm_i915_flip_t check. 2007-06-13 13:40:39 -07:00
Eric Anholt 420e41e792 Revert "Replace failure-prone configure test for fresh libdrm with a simple ifndef."
This reverts commit c2b130354a.

Sadly, a non-working DRM_IOCTL_I915_FLIP already existed.
2007-06-13 13:34:26 -07:00
Eric Anholt c2b130354a Replace failure-prone configure test for fresh libdrm with a simple ifndef. 2007-06-12 08:50:14 -07:00
Keith Packard 31bf269afe Update version to 2.0.0 2007-04-19 20:03:41 -07:00
Keith Packard cca3897690 Clean up 1.2 xserver build support.
Convert relative X server source path to absolute.  Check for local copies
of needed header files before building, rather than requiring server source.
Remove extra duplicate -I elements in AM_CFLAGS in sub directories.
2007-04-19 13:15:23 -07:00
Eric Anholt bf9771e971 Don't use extended regexps in sed when not necessary.
Some seds require a flag to enable extended regexps.
2007-04-09 15:26:05 -07:00
Brice Goglin 656fbd9525 Bug #10515: Fix module version number with more than one digit per field. 2007-04-09 13:06:55 -07:00
Eric Anholt d9d05b553c Bump version to 1.9.94 for 2.0 RC4. 2007-04-03 00:15:05 -07:00
Eric Anholt 768821bd38 Bump version to 1.9.93 for 2.0RC3. 2007-03-26 21:27:54 -07:00
Eric Anholt 9fbef2de9e Bump to 1.9.92 for RC2. 2007-03-14 12:34:34 -07:00
Michel Dänzer ba55ff15df Fix attempt to flip pages back to normal when the last 3D window disappears.
When this succeeds, 2D rendering does not have to be synchronized to back
buffers until the next 3D window appears.
2007-03-12 13:01:00 +01:00
Michel Dänzer 6c299aea8e Merge remote branch 'origin/master' into i830-pageflip
Conflicts:

	src/i830_display.c
	src/i830_driver.c
2007-03-06 09:28:52 +01:00
Michel Dänzer 330815251d Merge remote branch 'origin/master' into i830-pageflip
Conflicts:

	src/i830.h
	src/i830_dri.c
	src/i830_dri.h
	src/i830_driver.c
	src/i830_memory.c
	src/i830_xaa.c
2007-03-05 13:05:20 +01:00
Keith Packard af565872a4 Set version number to 2.0 RC1 (1.9.91). 2007-03-04 21:20:33 -08:00
Eric Anholt fc7d43c2b6 Use -f for ln of server source. Otherwise, changing paths didn't take effect. 2007-03-04 17:18:48 -08:00
Eric Anholt 1f5d1666c8 Add a non-installed command line tool using libpciaccess to dump registers.
This reuses the i830_debug.c code, so we can run that from the console or from
the BIOS-based X server to debug some remaining issues.
2007-02-28 16:27:55 -08:00
Keith Packard 5a1a04649c Make distcheck fixes. Distribute all sources needed even for older servers.
Always allow (but do not require) link to server sources so that needed
files can be included in the generated tar files.

Add remaining .g4a files and assembly output to distributed file lists.
2007-02-17 17:01:04 -08:00
Keith Packard 0ca926e63c Check for presence of xf86Modes.h file.
xf86Modes.h file signals the availability of the new modes API in the
server; use that instead of counting on X server version numbers.
Also, finish eliminating use of local copies of those header files.
2007-02-16 02:19:10 -08:00
Keith Packard 8e7bc4b1f9 Use server sources for crtc/output generic code.
As sources for these have been merged to the server, use them from the
server source code instead of keeping copies in this driver.
2007-02-15 11:17:53 -08:00
Michel Dänzer 3bd8edb95f Revive i830 page flipping support.
Use the damage layer directly instead of via shadowfb.
2007-02-14 12:57:35 +01:00
Keith Packard 785a59ead0 Rename driver from i810 to intel. Permit old name for compatibility.
Driver installs as intel_drv.so with symlink to i810_drv.so to ensure
existing configurations continue to work. Updated manual page to reflect
name change and add attributions for recent work.
2007-02-01 22:48:44 -08:00
Keith Packard 2bb9bb951e Typo disabled new DRI MM on all chips.
Detection for new DRI MM wasn't converted to #define correctly because of a
typo.
2007-01-02 14:04:10 -08:00
Keith Packard 237847007a Make driver build and run on Xorg 7.1. Delay DSP*BASE setting until last.
Autodetect libdrm version, disable new memory manager on older libraries.
Move new M_T_ defines from i830.h to i830_xf86Crtc.h. Add many system
headers to define functions. Use i830PipeSetBase at end of mode setting
code to set DSP*BASE and flush changes. Don't duplicate PipeSetBase call
from screen init function. Make initial RandR configuration code usable on
older versions of extension so the server doesn't start in a panning mode.
Use xfree instead of free in i830_tv.c.
2007-01-02 00:09:35 -08:00
Eric Anholt c7083a6f30 Add WIP CH7017 LVDS driver. This is disconnected because it's untested. 2006-12-28 12:16:48 -08:00
Eric Anholt 778db49616 Add WIP IVCH (i82807aa) driver.
It is not currently hooked up as it hasn't been tested.  The hardware that this
was written for decided to stop working.
2006-12-28 11:45:52 -08:00
Eric Anholt 9948d8377d Merge branch 'master' into modesetting
Conflicts:

	src/i830.h
	src/i830_cursor.c
	src/i830_dri.c
	src/i830_driver.c
	src/i830_video.c
2006-11-16 19:47:24 -08:00
Thomas Hellstrom c0ee50c4ee Add support for the new DRM memory manager.
Some code are duplicated with the new libdrm.
Once this code has been released with xserver,
it can be removed.

See the man page for new options and backwards
3D driver compatibility.
2006-10-27 19:13:33 +02:00
Alan Hourihane adae75ef2f Make VIDEO_DEBUG into a configure option 2006-10-13 17:10:27 +01:00
Alan Hourihane 1d4cfaa391 Bump to 1.7.2 2006-10-13 13:55:10 +01:00
Alan Hourihane 334aa062c3 Bump to 1.7.1 2006-10-13 12:59:30 +01:00
Alan Hourihane 2b9bdd8a40 bump to 1.7.0 2006-10-02 11:12:23 +01:00
Eric Anholt 6ea16bf6b0 Merge branch 'master' into modesetting
This reverts most of the mergedfb code.  This will instead be done in device-
independent RandR code.

Conflicts:

	src/Makefile.am
	src/i810_driver.c
	src/i810_reg.h
	src/i830.h
	src/i830_cursor.c
	src/i830_driver.c
	src/i830_modes.c
	src/i830_video.c
2006-09-27 16:38:01 -07:00
Keith Packard f6500e94fe Update driver for RandR 1.2 X server API.
This is not entirely what I'd like to see, but it's at least functional.

Limitations:
	Can't disable/enable crtcs
	Can't move outputs on/off crtcs

But, it does handle monitor hot-plug, detecting changes in VGA and SDVO
status on-the fly. Which makes for good demo material.
2006-09-20 22:38:55 -07:00
Eric Anholt 1e6e288b88 Add a check for intel-gen4asm, and rules to compile {wm,sf}_prog.h using it.
This adds assembly source for the two programs used in the textured video
implementation on the 965, which should make them easier to modify in the
future. The compiled versions are also included, so that intel-gen4asm isn't a
build requirement for people that aren't modifying these programs.

There are minor differences in the compiled versions of these programs compared
to their previous versions which were compiled with a different tool.  I
believe the changes should be harmless, and video continues to work on my
system.
2006-09-01 16:47:17 -07:00
Eric Anholt 4cfed93df6 Bump to 1.6.5 for release. 2006-08-10 15:41:32 -07:00
Eric Anholt 975e602610 Bug #7829: Fix reported driver version.
The driver now reports itself as the PACKAGE_VERSION from autoconf.  The DRI
DDX -> client interface version is dissociated from this so that we can do
appropriate major/minor versioning of the interface that's not tied to the
package version.  Bumped the i830 ddx dri version patchlevel to note the
fix in the previous commit.
2006-08-10 13:49:43 -07:00
Eric Anholt bb6080735e Bump to 1.6.4 for release. 2006-08-09 12:21:16 -07:00
Alan Hourihane bb65a4dc55 bump to 1.6.3 2006-08-08 14:51:18 +01:00
Alan Hourihane 37644293da check for xineramaproto 2006-08-08 14:42:32 +01:00
Alan Hourihane 8e5844bbf9 bump to 1.6.2 to indicate mergedfb support 2006-08-08 11:43:10 +01:00
Alan Hourihane b919db75d2 Bump to 1.6.1 2006-07-26 09:07:19 +01:00
Eric Anholt df333cc9a8 Initial add of DVO support code. Probes my sil164.
This is a mostly-untested merge of airlied's work.  The I2C modules are intended
to be moved into the core server or a separate driver module when they're
functional and we're happy with the API.
2006-07-07 13:41:33 -07:00
Eric Anholt 21dc3edfc4 Merge branch 'master' into modesetting
Conflicts:

	src/i830.h
2006-06-26 15:06:42 +02:00
Eric Anholt 5111b88348 Turn on extra warning flags for GCC, and clean up the resulting fallout. 2006-06-26 14:53:10 +02:00
Eric Anholt 786ee3df17 Add a standalone program for parsing VBT. 2006-04-16 13:05:35 -05:00
Keith Packard c26f0737e2 Merge in master to modesetting 2006-04-10 19:41:41 -07:00
Adam Jackson 692a4a4baf Bump to 1.6.0. 2006-04-10 11:27:25 -07:00
Eric Anholt 2538cbeb50 Enable -Wall on GCC, and do a cleanup of existing warnings. 2006-04-06 15:55:05 -07:00
Alan Hourihane ab4c2f3bf4 Check the version of shadow being used and turn off rotation if it isn't the
right one.
Bump the Xvideo resolution support from 1920x1080 to 1920x1088.
2006-03-03 16:27:37 +00:00
Alan Hourihane d8d7490809 Bump version to 1.5.0.0
Add Intel 945GM support
Add RandR rotation support (full 3D acceleration, HWcursor & Xvideo rotated too)
Remove shadow framebuffer rotation code
Add a new LinearAlloc option to allow more offscreen memory to be allocated
for XVideo applications. This allows HDTV movies to be played via Xvideo.
2006-01-24 15:20:34 +00:00
Kevin E Martin 919d36b671 Update package version for X11R7 release. 2005-12-21 02:30:00 +00:00
Kevin E Martin 1c51ff5c65 Update package version number for final X11R7 release candidate. 2005-12-15 00:24:17 +00:00
Kevin E Martin 15df421534 Update package version number for X11R7 RC3 release. 2005-12-03 05:49:33 +00:00
Kevin E Martin c50cd5a7f5 Remove extraneous AC_MSG_RESULT. 2005-12-02 02:16:08 +00:00
Adam Jackson da2c00c0e8 Bump libdrm dep to 2.0. 2005-11-30 18:47:54 +00:00
Adam Jackson ca36f1da4e Only build dlloader modules by default. 2005-11-29 23:29:59 +00:00
Kevin E Martin e62939e30e Update pkgconfig files to separate library build-time dependencies
from application build-time dependencies, and update package deps
to work with separate build roots.
2005-11-19 07:15:38 +00:00
Kevin E Martin a600e89a15 Update package version number for X11R7 RC2 release. 2005-11-09 21:15:15 +00:00
Kevin E Martin f73c23b4c5 Update pkgcheck depedencies to work with separate build roots. 2005-11-01 15:08:53 +00:00
Kevin E Martin 53c122fa16 Update package version number for RC1 release. 2005-10-19 02:48:03 +00:00
Alan Coopersmith 0586dbe1c5 Use sed & cpp to substitute variables in driver man pages 2005-10-17 00:09:03 +00:00
Søren Sandmann Pedersen bd48e0531a - For all drivers that have a <driver>.sgml file, add code in their build
system to build the README file at make dist time

- in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
  will check if the required tools and files exist, and if so set a
  conditional.

- util/modular/symlink.sh
  - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
  - Add all the README.<driver> to the list of excluded files

- xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes
  to make it spew less warnings when the text file is built.
2005-10-03 21:22:07 +00:00
Eric Anholt 76033c2c88 Bug #4458: Check for the xvmc proto package, since it's required to build these.
(Joshua Baergen)
2005-09-15 06:04:59 +00:00
Dave Airlie 5fc5f02d76 Add i810 XvMC support, it passes distcheck for me. 2005-08-29 12:06:13 +00:00
Kevin E Martin 1561ec3ca4 Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n
  to reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
2005-07-29 21:22:43 +00:00
Søren Sandmann Pedersen d165b7dc4e Add xf86driproto to dependencies for drivers with DRI support. Patch from
Donnie Berkholz
2005-07-27 21:23:29 +00:00
Søren Sandmann Pedersen 09e871b1b4 Build system for i810 2005-07-26 00:41:42 +00:00