diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-07 14:03:05 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-01 19:03:44 -0700 |
| commit | 2dafb1e082c541d4bc0f275a6ffa9c39da690f01 (patch) | |
| tree | aba221033813b7e531ed8602c69579984b6c45b6 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 96b099fd6d64389e619dbf7ca9059bf16e441f6b (diff) | |
| download | lwn-2dafb1e082c541d4bc0f275a6ffa9c39da690f01.tar.gz lwn-2dafb1e082c541d4bc0f275a6ffa9c39da690f01.zip | |
drm/i915: Propagate error from i915_gem_object_flush_gpu_write_domain()
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bf486b142839..81179fb5150e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4905,7 +4905,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, drm_gem_object_reference(obj); crtc->fb = fb; - i915_gem_object_flush_write_domain(obj); + ret = i915_gem_object_flush_write_domain(obj); + if (ret) + goto cleanup_objs; ret = drm_vblank_get(dev, intel_crtc->pipe); if (ret) |