diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 4c5ec44ff328..b0098e792e62 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
| @@ -821,6 +821,20 @@ u32 r100_get_vblank_counter(struct radeon_device *rdev, int crtc) | |||
| 821 | return RREG32(RADEON_CRTC2_CRNT_FRAME); | 821 | return RREG32(RADEON_CRTC2_CRNT_FRAME); |
| 822 | } | 822 | } |
| 823 | 823 | ||
| 824 | /** | ||
| 825 | * r100_ring_hdp_flush - flush Host Data Path via the ring buffer | ||
| 826 | * rdev: radeon device structure | ||
| 827 | * ring: ring buffer struct for emitting packets | ||
| 828 | */ | ||
| 829 | static void r100_ring_hdp_flush(struct radeon_device *rdev, struct radeon_ring *ring) | ||
| 830 | { | ||
| 831 | radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0)); | ||
| 832 | radeon_ring_write(ring, rdev->config.r100.hdp_cntl | | ||
| 833 | RADEON_HDP_READ_BUFFER_INVALIDATE); | ||
| 834 | radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0)); | ||
| 835 | radeon_ring_write(ring, rdev->config.r100.hdp_cntl); | ||
| 836 | } | ||
| 837 | |||
| 824 | /* Who ever call radeon_fence_emit should call ring_lock and ask | 838 | /* Who ever call radeon_fence_emit should call ring_lock and ask |
| 825 | * for enough space (today caller are ib schedule and buffer move) */ | 839 | * for enough space (today caller are ib schedule and buffer move) */ |
| 826 | void r100_fence_ring_emit(struct radeon_device *rdev, | 840 | void r100_fence_ring_emit(struct radeon_device *rdev, |
| @@ -1056,20 +1070,6 @@ void r100_gfx_set_wptr(struct radeon_device *rdev, | |||
| 1056 | (void)RREG32(RADEON_CP_RB_WPTR); | 1070 | (void)RREG32(RADEON_CP_RB_WPTR); |
| 1057 | } | 1071 | } |
| 1058 | 1072 | ||
| 1059 | /** | ||
| 1060 | * r100_ring_hdp_flush - flush Host Data Path via the ring buffer | ||
| 1061 | * rdev: radeon device structure | ||
| 1062 | * ring: ring buffer struct for emitting packets | ||
| 1063 | */ | ||
| 1064 | void r100_ring_hdp_flush(struct radeon_device *rdev, struct radeon_ring *ring) | ||
| 1065 | { | ||
| 1066 | radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0)); | ||
| 1067 | radeon_ring_write(ring, rdev->config.r100.hdp_cntl | | ||
| 1068 | RADEON_HDP_READ_BUFFER_INVALIDATE); | ||
| 1069 | radeon_ring_write(ring, PACKET0(RADEON_HOST_PATH_CNTL, 0)); | ||
| 1070 | radeon_ring_write(ring, rdev->config.r100.hdp_cntl); | ||
| 1071 | } | ||
| 1072 | |||
| 1073 | static void r100_cp_load_microcode(struct radeon_device *rdev) | 1073 | static void r100_cp_load_microcode(struct radeon_device *rdev) |
| 1074 | { | 1074 | { |
| 1075 | const __be32 *fw_data; | 1075 | const __be32 *fw_data; |
