Module: Mesa Branch: master Commit: 7b136de79adf2ae54f2e60211ccee0c92f0741f2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b136de79adf2ae54f2e60211ccee0c92f0741f2
Author: Marek Olšák <[email protected]> Date: Wed Nov 20 13:35:03 2013 +0100 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 <[email protected]> --- configure.ac | 2 +- src/gallium/drivers/radeon/r600_texture.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index fb16338..434df60 100644 --- 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 9ba1e36..77b05c4 100644 --- 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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
