Backmerge tag 'v4.16-rc7' into drm-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / meson / meson_plane.c

diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index 27bd350..12c80df 100644 (file)
--- 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,10 +57,7 @@ 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;
-
-       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);