Rev 2335 | Rev 2339 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2335 | Rev 2338 | ||
|---|---|---|---|
| Line 139... | Line 139... | ||
| 139 | RING_ACTHD(ring->mmio_base) : ACTHD; |
139 | RING_ACTHD(ring->mmio_base) : ACTHD; |
| Line 140... | Line 140... | ||
| 140 | 140 | ||
| 141 | return I915_READ(acthd_reg); |
141 | return I915_READ(acthd_reg); |
| Line 142... | Line -... | ||
| 142 | } |
- | |
| 143 | 142 | } |
|
| 144 | 143 | ||
| 145 | static int init_ring_common(struct intel_ring_buffer *ring) |
144 | static int init_ring_common(struct intel_ring_buffer *ring) |
| 146 | { |
145 | { |
| 147 | drm_i915_private_t *dev_priv = ring->dev->dev_private; |
146 | drm_i915_private_t *dev_priv = ring->dev->dev_private; |
| Line 293... | Line 292... | ||
| 293 | 292 | ||
| Line 294... | Line 293... | ||
| 294 | ENTER(); |
293 | ENTER(); |
| Line 295... | Line -... | ||
| 295 | - | ||
| 296 | int ret = init_ring_common(ring); |
294 | |
| 297 | 295 | int ret = init_ring_common(ring); |
|
| 298 | 296 | ||
| 299 | if (INTEL_INFO(dev)->gen > 3) { |
297 | if (INTEL_INFO(dev)->gen > 3) { |
| 300 | int mode = VS_TIMER_DISPATCH << 16 | VS_TIMER_DISPATCH; |
298 | int mode = VS_TIMER_DISPATCH << 16 | VS_TIMER_DISPATCH; |
| Line 1367... | Line 1365... | ||
| 1367 | 1365 | ||
| Line 1368... | Line 1366... | ||
| 1368 | *ring = gen6_blt_ring; |
1366 | *ring = gen6_blt_ring; |
| 1369 | 1367 | ||
| 1370 | return intel_init_ring_buffer(dev, ring); |
- | |
| 1371 | } |
- | |
| 1372 | - | ||
| 1373 | - | ||