drm/r600: parse the set predication command. (v2)

This is required for NV_conditional_render and EXT_transform_feedback.

v2: add evergreen support.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 345a75a03c9639f2fe7e53cd6bf8815a35ba49fe..5c84fca00d369fb517edc6c37757c1966d0ce779 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -942,6 +942,37 @@ static int evergreen_packet3_check(struct radeon_cs_parser *p,
        idx_value = radeon_get_ib_value(p, idx);
 
        switch (pkt->opcode) {
+       case PACKET3_SET_PREDICATION:
+       {
+               int pred_op;
+               int tmp;
+               if (pkt->count != 1) {
+                       DRM_ERROR("bad SET PREDICATION\n");
+                       return -EINVAL;
+               }
+
+               tmp = radeon_get_ib_value(p, idx + 1);
+               pred_op = (tmp >> 16) & 0x7;
+
+               /* for the clear predicate operation */
+               if (pred_op == 0)
+                       return 0;
+
+               if (pred_op > 2) {
+                       DRM_ERROR("bad SET PREDICATION operation %d\n", pred_op);
+                       return -EINVAL;
+               }
+
+               r = evergreen_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("bad SET PREDICATION\n");
+                       return -EINVAL;
+               }
+
+               ib[idx + 0] = idx_value + (u32)(reloc->lobj.gpu_offset & 0xffffffff);
+               ib[idx + 1] = tmp + (upper_32_bits(reloc->lobj.gpu_offset) & 0xff);
+       }
+       break;
        case PACKET3_CONTEXT_CONTROL:
                if (pkt->count != 1) {
                        DRM_ERROR("bad CONTEXT_CONTROL\n");

diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 6701fa4e41fa951118dc7a75ed9e6116386db5a4..fe0c8eb7601016625f22a41f8a2259dca523cd67 100644 (file)
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -1415,6 +1415,38 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
        idx_value = radeon_get_ib_value(p, idx);
 
        switch (pkt->opcode) {
+       case PACKET3_SET_PREDICATION:
+       {
+               int pred_op;
+               int tmp;
+               if (pkt->count != 1) {
+                       DRM_ERROR("bad SET PREDICATION\n");
+                       return -EINVAL;
+               }
+
+               tmp = radeon_get_ib_value(p, idx + 1);
+               pred_op = (tmp >> 16) & 0x7;
+
+               /* for the clear predicate operation */
+               if (pred_op == 0)
+                       return 0;
+
+               if (pred_op > 2) {
+                       DRM_ERROR("bad SET PREDICATION operation %d\n", pred_op);
+                       return -EINVAL;
+               }
+
+               r = r600_cs_packet_next_reloc(p, &reloc);
+               if (r) {
+                       DRM_ERROR("bad SET PREDICATION\n");
+                       return -EINVAL;
+               }
+
+               ib[idx + 0] = idx_value + (u32)(reloc->lobj.gpu_offset & 0xffffffff);
+               ib[idx + 1] = tmp + (upper_32_bits(reloc->lobj.gpu_offset) & 0xff);
+       }
+       break;
+
        case PACKET3_START_3D_CMDBUF:
                if (p->family >= CHIP_RV770 || pkt->count) {
                        DRM_ERROR("bad START_3D\n");