diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-02-12 05:19:12 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2011-02-12 05:19:12 -0500 |
| commit | 5f9b7fdb4ce27f8c6a64134bb4d5ebeb1c958cca (patch) | |
| tree | 7f498b7689518fff094616c89d2f89385da2000b /src/radeon_kms.c | |
| parent | 355f0f7a67ce239b7fd2f2e81bcaaa88b2a09f03 (diff) | |
kms: always get the tiling info even if we aren't tiling
We need the proper group size to calculate alignment so the
ddx and drm agree.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Diffstat (limited to 'src/radeon_kms.c')
| -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 82258d92..dae512e9 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -601,10 +601,11 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) /* set default group bytes, overridden by kernel info below */ info->group_bytes = 256; if (info->dri->pKernelDRMVersion->version_minor >= 6) { - info->allowColorTiling = xf86ReturnOptValBool(info->Options, - OPTION_COLOR_TILING, colorTilingDefault); - if (info->allowColorTiling) - info->allowColorTiling = r600_get_tile_config(pScrn); + if (r600_get_tile_config(pScrn)) + info->allowColorTiling = xf86ReturnOptValBool(info->Options, + OPTION_COLOR_TILING, colorTilingDefault); + else + info->allowColorTiling = FALSE; } else xf86DrvMsg(pScrn->scrnIndex, X_INFO, "R6xx+ KMS Color Tiling requires radeon drm 2.6.0 or newer\n"); |