diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index a853261d1881..60d159308b88 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
| @@ -126,32 +126,19 @@ static void radeon_ib_align(struct radeon_device *rdev, struct radeon_ib *ib) | |||
| 126 | } | 126 | } |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | static void radeon_ib_cpu_flush(struct radeon_device *rdev, | ||
| 130 | struct radeon_ib *ib) | ||
| 131 | { | ||
| 132 | unsigned long tmp; | ||
| 133 | unsigned i; | ||
| 134 | |||
| 135 | /* To force CPU cache flush ugly but seems reliable */ | ||
| 136 | for (i = 0; i < ib->length_dw; i += (rdev->cp.align_mask + 1)) { | ||
| 137 | tmp = readl(&ib->ptr[i]); | ||
| 138 | } | ||
| 139 | } | ||
| 140 | |||
| 141 | int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib) | 129 | int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib) |
| 142 | { | 130 | { |
| 143 | int r = 0; | 131 | int r = 0; |
| 144 | 132 | ||
| 145 | mutex_lock(&rdev->ib_pool.mutex); | 133 | mutex_lock(&rdev->ib_pool.mutex); |
| 146 | radeon_ib_align(rdev, ib); | 134 | radeon_ib_align(rdev, ib); |
| 147 | radeon_ib_cpu_flush(rdev, ib); | ||
| 148 | if (!ib->length_dw || !rdev->cp.ready) { | 135 | if (!ib->length_dw || !rdev->cp.ready) { |
| 149 | /* TODO: Nothings in the ib we should report. */ | 136 | /* TODO: Nothings in the ib we should report. */ |
| 150 | mutex_unlock(&rdev->ib_pool.mutex); | 137 | mutex_unlock(&rdev->ib_pool.mutex); |
| 151 | DRM_ERROR("radeon: couldn't schedule IB(%lu).\n", ib->idx); | 138 | DRM_ERROR("radeon: couldn't schedule IB(%lu).\n", ib->idx); |
| 152 | return -EINVAL; | 139 | return -EINVAL; |
| 153 | } | 140 | } |
| 154 | /* 64 dwords should be enought for fence too */ | 141 | /* 64 dwords should be enough for fence too */ |
| 155 | r = radeon_ring_lock(rdev, 64); | 142 | r = radeon_ring_lock(rdev, 64); |
| 156 | if (r) { | 143 | if (r) { |
| 157 | DRM_ERROR("radeon: scheduling IB failled (%d).\n", r); | 144 | DRM_ERROR("radeon: scheduling IB failled (%d).\n", r); |
