diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-06-21 13:55:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-06-21 13:55:15 +1000 |
| commit | ea37d24b1b6d4cbcf73e680846de25b72af216e3 (patch) | |
| tree | acabce2070f85f676e77fb5d3cda31e531b54c80 | |
| parent | fdd8ecafd054f65842351aee6ee6fba7af6613b2 (diff) | |
radeon: fix support for 1.9 server master.
This moves pixmap and mode set into CSR where its allowed. Should work fine on
old servers also.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/radeon_kms.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 3f772073..a28f5e6c 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -159,6 +159,11 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) return FALSE; pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS; + if (!drmmode_set_desired_modes(pScrn, &info->drmmode)) + return FALSE; + + drmmode_uevent_init(pScrn, &info->drmmode); + if (info->r600_shadow_fb) { pixmap = pScreen->GetScreenPixmap(pScreen); @@ -865,9 +870,6 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen, } pScrn->pScreen = pScreen; - if (!drmmode_set_desired_modes(pScrn, &info->drmmode)) - return FALSE; - /* Provide SaveScreen & wrap BlockHandler and CloseScreen */ /* Wrap CloseScreen */ info->CloseScreen = pScreen->CloseScreen; @@ -898,7 +900,6 @@ Bool RADEONScreenInit_KMS(int scrnIndex, ScreenPtr pScreen, info->accel_state->XInited3D = FALSE; info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN; - drmmode_uevent_init(pScrn, &info->drmmode); return TRUE; } |