drm/radeon: use common cs packet parse function

We now have a common radeon_cs_packet_parse function
that is good for all ASICs. Hook it up and eliminate
ASIC-specific versions.

Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 51 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 40c0318b1eef..7842447da4fb 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1370,53 +1370,6 @@ void r100_cs_dump_packet(struct radeon_cs_parser *p,
 }
 
 /**
- * r100_cs_packet_parse() - parse cp packet and point ib index to next packet
- * @parser:     parser structure holding parsing context.
- * @pkt:        where to store packet informations
- *
- * Assume that chunk_ib_index is properly set. Will return -EINVAL
- * if packet is bigger than remaining ib size. or if packets is unknown.
- **/
-int r100_cs_packet_parse(struct radeon_cs_parser *p,
-                         struct radeon_cs_packet *pkt,
-                         unsigned idx)
-{
-        struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx];
-        uint32_t header;
-
-        if (idx >= ib_chunk->length_dw) {
-                DRM_ERROR("Can not parse packet at %d after CS end %d !\n",
-                          idx, ib_chunk->length_dw);
-                return -EINVAL;
-        }
-        header = radeon_get_ib_value(p, idx);
-        pkt->idx = idx;
-        pkt->type = CP_PACKET_GET_TYPE(header);
-        pkt->count = CP_PACKET_GET_COUNT(header);
-        switch (pkt->type) {
-        case PACKET_TYPE0:
-                pkt->reg = CP_PACKET0_GET_REG(header);
-                pkt->one_reg_wr = CP_PACKET0_GET_ONE_REG_WR(header);
-                break;
-        case PACKET_TYPE3:
-                pkt->opcode = CP_PACKET3_GET_OPCODE(header);
-                break;
-        case PACKET_TYPE2:
-                pkt->count = -1;
-                break;
-        default:
-                DRM_ERROR("Unknown packet type %d at %d !\n", pkt->type, idx);
-                return -EINVAL;
-        }
-        if ((pkt->count + 1 + pkt->idx) >= ib_chunk->length_dw) {
-                DRM_ERROR("Packet (%d:%d:%d) end after CS buffer (%d) !\n",
-                          pkt->idx, pkt->type, pkt->count, ib_chunk->length_dw);
-                return -EINVAL;
-        }
-        return 0;
-}
-
-/**
  * r100_cs_packet_next_vline() - parse userspace VLINE packet
  * @parser:             parser structure holding parsing context.
  *
@@ -1444,7 +1397,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
         ib = p->ib.ptr;
 
         /* parse the wait until */
-        r = r100_cs_packet_parse(p, &waitreloc, p->idx);
+        r = radeon_cs_packet_parse(p, &waitreloc, p->idx);
         if (r)
                 return r;
 
@@ -1461,7 +1414,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
         }
 
         /* jump over the NOP */
-        r = r100_cs_packet_parse(p, &p3reloc, p->idx + waitreloc.count + 2);
+        r = radeon_cs_packet_parse(p, &p3reloc, p->idx + waitreloc.count + 2);
         if (r)
                 return r;
 
@@ -1531,7 +1484,7 @@ int r100_cs_packet_next_reloc(struct radeon_cs_parser *p,
         }
         *cs_reloc = NULL;
         relocs_chunk = &p->chunks[p->chunk_relocs_idx];
-        r = r100_cs_packet_parse(p, &p3reloc, p->idx);
+        r = radeon_cs_packet_parse(p, &p3reloc, p->idx);
         if (r) {
                 return r;
         }
@@ -2100,7 +2053,7 @@ int r100_cs_parse(struct radeon_cs_parser *p)
         r100_cs_track_clear(p->rdev, track);
         p->track = track;
         do {
-                r = r100_cs_packet_parse(p, &pkt, p->idx);
+                r = radeon_cs_packet_parse(p, &pkt, p->idx);
                 if (r) {
                         return r;
                 }