diff options
| author | Chris Wilson | 2010-09-14 00:56:38 +0200 |
|---|---|---|
| committer | Chris Wilson | 2010-09-14 11:34:27 +0200 |
| commit | 7213342db58adb7b8e399a00fc423951d7f75369 (patch) | |
| tree | a302b3708792f34fed855fe6ce3301de7bea8c64 /drivers/gpu/drm/i915/intel_fb.c | |
| parent | drm/i915: Reduce hangcheck frequency (diff) | |
| download | kernel-qcow2-linux-7213342db58adb7b8e399a00fc423951d7f75369.tar.gz kernel-qcow2-linux-7213342db58adb7b8e399a00fc423951d7f75369.tar.xz kernel-qcow2-linux-7213342db58adb7b8e399a00fc423951d7f75369.zip | |
drm/i915: Consolidate flushing the display plane
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fb.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 0ee4a8c16608..e2d13e394a0d 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -93,19 +93,13 @@ static int intelfb_create(struct intel_fbdev *ifbdev, mutex_lock(&dev->struct_mutex); + /* Flush everything out, we'll be doing GTT only from now on */ ret = intel_pin_and_fence_fb_obj(dev, fbo); if (ret) { DRM_ERROR("failed to pin fb: %d\n", ret); goto out_unref; } - /* Flush everything out, we'll be doing GTT only from now on */ - ret = i915_gem_object_set_to_gtt_domain(fbo, 1); - if (ret) { - DRM_ERROR("failed to bind fb: %d.\n", ret); - goto out_unpin; - } - info = framebuffer_alloc(0, device); if (!info) { ret = -ENOMEM; |