mirror of
https://github.com/torvalds/linux
synced 2024-10-26 21:29:56 +00:00
drm/i915: Don't try to look up object for non-existent fb
crtc->primary->fb may be NULL upon entry to intel_pipe_set_base() if the
primary plane has previously been disabled via the universal plane
interface. We need to check for NULL before trying to reference
old_fb's obj.
This fixes a regression introduced in
commit a071fa0064
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Jun 18 23:28:09 2014 +0200
drm/i915: Introduce accurate frontbuffer tracking
Testcase: igt/kms_universal_plane
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
9c33baa6b3
commit
91565c85b6
|
@ -2690,6 +2690,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
|
|||
enum pipe pipe = intel_crtc->pipe;
|
||||
struct drm_framebuffer *old_fb;
|
||||
struct drm_i915_gem_object *obj = to_intel_framebuffer(fb)->obj;
|
||||
struct drm_i915_gem_object *old_obj;
|
||||
int ret;
|
||||
|
||||
if (intel_crtc_has_pending_flip(crtc)) {
|
||||
|
@ -2711,11 +2712,12 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
|
|||
}
|
||||
|
||||
old_fb = crtc->primary->fb;
|
||||
old_obj = old_fb ? to_intel_framebuffer(old_fb)->obj : NULL;
|
||||
|
||||
mutex_lock(&dev->struct_mutex);
|
||||
ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
|
||||
if (ret == 0)
|
||||
i915_gem_track_fb(to_intel_framebuffer(old_fb)->obj, obj,
|
||||
i915_gem_track_fb(old_obj, obj,
|
||||
INTEL_FRONTBUFFER_PRIMARY(pipe));
|
||||
mutex_unlock(&dev->struct_mutex);
|
||||
if (ret != 0) {
|
||||
|
|
Loading…
Reference in a new issue