]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/meson: Use drm_mode_get_hv_timing() to populate plane clip rectangle
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 23 Nov 2017 19:04:55 +0000 (21:04 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 23 Jan 2018 15:41:49 +0000 (17:41 +0200)
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>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: linux-amlogic@lists.infradead.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171123190502.28449-9-ville.syrjala@linux.intel.com
Reviewed-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/meson/meson_plane.c

index d0a6ac8390f39fd64dd194b76c3078e374ef51f2..3801bee1f9e627bfa32b2b22725bba7d18556414 100644 (file)
@@ -58,8 +58,9 @@ static int meson_plane_atomic_check(struct drm_plane *plane,
        if (IS_ERR(crtc_state))
                return PTR_ERR(crtc_state);
 
-       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);
 
        return drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
                                                   DRM_PLANE_HELPER_NO_SCALING,