Skip to content

Commit

Permalink
drm/i915: Use plane->state->fb instead of plane->fb in intel_plane_re…
Browse files Browse the repository at this point in the history
…store()

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Ville Syrjälä authored and Daniel Vetter committed Mar 17, 2015
1 parent 3749f46 commit 6e721fb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/intel_sprite.c
Original file line number Diff line number Diff line change
Expand Up @@ -1361,10 +1361,10 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data,

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,
Expand Down

0 comments on commit 6e721fb

Please sign in to comment.