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

Commit dd7fa6d8 authored by Philipp Zabel's avatar Philipp Zabel
Browse files

drm/imx: Add support for interlaced scanout 



This patch allows interlaced frame buffer scanout for interlaced output
via HDMI or TV-Encoder.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent d7de390b

drivers/gpu/drm/imx/ipuv3-crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc, 
	return ipu_plane_mode_set(ipu_crtc->plane[0], crtc, mode,

				  crtc->primary->fb,

				  0, 0, mode->hdisplay, mode->vdisplay,

				  x, y, mode->hdisplay, mode->vdisplay);

				  x, y, mode->hdisplay, mode->vdisplay,

				  mode->flags & DRM_MODE_FLAG_INTERLACE);

}



static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc)

drivers/gpu/drm/imx/ipuv3-plane.c

+5 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc, 
		       struct drm_framebuffer *fb, int crtc_x, int crtc_y,

		       unsigned int crtc_w, unsigned int crtc_h,

		       uint32_t src_x, uint32_t src_y,

		       uint32_t src_w, uint32_t src_h)

		       uint32_t src_w, uint32_t src_h, bool interlaced)

{

	struct device *dev = ipu_plane->base.dev->dev;

	int ret;
@@ -213,6 +213,8 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc, 
	ret = ipu_plane_set_base(ipu_plane, fb, src_x, src_y);

	if (ret < 0)

		return ret;

	if (interlaced)

		ipu_cpmem_interlaced_scan(ipu_plane->ipu_ch, fb->pitches[0]);



	ipu_plane->w = src_w;

	ipu_plane->h = src_h;
@@ -312,7 +314,8 @@ static int ipu_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 


	ret = ipu_plane_mode_set(ipu_plane, crtc, &crtc->hwmode, fb,

			crtc_x, crtc_y, crtc_w, crtc_h,

			src_x >> 16, src_y >> 16, src_w >> 16, src_h >> 16);

			src_x >> 16, src_y >> 16, src_w >> 16, src_h >> 16,

			false);

	if (ret < 0) {

		ipu_plane_put_resources(ipu_plane);

		return ret;

drivers/gpu/drm/imx/ipuv3-plane.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int ipu_plane_mode_set(struct ipu_plane *plane, struct drm_crtc *crtc, 
		       struct drm_framebuffer *fb, int crtc_x, int crtc_y,

		       unsigned int crtc_w, unsigned int crtc_h,

		       uint32_t src_x, uint32_t src_y, uint32_t src_w,

		       uint32_t src_h);

		       uint32_t src_h, bool interlaced);



void ipu_plane_enable(struct ipu_plane *plane);

void ipu_plane_disable(struct ipu_plane *plane);