drm/i915: Don't try to look up object for non-existent fb
Subsystems (2)
PATCH 1/1 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 a071fa00647bc9a3c53f917b236fff9aea175e3a
Author: Daniel Vetter <[email protected]>
Date: Wed Jun 18 23:28:09 2014 +0200
drm/i915: Introduce accurate frontbuffer tracking
Testcase: igt/kms_universal_plane
--- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +3 -1
@@ -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 ) {
Signature · 1 line
1.8.5.1
Quoted 11 lines · Matt Roper
crtc->primary->fbmay be NULL upon entry tointel_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
a071fa00647bc9a3c53f917b236fff9aea175e3a
Author: Daniel Vetter <[email protected]>
Date: Wed Jun 18 23:28:09 2014 +0200
Quoted 5 lines
drm/i915: Introduce accurate frontbuffer tracking
Testcase: igt/kms_universal_plane
Cc Daniel Vetter <[email protected]>Signed-off-by Matt Roper <[email protected]>
Oh for a safe version of to_fb_obj().
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 12 lines · Chris Wilson
Quoted 11 lines · Matt Roper
crtc->primary->fbmay be NULL upon entry tointel_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 a071fa00647bc9a3c53f917b236fff9aea175e3a Author: Daniel Vetter <[email protected]> Date: Wed Jun 18 23:28:09 2014 +0200
Quoted 8 lines
Quoted 5 lines
drm/i915: Introduce accurate frontbuffer tracking
Testcase: igt/kms_universal_plane
Cc Daniel Vetter <[email protected]>Signed-off-by Matt Roper <[email protected]>Oh for a safe version of
to_fb_obj().Reviewed-by Chris Wilson <[email protected]>
Pushed to dinq, thanks for the patch and review.
BR,
Jani.
Quoted 8 lines
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center