| From e6df66b684c544b6ae2099becf831d88f845e250 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Tue, 23 Jan 2018 19:08:53 +0200 |
| Subject: [PATCH 1038/1795] drm/rcar-du: Use drm_mode_get_hv_timing() to |
| populate plane clip rectangle |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Use drm_mode_get_hv_timing() to fill out the plane clip rectangle. |
| |
| No functional changes as the code already uses crtc_state->mode |
| to populate the clip, which is also what drm_mode_get_hv_timing() |
| uses. |
| |
| Once everyone agrees on this we can move the clip handling into |
| drm_atomic_helper_check_plane_state(). |
| |
| Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20180123170857.13818-1-ville.syrjala@linux.intel.com |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| (cherry picked from commit b46a24bcc2b4c4e8b3cbd8c804ecd987a1354d03) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/gpu/drm/rcar-du/rcar_du_plane.c | 9 ++++----- |
| 1 file changed, 4 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c |
| index 4a3d16cf3ed6..5687a94d4cb1 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c |
| @@ -572,7 +572,7 @@ int __rcar_du_plane_atomic_check(struct drm_plane *plane, |
| { |
| struct drm_device *dev = plane->dev; |
| struct drm_crtc_state *crtc_state; |
| - struct drm_rect clip; |
| + struct drm_rect clip = {}; |
| int ret; |
| |
| if (!state->crtc) { |
| @@ -589,10 +589,9 @@ int __rcar_du_plane_atomic_check(struct drm_plane *plane, |
| if (IS_ERR(crtc_state)) |
| return PTR_ERR(crtc_state); |
| |
| - clip.x1 = 0; |
| - clip.y1 = 0; |
| - clip.x2 = crtc_state->mode.hdisplay; |
| - clip.y2 = crtc_state->mode.vdisplay; |
| + if (crtc_state->enable) |
| + drm_mode_get_hv_timing(&crtc_state->mode, |
| + &clip.x2, &clip.y2); |
| |
| ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip, |
| DRM_PLANE_HELPER_NO_SCALING, |
| -- |
| 2.19.0 |
| |