diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-12 08:42:53 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-23 15:19:16 -0500 |
commit | 919926aeb3e89825093c743dd54f04e42e7d9150 (patch) | |
tree | d02a87578fd33a55035ef99f34af4ebce84394eb /drivers/gpu/drm/i915/intel_display.c | |
parent | 576ae4b8e46b4cb9d5390f4348c265329793d9bf (diff) |
drm/i915: Thread the pipelining ring through the callers.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ae7d4f55ce07..c2c94a26f92e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -1434,7 +1434,7 @@ out_disable: | |||
1434 | int | 1434 | int |
1435 | intel_pin_and_fence_fb_obj(struct drm_device *dev, | 1435 | intel_pin_and_fence_fb_obj(struct drm_device *dev, |
1436 | struct drm_i915_gem_object *obj, | 1436 | struct drm_i915_gem_object *obj, |
1437 | bool pipelined) | 1437 | struct intel_ring_buffer *pipelined) |
1438 | { | 1438 | { |
1439 | u32 alignment; | 1439 | u32 alignment; |
1440 | int ret; | 1440 | int ret; |
@@ -1594,7 +1594,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, | |||
1594 | mutex_lock(&dev->struct_mutex); | 1594 | mutex_lock(&dev->struct_mutex); |
1595 | ret = intel_pin_and_fence_fb_obj(dev, | 1595 | ret = intel_pin_and_fence_fb_obj(dev, |
1596 | to_intel_framebuffer(crtc->fb)->obj, | 1596 | to_intel_framebuffer(crtc->fb)->obj, |
1597 | false); | 1597 | NULL); |
1598 | if (ret != 0) { | 1598 | if (ret != 0) { |
1599 | mutex_unlock(&dev->struct_mutex); | 1599 | mutex_unlock(&dev->struct_mutex); |
1600 | return ret; | 1600 | return ret; |
@@ -5092,7 +5092,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, | |||
5092 | obj = intel_fb->obj; | 5092 | obj = intel_fb->obj; |
5093 | 5093 | ||
5094 | mutex_lock(&dev->struct_mutex); | 5094 | mutex_lock(&dev->struct_mutex); |
5095 | ret = intel_pin_and_fence_fb_obj(dev, obj, true); | 5095 | ret = intel_pin_and_fence_fb_obj(dev, obj, &dev_priv->render_ring); |
5096 | if (ret) | 5096 | if (ret) |
5097 | goto cleanup_work; | 5097 | goto cleanup_work; |
5098 | 5098 | ||