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

drm/i915: Make intel_plane_restore() return an error 



Propagate the error from intel_update_plane() up through
intel_plane_restore() to the caller. This will be used for
rollback purposes when setting properties fails.

Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 76eebda7

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob); 
int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane);

void intel_flush_primary_plane(struct drm_i915_private *dev_priv,

			       enum plane plane);

void intel_plane_restore(struct drm_plane *plane);

int intel_plane_restore(struct drm_plane *plane);

void intel_plane_disable(struct drm_plane *plane);

int intel_sprite_set_colorkey(struct drm_device *dev, void *data,

			      struct drm_file *file_priv);

drivers/gpu/drm/i915/intel_sprite.c

+7 −7
Original line number Diff line number Diff line
@@ -1218,14 +1218,14 @@ out_unlock: 
	return ret;

}



void intel_plane_restore(struct drm_plane *plane)

int intel_plane_restore(struct drm_plane *plane)

{

	struct intel_plane *intel_plane = to_intel_plane(plane);



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

		return;

		return 0;



	intel_update_plane(plane, plane->crtc, plane->fb,

	return intel_update_plane(plane, plane->crtc, plane->fb,

				  intel_plane->crtc_x, intel_plane->crtc_y,

				  intel_plane->crtc_w, intel_plane->crtc_h,

				  intel_plane->src_x, intel_plane->src_y,

CRA Git | Maintained and supported by SUSTech CRA and CCSE