diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 17 | ||||
| -rw-r--r-- | src/i810.h | 5 | ||||
| -rw-r--r-- | src/i810_driver.c | 19 |
3 files changed, 33 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7656e02e..f824a747 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,11 +28,11 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -i810_drv_la_LTLIBRARIES = i810_drv.la -i810_drv_la_LDFLAGS = -module -avoid-version -i810_drv_ladir = @moduledir@/drivers +intel_drv_la_LTLIBRARIES = intel_drv.la +intel_drv_la_LDFLAGS = -module -avoid-version +intel_drv_ladir = @moduledir@/drivers -i810_drv_la_SOURCES = \ +intel_drv_la_SOURCES = \ brw_defines.h \ brw_structs.h \ sf_prog.h \ @@ -112,7 +112,7 @@ exa_wm_masknoca_prog.h: exa_wm_masknoca.g4a endif if DRI -i810_drv_la_SOURCES += \ +intel_drv_la_SOURCES += \ i810_dri.c \ i810_dri.h \ i830_dri.c \ @@ -123,3 +123,10 @@ endif EXTRA_DIST = \ packed_yuv_sf.g4a \ packed_yuv_wm.g4a + +install-data-local: install-intel_drv_laLTLIBRARIES + (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so) + +uninstall-local: + (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) + @@ -62,8 +62,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "common.h" #define I810_VERSION 4000 -#define I810_NAME "I810" -#define I810_DRIVER_NAME "i810" +#define I810_NAME "intel" +#define I810_DRIVER_NAME "intel" +#define I810_LEGACY_DRIVER_NAME "i810" /* HWMC Surfaces */ #define I810_MAX_SURFACES 7 diff --git a/src/i810_driver.c b/src/i810_driver.c index e7c85071..04166b78 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -384,6 +384,21 @@ int I830EntityIndex = -1; static MODULESETUPPROTO(i810Setup); +static XF86ModuleVersionInfo intelVersRec = { + "intel", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, + INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, + ABI_CLASS_VIDEODRV, + ABI_VIDEODRV_VERSION, + MOD_CLASS_VIDEODRV, + {0, 0, 0, 0} +}; + +_X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL }; + static XF86ModuleVersionInfo i810VersRec = { "i810", MODULEVENDORSTRING, @@ -521,7 +536,9 @@ I810Probe(DriverPtr drv, int flags) * driver, and return if there are none. */ if ((numDevSections = - xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0) { + xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 && + (numDevSections = + xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) { return FALSE; } |