diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-07 18:00:20 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-07 18:02:08 -0500 |
| commit | 1a1c69762a14f50dd574a9cbabbfa1b1542f580e (patch) | |
| tree | 117fc29dc9f936f0125e08206c9a60a4e5ffbad7 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | 0be732841fb925b6f1242211ea211c022b6ac26c (diff) | |
| parent | 1b39d6f37622f1da70aa2cfd38bfff9a52c13e05 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_dp.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 0ee78525959a..67c545204f19 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
| @@ -157,23 +157,25 @@ static int init_ring_common(struct intel_ring_buffer *ring) | |||
| 157 | 157 | ||
| 158 | /* G45 ring initialization fails to reset head to zero */ | 158 | /* G45 ring initialization fails to reset head to zero */ |
| 159 | if (head != 0) { | 159 | if (head != 0) { |
| 160 | DRM_ERROR("%s head not reset to zero " | 160 | DRM_DEBUG_KMS("%s head not reset to zero " |
| 161 | "ctl %08x head %08x tail %08x start %08x\n", | 161 | "ctl %08x head %08x tail %08x start %08x\n", |
| 162 | ring->name, | 162 | ring->name, |
| 163 | I915_READ_CTL(ring), | 163 | I915_READ_CTL(ring), |
| 164 | I915_READ_HEAD(ring), | 164 | I915_READ_HEAD(ring), |
| 165 | I915_READ_TAIL(ring), | 165 | I915_READ_TAIL(ring), |
| 166 | I915_READ_START(ring)); | 166 | I915_READ_START(ring)); |
| 167 | 167 | ||
| 168 | I915_WRITE_HEAD(ring, 0); | 168 | I915_WRITE_HEAD(ring, 0); |
| 169 | 169 | ||
| 170 | DRM_ERROR("%s head forced to zero " | 170 | if (I915_READ_HEAD(ring) & HEAD_ADDR) { |
| 171 | "ctl %08x head %08x tail %08x start %08x\n", | 171 | DRM_ERROR("failed to set %s head to zero " |
| 172 | ring->name, | 172 | "ctl %08x head %08x tail %08x start %08x\n", |
| 173 | I915_READ_CTL(ring), | 173 | ring->name, |
| 174 | I915_READ_HEAD(ring), | 174 | I915_READ_CTL(ring), |
| 175 | I915_READ_TAIL(ring), | 175 | I915_READ_HEAD(ring), |
| 176 | I915_READ_START(ring)); | 176 | I915_READ_TAIL(ring), |
| 177 | I915_READ_START(ring)); | ||
| 178 | } | ||
| 177 | } | 179 | } |
| 178 | 180 | ||
| 179 | I915_WRITE_CTL(ring, | 181 | I915_WRITE_CTL(ring, |