gpu: nvgpu: gp10b: Fix support for new color compression kinds

Fix support for kinds C32_MS4_4CBRA and C64_MS4_4CBRA. They're both
compressible and ZBC kinds, so mark them as such, too.

Change-Id: Ide09ea79a885361ecfc3c188606799c6b2fbdd2e
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: http://git-master/r/816015
(cherry picked from commit 302b06b76aed5278286487225d6e7280b747d4b3)
Reviewed-on: http://git-master/r/816014
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
index 3a143ced..8b3b2153 100644
--- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
@@ -59,14 +59,18 @@ static bool gp10b_kind_compressible(u8 k)
                  k <= gmmu_pte_kind_z16_ms8_2cz_v()) ||
                 k == gmmu_pte_kind_z16_ms16_2cz_v() ||
                (k >= gmmu_pte_kind_z16_4cz_v() &&
-                 k <= gmmu_pte_kind_z16_ms16_4cz_v());
+                 k <= gmmu_pte_kind_z16_ms16_4cz_v()) ||
+                k == gmmu_pte_kind_c32_ms4_4cbra_v() ||
+                k == gmmu_pte_kind_c64_ms4_4cbra_v();
 }
 
 static bool gp10b_kind_zbc(u8 k)
 {
         return (k >= gmmu_pte_kind_z16_2cz_v() &&
                  k <= gmmu_pte_kind_z16_ms8_2cz_v()) ||
-                k == gmmu_pte_kind_z16_ms16_2cz_v();
+                k == gmmu_pte_kind_z16_ms16_2cz_v() ||
+                k == gmmu_pte_kind_c32_ms4_4cbra_v() ||
+                k == gmmu_pte_kind_c64_ms4_4cbra_v();
 }
 
 static void gp10b_init_kind_attr(void)