diff options
| author | James Le Cuirot <chewi@aura-online.co.uk> | 2010-02-25 21:13:18 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2010-02-25 21:13:18 -0500 |
| commit | b499eee7506f7478649e0000e9f8fcd00ac9d88d (patch) | |
| tree | 758834e129225d7aa97c1cc1a26c660231c180ad /src/radeon_kms.c | |
| parent | 433c8617341f5768255826435a2b09afba684f02 (diff) | |
clean up kms zaphod handling
Taken from James patch on bug 24523
agd5f: adapt to the current code
Diffstat (limited to 'src/radeon_kms.c')
| -rw-r--r-- | src/radeon_kms.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index b4e17594..427004e7 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -367,10 +367,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) RADEONInfoPtr info; RADEONEntPtr pRADEONEnt; DevUnion* pPriv; - int zaphod_mask = 0; char *bus_id; Gamma zeros = { 0.0, 0.0, 0.0 }; - const char *s; xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "RADEONPreInit_KMS\n"); @@ -427,20 +425,6 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) if (!radeon_alloc_dri(pScrn)) return FALSE; - /* crtc low bits - output high bits */ - zaphod_mask = 0xff; - if (info->IsPrimary) { - if ((s = xf86GetOptValString(info->Options, OPTION_ZAPHOD_HEADS))) - zaphod_mask = 0xfd; - else - zaphod_mask = 0xdd; - } - if (info->IsSecondary) { - if ((s = xf86GetOptValString(info->Options, OPTION_ZAPHOD_HEADS))) - zaphod_mask = 0xf2; - else - zaphod_mask = 0x22; - } info->allowColorTiling = xf86ReturnOptValBool(info->Options, OPTION_COLOR_TILING, FALSE); if (info->ChipFamily >= CHIP_FAMILY_R600) { @@ -451,7 +435,7 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) "KMS Color Tiling: %sabled\n", info->allowColorTiling ? "en" : "dis"); bus_id = DRICreatePCIBusID(info->PciInfo); - if (drmmode_pre_init(pScrn, &info->drmmode, bus_id, "radeon", pScrn->bitsPerPixel / 8, zaphod_mask) == FALSE) { + if (drmmode_pre_init(pScrn, &info->drmmode, bus_id, "radeon", pScrn->bitsPerPixel / 8) == FALSE) { xfree(bus_id); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n"); goto fail; |