Skip to content

Commit

Permalink
drm/i915/ringbuffer: Remove duplicate initialisation of ring control
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Oct 29, 2010
1 parent 1d8f38f commit c584fe4
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions drivers/gpu/drm/i915/intel_ringbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,6 @@ static int init_status_page(struct intel_ring_buffer *ring)
int intel_init_ring_buffer(struct drm_device *dev,
struct intel_ring_buffer *ring)
{
struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_gem_object *obj_priv;
struct drm_gem_object *obj;
int ret;
Expand Down Expand Up @@ -626,16 +625,7 @@ int intel_init_ring_buffer(struct drm_device *dev,
if (ret)
goto err_unmap;

if (!drm_core_check_feature(dev, DRIVER_MODESET))
i915_kernel_lost_context(dev);
else {
ring->head = I915_READ_HEAD(ring) & HEAD_ADDR;
ring->tail = I915_READ_TAIL(ring) & TAIL_ADDR;
ring->space = ring->head - (ring->tail + 8);
if (ring->space < 0)
ring->space += ring->size;
}
return ret;
return 0;

err_unmap:
drm_core_ioremapfree(&ring->map, dev);
Expand Down

0 comments on commit c584fe4

Please sign in to comment.