radeonsi: enable 2D tiling on CIK

libdrm does the DRM version check and decides if 2D tiling is used.

Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/configure.ac b/configure.ac
index fb16338b8c379e3b988bf3eeba32b937e9485775..434df60600ab81b2e147ca861bfe79a4e311b451 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_SUBST([OSMESA_VERSION])
 
 dnl Versions for external dependencies
 LIBDRM_REQUIRED=2.4.24
-LIBDRM_RADEON_REQUIRED=2.4.46
+LIBDRM_RADEON_REQUIRED=2.4.49
 LIBDRM_INTEL_REQUIRED=2.4.38
 LIBDRM_NVVIEUX_REQUIRED=2.4.33
 LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 9ba1e363e27e78137bb6b79b20b8b8e0e861b956..77b05c4a25ed2a6740cceafebc6252ce35cff5d2 100644 (file)
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -675,10 +675,6 @@ static unsigned r600_choose_tiling(struct r600_common_screen *rscreen,
        if (templ->width0 <= 16 || templ->height0 <= 16)
                return RADEON_SURF_MODE_1D;
 
-       /* XXX 2D tiling is currently unimplemented on CIK */
-       if (rscreen->chip_class >= CIK)
-               return RADEON_SURF_MODE_1D;
-
        /* The allocator will switch to 1D if needed. */
        return RADEON_SURF_MODE_2D;
 }