Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c423bc85 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: check that plane is inside crtc 



DRM allows planes to be partially off-screen, but DSS hardware does not.
This patch adds the necessary check to reject plane configs if the plane
is not fully inside the crtc.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent a903e3b6

drivers/gpu/drm/omapdrm/omap_plane.c

+26 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>
@@ -153,9 +154,34 @@ static void omap_plane_atomic_disable(struct drm_plane *plane, 
	dispc_ovl_enable(omap_plane->id, false);

}



static int omap_plane_atomic_check(struct drm_plane *plane,

				   struct drm_plane_state *state)

{

	struct drm_crtc_state *crtc_state;



	if (!state->crtc)

		return 0;



	crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);

	if (IS_ERR(crtc_state))

		return PTR_ERR(crtc_state);



	if (state->crtc_x < 0 || state->crtc_y < 0)

		return -EINVAL;



	if (state->crtc_x + state->crtc_w > crtc_state->adjusted_mode.hdisplay)

		return -EINVAL;



	if (state->crtc_y + state->crtc_h > crtc_state->adjusted_mode.vdisplay)

		return -EINVAL;



	return 0;

}



static const struct drm_plane_helper_funcs omap_plane_helper_funcs = {

	.prepare_fb = omap_plane_prepare_fb,

	.cleanup_fb = omap_plane_cleanup_fb,

	.atomic_check = omap_plane_atomic_check,

	.atomic_update = omap_plane_atomic_update,

	.atomic_disable = omap_plane_atomic_disable,

};