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/radeon_accel.c | |
| 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/radeon_accel.c')
| -rw-r--r-- | src/radeon_accel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 5e24683d..79052a15 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -1131,8 +1131,10 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn) if (info->directRenderingEnabled) { drm_radeon_sarea_t *pSAREAPriv; - pSAREAPriv = DRIGetSAREAPrivate(pScrn->pScreen); - pSAREAPriv->ctx_owner = DRIGetContext(pScrn->pScreen); + if (!info->kms_enabled) { + pSAREAPriv = DRIGetSAREAPrivate(pScrn->pScreen); + pSAREAPriv->ctx_owner = DRIGetContext(pScrn->pScreen); + } RADEONInit3DEngineCP(pScrn); } else #endif |