diff options
| author | Ilija Hadzic <ihadzic@research.bell-labs.com> | 2013-01-02 18:27:45 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-01-31 16:24:44 -0500 |
| commit | c3ad63afcdb931159690aa7ba2906079c3b38a13 (patch) | |
| tree | 86305f43ed6c42c85e19f99c78a141c7d9e2efdb /drivers/gpu/drm/radeon/r300.c | |
| parent | d6e18a3406d401edeb96a01c7bb9d1689454c41b (diff) | |
drm/radeon: rename r100_cs_dump_packet to radeon_cs_dump_packet
This function is not limited to r100, but it can dump a
(raw) packet for any ASIC. Rename it accordingly and move
its declaration to radeon.h
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/r300.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 34ca46e46347..47bfca14cec8 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
| @@ -615,7 +615,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 615 | if (r) { | 615 | if (r) { |
| 616 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 616 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 617 | idx, reg); | 617 | idx, reg); |
| 618 | r100_cs_dump_packet(p, pkt); | 618 | radeon_cs_dump_packet(p, pkt); |
| 619 | return r; | 619 | return r; |
| 620 | } | 620 | } |
| 621 | break; | 621 | break; |
| @@ -634,7 +634,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 634 | if (r) { | 634 | if (r) { |
| 635 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 635 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 636 | idx, reg); | 636 | idx, reg); |
| 637 | r100_cs_dump_packet(p, pkt); | 637 | radeon_cs_dump_packet(p, pkt); |
| 638 | return r; | 638 | return r; |
| 639 | } | 639 | } |
| 640 | track->cb[i].robj = reloc->robj; | 640 | track->cb[i].robj = reloc->robj; |
| @@ -647,7 +647,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 647 | if (r) { | 647 | if (r) { |
| 648 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 648 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 649 | idx, reg); | 649 | idx, reg); |
| 650 | r100_cs_dump_packet(p, pkt); | 650 | radeon_cs_dump_packet(p, pkt); |
| 651 | return r; | 651 | return r; |
| 652 | } | 652 | } |
| 653 | track->zb.robj = reloc->robj; | 653 | track->zb.robj = reloc->robj; |
| @@ -676,7 +676,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 676 | if (r) { | 676 | if (r) { |
| 677 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 677 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 678 | idx, reg); | 678 | idx, reg); |
| 679 | r100_cs_dump_packet(p, pkt); | 679 | radeon_cs_dump_packet(p, pkt); |
| 680 | return r; | 680 | return r; |
| 681 | } | 681 | } |
| 682 | 682 | ||
| @@ -749,7 +749,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 749 | if (r) { | 749 | if (r) { |
| 750 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 750 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 751 | idx, reg); | 751 | idx, reg); |
| 752 | r100_cs_dump_packet(p, pkt); | 752 | radeon_cs_dump_packet(p, pkt); |
| 753 | return r; | 753 | return r; |
| 754 | } | 754 | } |
| 755 | 755 | ||
| @@ -834,7 +834,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 834 | if (r) { | 834 | if (r) { |
| 835 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 835 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 836 | idx, reg); | 836 | idx, reg); |
| 837 | r100_cs_dump_packet(p, pkt); | 837 | radeon_cs_dump_packet(p, pkt); |
| 838 | return r; | 838 | return r; |
| 839 | } | 839 | } |
| 840 | 840 | ||
| @@ -1049,7 +1049,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 1049 | if (r) { | 1049 | if (r) { |
| 1050 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 1050 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 1051 | idx, reg); | 1051 | idx, reg); |
| 1052 | r100_cs_dump_packet(p, pkt); | 1052 | radeon_cs_dump_packet(p, pkt); |
| 1053 | return r; | 1053 | return r; |
| 1054 | } | 1054 | } |
| 1055 | ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); | 1055 | ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); |
| @@ -1091,7 +1091,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
| 1091 | if (r) { | 1091 | if (r) { |
| 1092 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 1092 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 1093 | idx, reg); | 1093 | idx, reg); |
| 1094 | r100_cs_dump_packet(p, pkt); | 1094 | radeon_cs_dump_packet(p, pkt); |
| 1095 | return r; | 1095 | return r; |
| 1096 | } | 1096 | } |
| 1097 | track->aa.robj = reloc->robj; | 1097 | track->aa.robj = reloc->robj; |
| @@ -1159,7 +1159,7 @@ static int r300_packet3_check(struct radeon_cs_parser *p, | |||
| 1159 | r = r100_cs_packet_next_reloc(p, &reloc); | 1159 | r = r100_cs_packet_next_reloc(p, &reloc); |
| 1160 | if (r) { | 1160 | if (r) { |
| 1161 | DRM_ERROR("No reloc for packet3 %d\n", pkt->opcode); | 1161 | DRM_ERROR("No reloc for packet3 %d\n", pkt->opcode); |
| 1162 | r100_cs_dump_packet(p, pkt); | 1162 | radeon_cs_dump_packet(p, pkt); |
| 1163 | return r; | 1163 | return r; |
| 1164 | } | 1164 | } |
| 1165 | ib[idx+1] = radeon_get_ib_value(p, idx + 1) + ((u32)reloc->lobj.gpu_offset); | 1165 | ib[idx+1] = radeon_get_ib_value(p, idx + 1) + ((u32)reloc->lobj.gpu_offset); |