Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1254471

[PATCH 5/6] drm/vc4: Make sure that planes aren't scaled.

Show all headers | View raw

We would scan out the memory around them if an upscale was attempted,
and would just scan out incorrectly for downscaling.

Signed-off-by: Eric Anholt <eric@anholt.net>
---

It looks like, while modetest only wants to set scaling on overlay
planes, one could do so on our primary/cursor planes if the fd was in
universal planes mode.

 drivers/gpu/drm/vc4/vc4_plane.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 2db5092..887f3ca 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -157,6 +157,16 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
 	int crtc_w = state->crtc_w;
 	int crtc_h = state->crtc_h;
 
+	if (state->crtc_w << 16 != state->src_w ||
+	    state->crtc_h << 16 != state->src_h) {
+		/* We don't support scaling yet, which involves
+		 * allocating the LBM memory for scaling temporary
+		 * storage, and putting filter kernels in the HVS
+		 * context.
+		 */
+		return -EINVAL;
+	}
+
 	if (crtc_x < 0) {
 		offset += drm_format_plane_cpp(fb->pixel_format, 0) * -crtc_x;
 		crtc_w += crtc_x;
-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

VC4 fixes for -next Eric Anholt <eric@anholt.net> - 2015-10-23 12:40 +0200
  [PATCH 4/6] drm/vc4: Fix some failure to track __iomem decorations on pointers. Eric Anholt <eric@anholt.net> - 2015-10-23 12:40 +0200
    Re: [PATCH 4/6] drm/vc4: Fix some failure to track __iomem decorations on pointers. Eric Anholt <eric@anholt.net> - 2015-10-23 18:40 +0200
  [PATCH 6/6] drm/vc4: Add support for more a few more RGB display plane formats. Eric Anholt <eric@anholt.net> - 2015-10-23 12:40 +0200
  [PATCH 1/6] drm/vc4: vc4_plane_duplicate_state() can be static Eric Anholt <eric@anholt.net> - 2015-10-23 12:40 +0200
  [PATCH 3/6] drm/vc4: fix itnull.cocci warnings Eric Anholt <eric@anholt.net> - 2015-10-23 12:40 +0200
  [PATCH 5/6] drm/vc4: Make sure that planes aren't scaled. Eric Anholt <eric@anholt.net> - 2015-10-23 12:40 +0200
    Re: [PATCH 5/6] drm/vc4: Make sure that planes aren't scaled. Daniel Vetter <daniel@ffwll.ch> - 2015-10-23 13:30 +0200
  [PATCH 2/6] drm/vc4: fix platform_no_drv_owner.cocci warnings Eric Anholt <eric@anholt.net> - 2015-10-23 12:40 +0200

csiph-web