Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e721fb1 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Use plane->state->fb instead of plane->fb in intel_plane_restore() 



plane->fb is not as reliable as plane->state->fb so let's convert
intel_plane_restore() over the the new way of thinking as well.

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3749f463

drivers/gpu/drm/i915/intel_sprite.c

+2 −2
Original line number Diff line number Diff line
@@ -1361,10 +1361,10 @@ out_unlock: 


int intel_plane_restore(struct drm_plane *plane)

{

	if (!plane->crtc || !plane->fb)

	if (!plane->crtc || !plane->state->fb)

		return 0;



	return plane->funcs->update_plane(plane, plane->crtc, plane->fb,

	return plane->funcs->update_plane(plane, plane->crtc, plane->state->fb,

				  plane->state->crtc_x, plane->state->crtc_y,

				  plane->state->crtc_w, plane->state->crtc_h,

				  plane->state->src_x, plane->state->src_y,