From bed40453e2f807dd87aadb685e60f79f4dec349a Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Tue, 28 Oct 2014 22:53:58 +0200 Subject: [PATCH 1/3] drm/i915: fix plane obj pinning with disabled crtc Signed-off-by: Imre Deak --- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 8b80d68..36762b5 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1198,9 +1198,10 @@ intel_prepare_sprite_plane(struct drm_plane *plane, struct drm_crtc *crtc = state->crtc; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); enum pipe pipe = intel_crtc->pipe; + struct intel_plane *intel_plane = to_intel_plane(plane); struct drm_framebuffer *fb = state->fb; struct drm_i915_gem_object *obj = intel_fb_obj(fb); - struct drm_i915_gem_object *old_obj = intel_fb_obj(plane->fb); + struct drm_i915_gem_object *old_obj = intel_plane->obj; int ret; if (old_obj != obj) { -- 1.8.4