Commit 57270b81 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/armada: Construct a temporary crtc state for plane checks 



As armada isn't an atomic driver trying to pass a non-populated
crtc->state to drm_atomic_helper_check_plane_state() will end in tears.
Construct a temporary crtc state a la drm_plane_helper_check_update()
and pass that instead. For now we just really need crtc_state->enable
to be there.

Cc: Dave Airlie <airlied@redhat.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180123170857.13818-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
parent d8eb9de4

drivers/gpu/drm/armada/armada_crtc.c

+5 −1
Original line number Diff line number Diff line
@@ -1200,13 +1200,17 @@ static int armada_drm_primary_update(struct drm_plane *plane, 
		.crtc_h = crtc_h,

		.rotation = DRM_MODE_ROTATE_0,

	};

	struct drm_crtc_state crtc_state = {

		.crtc = crtc,

		.enable = crtc->enabled,

	};

	const struct drm_rect clip = {

		.x2 = crtc->mode.hdisplay,

		.y2 = crtc->mode.vdisplay,

	};

	int ret;



	ret = drm_atomic_helper_check_plane_state(&state, crtc->state, &clip, 0,

	ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, &clip, 0,

						  INT_MAX, true, false);

	if (ret)

		return ret;

drivers/gpu/drm/armada/armada_overlay.c

+5 −1
Original line number Diff line number Diff line
@@ -205,6 +205,10 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, 
		.crtc_h = crtc_h,

		.rotation = DRM_MODE_ROTATE_0,

	};

	struct drm_crtc_state crtc_state = {

		.crtc = crtc,

		.enable = crtc->enabled,

	};

	const struct drm_rect clip = {

		.x2 = crtc->mode.hdisplay,

		.y2 = crtc->mode.vdisplay,
@@ -215,7 +219,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, 
				 crtc_x, crtc_y, crtc_w, crtc_h,

				 src_x, src_y, src_w, src_h);



	ret = drm_atomic_helper_check_plane_state(&state, crtc->state, &clip, 0,

	ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, &clip, 0,

						  INT_MAX, true, false);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE