From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Fri, 26 Jan 2018 06:23:41 +0100 Subject: [PATCH 5/5] drm: Don't pass clip to drm_atomic_helper_check_plane_state() In-Reply-To: <20180123170857.13818-5-ville.syrjala@linux.intel.com> References: <20180123170857.13818-1-ville.syrjala@linux.intel.com> <20180123170857.13818-5-ville.syrjala@linux.intel.com> Message-ID: To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org On 23/01/2018 18:08, Ville Syrjala wrote: > From: Ville Syrj?l? > > Move the plane clip rectangle handling into > drm_atomic_helper_check_plane_state(). Drivers no longer > have to worry about such mundane details. > > v2: Convert armada, rcar, and sun4i as well > > Cc: Liviu Dudau > Cc: Brian Starkey > Cc: Mali DP Maintainers > Cc: Daniel Vetter > Cc: Gustavo Padovan > Cc: Sean Paul > Cc: Philipp Zabel > Cc: CK Hu > Cc: Neil Armstrong > Cc: Rob Clark > Cc: Ben Skeggs > Cc: Laurent Pinchart > Cc: Sandy Huang > Cc: "Heiko St?bner" > Cc: Maxime Ripard > Cc: Thierry Reding > Cc: VMware Graphics > Cc: Sinclair Yeh > Cc: Thomas Hellstrom > Cc: Shawn Guo > Cc: Archit Taneja > Cc: linux-amlogic at lists.infradead.org > Cc: linux-arm-msm at vger.kernel.org > Cc: freedreno at lists.freedesktop.org > Cc: nouveau at lists.freedesktop.org > Cc: linux-renesas-soc at vger.kernel.org > Cc: linux-tegra at vger.kernel.org > Cc: Russell King > Suggested-by: Daniel Vetter > Signed-off-by: Ville Syrj?l? > Reviewed-by: Daniel Vetter > Reviewed-by: Thierry Reding > Reviewed-by: Archit Taneja #msm > --- > drivers/gpu/drm/arm/hdlcd_crtc.c | 7 +------ > drivers/gpu/drm/arm/malidp_planes.c | 7 +------ > drivers/gpu/drm/armada/armada_crtc.c | 8 ++------ > drivers/gpu/drm/armada/armada_overlay.c | 8 ++------ > drivers/gpu/drm/drm_atomic_helper.c | 12 +++++++----- > drivers/gpu/drm/drm_plane_helper.c | 11 +++-------- > drivers/gpu/drm/drm_simple_kms_helper.c | 6 ------ > drivers/gpu/drm/i915/intel_display.c | 12 ------------ > drivers/gpu/drm/imx/ipuv3-plane.c | 7 +------ > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 7 +------ > drivers/gpu/drm/meson/meson_plane.c | 7 +------ > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 14 ++------------ > drivers/gpu/drm/nouveau/nv50_display.c | 12 ------------ > drivers/gpu/drm/rcar-du/rcar_du_plane.c | 7 +------ > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 7 +------ > drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 7 +------ > drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 7 +------ > drivers/gpu/drm/tegra/plane.c | 7 +------ > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 7 +------ > drivers/gpu/drm/zte/zx_plane.c | 13 +------------ > include/drm/drm_atomic_helper.h | 1 - > include/drm/drm_plane_helper.h | 1 - > 22 files changed, 28 insertions(+), 147 deletions(-) > [...] > diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c > index 3801bee1f9e6..c78a3a59f58c 100644 > --- a/drivers/gpu/drm/meson/meson_plane.c > +++ b/drivers/gpu/drm/meson/meson_plane.c > @@ -49,7 +49,6 @@ static int meson_plane_atomic_check(struct drm_plane *plane, > struct drm_plane_state *state) > { > struct drm_crtc_state *crtc_state; > - struct drm_rect clip = { 0, }; > > if (!state->crtc) > return 0; > @@ -58,11 +57,7 @@ static int meson_plane_atomic_check(struct drm_plane *plane, > if (IS_ERR(crtc_state)) > return PTR_ERR(crtc_state); > > - 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, > + return drm_atomic_helper_check_plane_state(state, crtc_state, > DRM_PLANE_HELPER_NO_SCALING, > DRM_PLANE_HELPER_NO_SCALING, > true, true); [...] > diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h > index 4842ee9485ce..26aaba58d6ce 100644 > --- a/include/drm/drm_atomic_helper.h > +++ b/include/drm/drm_atomic_helper.h > @@ -40,7 +40,6 @@ int drm_atomic_helper_check_modeset(struct drm_device *dev, > struct drm_atomic_state *state); > int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, > const struct drm_crtc_state *crtc_state, > - const struct drm_rect *clip, > int min_scale, > int max_scale, > bool can_position, > diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h > index 8aa49c0ecd4d..28d7ce620729 100644 > --- a/include/drm/drm_plane_helper.h > +++ b/include/drm/drm_plane_helper.h > @@ -43,7 +43,6 @@ int drm_plane_helper_check_update(struct drm_plane *plane, > struct drm_framebuffer *fb, > struct drm_rect *src, > struct drm_rect *dest, > - const struct drm_rect *clip, > unsigned int rotation, > int min_scale, > int max_scale, > For meson driver, Acked-by: Neil Armstrong