diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2014-07-11 12:02:06 -0400 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2015-03-31 05:59:32 -0400 |
commit | dd7fa6d88796b1aaa511abbac38963aa1c443443 (patch) | |
tree | c348c2875eb554c32d5bcde00e04b2c9e0ea130b /drivers/gpu | |
parent | d7de390bff7ad0f551fc0e409543e98db86a65df (diff) |
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: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/imx/ipuv3-crtc.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.c | 7 | ||||
-rw-r--r-- | drivers/gpu/drm/imx/ipuv3-plane.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index 98551e356e12..09d6f98f4cbd 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c | |||
@@ -202,7 +202,8 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc, | |||
202 | return ipu_plane_mode_set(ipu_crtc->plane[0], crtc, mode, | 202 | return ipu_plane_mode_set(ipu_crtc->plane[0], crtc, mode, |
203 | crtc->primary->fb, | 203 | crtc->primary->fb, |
204 | 0, 0, mode->hdisplay, mode->vdisplay, | 204 | 0, 0, mode->hdisplay, mode->vdisplay, |
205 | x, y, mode->hdisplay, mode->vdisplay); | 205 | x, y, mode->hdisplay, mode->vdisplay, |
206 | mode->flags & DRM_MODE_FLAG_INTERLACE); | ||
206 | } | 207 | } |
207 | 208 | ||
208 | static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc) | 209 | static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc) |
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 6987e16fe99b..878a643d72e4 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c | |||
@@ -99,7 +99,7 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc, | |||
99 | struct drm_framebuffer *fb, int crtc_x, int crtc_y, | 99 | struct drm_framebuffer *fb, int crtc_x, int crtc_y, |
100 | unsigned int crtc_w, unsigned int crtc_h, | 100 | unsigned int crtc_w, unsigned int crtc_h, |
101 | uint32_t src_x, uint32_t src_y, | 101 | uint32_t src_x, uint32_t src_y, |
102 | uint32_t src_w, uint32_t src_h) | 102 | uint32_t src_w, uint32_t src_h, bool interlaced) |
103 | { | 103 | { |
104 | struct device *dev = ipu_plane->base.dev->dev; | 104 | struct device *dev = ipu_plane->base.dev->dev; |
105 | int ret; | 105 | int ret; |
@@ -213,6 +213,8 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc, | |||
213 | ret = ipu_plane_set_base(ipu_plane, fb, src_x, src_y); | 213 | ret = ipu_plane_set_base(ipu_plane, fb, src_x, src_y); |
214 | if (ret < 0) | 214 | if (ret < 0) |
215 | return ret; | 215 | return ret; |
216 | if (interlaced) | ||
217 | ipu_cpmem_interlaced_scan(ipu_plane->ipu_ch, fb->pitches[0]); | ||
216 | 218 | ||
217 | ipu_plane->w = src_w; | 219 | ipu_plane->w = src_w; |
218 | ipu_plane->h = src_h; | 220 | ipu_plane->h = src_h; |
@@ -312,7 +314,8 @@ static int ipu_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, | |||
312 | 314 | ||
313 | ret = ipu_plane_mode_set(ipu_plane, crtc, &crtc->hwmode, fb, | 315 | ret = ipu_plane_mode_set(ipu_plane, crtc, &crtc->hwmode, fb, |
314 | crtc_x, crtc_y, crtc_w, crtc_h, | 316 | crtc_x, crtc_y, crtc_w, crtc_h, |
315 | src_x >> 16, src_y >> 16, src_w >> 16, src_h >> 16); | 317 | src_x >> 16, src_y >> 16, src_w >> 16, src_h >> 16, |
318 | false); | ||
316 | if (ret < 0) { | 319 | if (ret < 0) { |
317 | ipu_plane_put_resources(ipu_plane); | 320 | ipu_plane_put_resources(ipu_plane); |
318 | return ret; | 321 | return ret; |
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/gpu/drm/imx/ipuv3-plane.h index af125fb40ef5..9b5eff18f5b8 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.h +++ b/drivers/gpu/drm/imx/ipuv3-plane.h | |||
@@ -42,7 +42,7 @@ int ipu_plane_mode_set(struct ipu_plane *plane, struct drm_crtc *crtc, | |||
42 | struct drm_framebuffer *fb, int crtc_x, int crtc_y, | 42 | struct drm_framebuffer *fb, int crtc_x, int crtc_y, |
43 | unsigned int crtc_w, unsigned int crtc_h, | 43 | unsigned int crtc_w, unsigned int crtc_h, |
44 | uint32_t src_x, uint32_t src_y, uint32_t src_w, | 44 | uint32_t src_x, uint32_t src_y, uint32_t src_w, |
45 | uint32_t src_h); | 45 | uint32_t src_h, bool interlaced); |
46 | 46 | ||
47 | void ipu_plane_enable(struct ipu_plane *plane); | 47 | void ipu_plane_enable(struct ipu_plane *plane); |
48 | void ipu_plane_disable(struct ipu_plane *plane); | 48 | void ipu_plane_disable(struct ipu_plane *plane); |