diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-06-30 16:55:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-02 14:43:01 +1000 |
| commit | 1782ce28953184776c90eb1255208a3e0ad245f0 (patch) | |
| tree | df4bdd3c4e1ff58a4890d29e3998506745954419 /src/Makefile.am | |
| parent | ac4bd24a66c1bdda0293f770a3f891e2b88cc8ee (diff) | |
radeon: add KMS support (still disabled)
This adds DRI2 + KMS + driver pixmaps support to the driver.
I've decided to just do a completely separate KMS driver file
instead of hacking the crap out of radeon_driver.c. So now
I do the KMS check in radeon_probe.c time and set the DDX
pointed up to a completely different set at this stage.
This avoids a lot of if (kms) type crap in the code at
the expense of making sure we make changes to both files
if necessary.
This code is still disabled in configure.ac as I broke EXA composite
rendering somehow in KMS mode
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1864f96e..421d1636 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -radeon_drv_la_LIBADD = +radeon_drv_la_LIBADD = $(LIBDRM_RADEON_LIBS) if DRI RADEON_DRI_SRCS = radeon_dri.c @@ -65,6 +65,10 @@ XMODE_SRCS=\ modes/xf86Rotate.c \ modes/xf86DiDGA.c +if XF86DRM_MODE +RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c +endif + if USE_EXA RADEON_EXA_SOURCES = radeon_exa.c r600_exa.c r6xx_accel.c r600_textured_videofuncs.c r600_shader.c endif @@ -95,7 +99,8 @@ radeon_drv_la_SOURCES = \ radeon_textured_video.c radeon_pm.c \ radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \ $(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \ - $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c + $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c \ + $(RADEON_KMS_SRCS) if XMODES radeon_drv_la_SOURCES += \ |