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: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
这个提交包含在:
@@ -1218,18 +1218,18 @@ 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,
|
||||
intel_plane->crtc_x, intel_plane->crtc_y,
|
||||
intel_plane->crtc_w, intel_plane->crtc_h,
|
||||
intel_plane->src_x, intel_plane->src_y,
|
||||
intel_plane->src_w, intel_plane->src_h);
|
||||
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,
|
||||
intel_plane->src_w, intel_plane->src_h);
|
||||
}
|
||||
|
||||
void intel_plane_disable(struct drm_plane *plane)
|
||||
|
在新工单中引用
屏蔽一个用户