From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 22 Nov 2013 23:34:45 +0000 (+0100)
Subject: radeon: handle P16 pipe configs for Hawaii
X-Git-Tag: 2.4.49~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f4648902296efa3a8cc0abc941d978637f0ee28;p=platform%2Fupstream%2Flibdrm.git

radeon: handle P16 pipe configs for Hawaii
---

diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index 555db8d..b528a48 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -1803,6 +1803,8 @@ static int si_surface_best(struct radeon_surface_manager *surf_man,
 #define     CIK__PIPE_CONFIG__ADDR_SURF_P8_32x32_16x16   12
 #define     CIK__PIPE_CONFIG__ADDR_SURF_P8_32x32_16x32   13
 #define     CIK__PIPE_CONFIG__ADDR_SURF_P8_32x64_32x32   14
+#define     CIK__PIPE_CONFIG__ADDR_SURF_P16_32X32_8X16   16
+#define     CIK__PIPE_CONFIG__ADDR_SURF_P16_32X32_16X16  17
 #define CIK__GB_TILE_MODE__TILE_SPLIT(x)         (((x) >> 11) & 0x7)
 #define     CIK__TILE_SPLIT__64B                         0
 #define     CIK__TILE_SPLIT__128B                        1
@@ -1875,6 +1877,10 @@ static void cik_get_2d_params(struct radeon_surface_manager *surf_man,
         case CIK__PIPE_CONFIG__ADDR_SURF_P8_32x64_32x32:
             *num_pipes = 8;
             break;
+        case CIK__PIPE_CONFIG__ADDR_SURF_P16_32X32_8X16:
+        case CIK__PIPE_CONFIG__ADDR_SURF_P16_32X32_16X16:
+            *num_pipes = 16;
+            break;
         }
     }
     switch (CIK__GB_TILE_MODE__TILE_SPLIT(gb_tile_mode)) {