diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r200.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r200.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c index 98143a5c5b73..b3807edb1936 100644 --- a/drivers/gpu/drm/radeon/r200.c +++ b/drivers/gpu/drm/radeon/r200.c | |||
| @@ -162,7 +162,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
| 162 | if (r) { | 162 | if (r) { |
| 163 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 163 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 164 | idx, reg); | 164 | idx, reg); |
| 165 | r100_cs_dump_packet(p, pkt); | 165 | radeon_cs_dump_packet(p, pkt); |
| 166 | return r; | 166 | return r; |
| 167 | } | 167 | } |
| 168 | break; | 168 | break; |
| @@ -175,11 +175,11 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
| 175 | return r; | 175 | return r; |
| 176 | break; | 176 | break; |
| 177 | case RADEON_RB3D_DEPTHOFFSET: | 177 | case RADEON_RB3D_DEPTHOFFSET: |
| 178 | r = r100_cs_packet_next_reloc(p, &reloc); | 178 | r = radeon_cs_packet_next_reloc(p, &reloc, 0); |
| 179 | if (r) { | 179 | if (r) { |
| 180 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 180 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 181 | idx, reg); | 181 | idx, reg); |
| 182 | r100_cs_dump_packet(p, pkt); | 182 | radeon_cs_dump_packet(p, pkt); |
| 183 | return r; | 183 | return r; |
| 184 | } | 184 | } |
| 185 | track->zb.robj = reloc->robj; | 185 | track->zb.robj = reloc->robj; |
| @@ -188,11 +188,11 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
| 188 | ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); | 188 | ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); |
| 189 | break; | 189 | break; |
| 190 | case RADEON_RB3D_COLOROFFSET: | 190 | case RADEON_RB3D_COLOROFFSET: |
| 191 | r = r100_cs_packet_next_reloc(p, &reloc); | 191 | r = radeon_cs_packet_next_reloc(p, &reloc, 0); |
| 192 | if (r) { | 192 | if (r) { |
| 193 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 193 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 194 | idx, reg); | 194 | idx, reg); |
| 195 | r100_cs_dump_packet(p, pkt); | 195 | radeon_cs_dump_packet(p, pkt); |
| 196 | return r; | 196 | return r; |
| 197 | } | 197 | } |
| 198 | track->cb[0].robj = reloc->robj; | 198 | track->cb[0].robj = reloc->robj; |
| @@ -207,11 +207,11 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
| 207 | case R200_PP_TXOFFSET_4: | 207 | case R200_PP_TXOFFSET_4: |
| 208 | case R200_PP_TXOFFSET_5: | 208 | case R200_PP_TXOFFSET_5: |
| 209 | i = (reg - R200_PP_TXOFFSET_0) / 24; | 209 | i = (reg - R200_PP_TXOFFSET_0) / 24; |
| 210 | r = r100_cs_packet_next_reloc(p, &reloc); | 210 | r = radeon_cs_packet_next_reloc(p, &reloc, 0); |
| 211 | if (r) { | 211 | if (r) { |
| 212 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 212 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 213 | idx, reg); | 213 | idx, reg); |
| 214 | r100_cs_dump_packet(p, pkt); | 214 | radeon_cs_dump_packet(p, pkt); |
| 215 | return r; | 215 | return r; |
| 216 | } | 216 | } |
| 217 | if (!(p->cs_flags & RADEON_CS_KEEP_TILING_FLAGS)) { | 217 | if (!(p->cs_flags & RADEON_CS_KEEP_TILING_FLAGS)) { |
| @@ -260,11 +260,11 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
| 260 | case R200_PP_CUBIC_OFFSET_F5_5: | 260 | case R200_PP_CUBIC_OFFSET_F5_5: |
| 261 | i = (reg - R200_PP_TXOFFSET_0) / 24; | 261 | i = (reg - R200_PP_TXOFFSET_0) / 24; |
| 262 | face = (reg - ((i * 24) + R200_PP_TXOFFSET_0)) / 4; | 262 | face = (reg - ((i * 24) + R200_PP_TXOFFSET_0)) / 4; |
| 263 | r = r100_cs_packet_next_reloc(p, &reloc); | 263 | r = radeon_cs_packet_next_reloc(p, &reloc, 0); |
| 264 | if (r) { | 264 | if (r) { |
| 265 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 265 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 266 | idx, reg); | 266 | idx, reg); |
| 267 | r100_cs_dump_packet(p, pkt); | 267 | radeon_cs_dump_packet(p, pkt); |
| 268 | return r; | 268 | return r; |
| 269 | } | 269 | } |
| 270 | track->textures[i].cube_info[face - 1].offset = idx_value; | 270 | track->textures[i].cube_info[face - 1].offset = idx_value; |
| @@ -278,11 +278,11 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
| 278 | track->zb_dirty = true; | 278 | track->zb_dirty = true; |
| 279 | break; | 279 | break; |
| 280 | case RADEON_RB3D_COLORPITCH: | 280 | case RADEON_RB3D_COLORPITCH: |
| 281 | r = r100_cs_packet_next_reloc(p, &reloc); | 281 | r = radeon_cs_packet_next_reloc(p, &reloc, 0); |
| 282 | if (r) { | 282 | if (r) { |
| 283 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 283 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 284 | idx, reg); | 284 | idx, reg); |
| 285 | r100_cs_dump_packet(p, pkt); | 285 | radeon_cs_dump_packet(p, pkt); |
| 286 | return r; | 286 | return r; |
| 287 | } | 287 | } |
| 288 | 288 | ||
| @@ -355,11 +355,11 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
| 355 | track->zb_dirty = true; | 355 | track->zb_dirty = true; |
| 356 | break; | 356 | break; |
| 357 | case RADEON_RB3D_ZPASS_ADDR: | 357 | case RADEON_RB3D_ZPASS_ADDR: |
| 358 | r = r100_cs_packet_next_reloc(p, &reloc); | 358 | r = radeon_cs_packet_next_reloc(p, &reloc, 0); |
| 359 | if (r) { | 359 | if (r) { |
| 360 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | 360 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", |
| 361 | idx, reg); | 361 | idx, reg); |
| 362 | r100_cs_dump_packet(p, pkt); | 362 | radeon_cs_dump_packet(p, pkt); |
| 363 | return r; | 363 | return r; |
| 364 | } | 364 | } |
| 365 | ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); | 365 | ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset); |
