r300g: enable MSAA on r300-r400, be careful about using color compression

MSAA was tested by one user on RS690 and it works for him with color
compression (CMASK) disabled. Our theory is that his chipset lacks CMASK RAM.

Since we don't have hardware documentation about which chipsets actually have
CMASK RAM, I had to take a guess based on the presence of HiZ.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

4 files changed, 14 insertions, 5 deletions

diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 30e085ac517..c1f5e3cee1f 100644
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -86,2 +86,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
     caps->zmask_ram = 0;
+    caps->has_cmask = FALSE;
 
@@ -93,2 +94,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         caps->num_vert_fpus = 4;
+        caps->has_cmask = TRUE; /* guessed because there is also HiZ */
         caps->hiz_ram = R300_HIZ_LIMIT;
@@ -107,2 +109,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         caps->num_vert_fpus = 2;
+        caps->has_cmask = TRUE; /* guessed because there is also HiZ */
         caps->hiz_ram = R300_HIZ_LIMIT;
@@ -129,2 +132,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         caps->num_vert_fpus = 6;
+        caps->has_cmask = TRUE; /* guessed because there is also HiZ */
         caps->hiz_ram = R300_HIZ_LIMIT;
@@ -135,2 +139,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         caps->num_vert_fpus = 8;
+        caps->has_cmask = TRUE;
         caps->hiz_ram = R300_HIZ_LIMIT;
@@ -141,2 +146,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         caps->num_vert_fpus = 2;
+        caps->has_cmask = TRUE;
         caps->hiz_ram = R300_HIZ_LIMIT;
@@ -147,2 +153,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         caps->num_vert_fpus = 5;
+        caps->has_cmask = TRUE;
         caps->hiz_ram = RV530_HIZ_LIMIT;
@@ -155,2 +162,3 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
         caps->num_vert_fpus = 8;
+        caps->has_cmask = TRUE;
         caps->hiz_ram = RV530_HIZ_LIMIT;
diff --git a/src/gallium/drivers/r300/r300_chipset.h b/src/gallium/drivers/r300/r300_chipset.h
index f8b5d4e3d3e..8e9deb6057c 100644
--- a/src/gallium/drivers/r300/r300_chipset.h
+++ b/src/gallium/drivers/r300/r300_chipset.h
@@ -57,2 +57,4 @@ struct r300_capabilities {
     int zmask_ram;
+    /* CMASK is for MSAA colorbuffer compression and fast clear. */
+    boolean has_cmask;
     /* Compression mode for ZMASK. */
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 5a388970c9b..063bc0922a1 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -446,7 +446,2 @@ static boolean r300_is_format_supported(struct pipe_screen* screen,
             }
-            /* Only support R500, because I didn't test older chipsets,
-             * but MSAA should work there too. */
-            if (!is_r500 && !debug_get_bool_option("RADEON_MSAA", FALSE)) {
-                return FALSE;
-            }
             /* No texturing and scanout. */
diff --git a/src/gallium/drivers/r300/r300_texture_desc.c b/src/gallium/drivers/r300/r300_texture_desc.c
index 8d96b5684ad..8fa98c5804e 100644
--- a/src/gallium/drivers/r300/r300_texture_desc.c
+++ b/src/gallium/drivers/r300/r300_texture_desc.c
@@ -419,2 +419,6 @@ static void r300_setup_cmask_properties(struct r300_screen *screen,
 
+    if (!screen->caps.has_cmask) {
+        return;
+    }
+
     /* We need an AA colorbuffer, no mipmaps. */