diff options
author | Rob Clark <robdclark@gmail.com> | 2016-10-17 12:00:21 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2016-11-02 10:49:43 -0400 |
commit | 07cd2e36263af34f7f0b48e36eff5d4b77d5756a (patch) | |
tree | 895f2b9f0a36bc41f42b96984b8781b98fe39aea | |
parent | 31e4801aa2e59d4b42dc0fd42846a3aa7a6361af (diff) |
drm/msm/mdp5: no scaling support on RGBn pipes for 8x16
Looks like cut/paste error from the other device cfgs (which do support
scaling on RGBn pipes).
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c index ac9e4cde1380..0e2bc5636c81 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | |||
@@ -272,7 +272,7 @@ const struct mdp5_cfg_hw msm8x16_config = { | |||
272 | .count = 2, | 272 | .count = 2, |
273 | .base = { 0x14000, 0x16000 }, | 273 | .base = { 0x14000, 0x16000 }, |
274 | .caps = MDP_PIPE_CAP_HFLIP | MDP_PIPE_CAP_VFLIP | | 274 | .caps = MDP_PIPE_CAP_HFLIP | MDP_PIPE_CAP_VFLIP | |
275 | MDP_PIPE_CAP_SCALE | MDP_PIPE_CAP_DECIMATION, | 275 | MDP_PIPE_CAP_DECIMATION, |
276 | }, | 276 | }, |
277 | .pipe_dma = { | 277 | .pipe_dma = { |
278 | .count = 1, | 278 | .count = 1, |
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index 951c002b05df..83bf997dda03 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | |||
@@ -292,8 +292,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane, | |||
292 | format = to_mdp_format(msm_framebuffer_format(state->fb)); | 292 | format = to_mdp_format(msm_framebuffer_format(state->fb)); |
293 | if (MDP_FORMAT_IS_YUV(format) && | 293 | if (MDP_FORMAT_IS_YUV(format) && |
294 | !pipe_supports_yuv(mdp5_plane->caps)) { | 294 | !pipe_supports_yuv(mdp5_plane->caps)) { |
295 | dev_err(plane->dev->dev, | 295 | DBG("Pipe doesn't support YUV\n"); |
296 | "Pipe doesn't support YUV\n"); | ||
297 | 296 | ||
298 | return -EINVAL; | 297 | return -EINVAL; |
299 | } | 298 | } |
@@ -301,8 +300,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane, | |||
301 | if (!(mdp5_plane->caps & MDP_PIPE_CAP_SCALE) && | 300 | if (!(mdp5_plane->caps & MDP_PIPE_CAP_SCALE) && |
302 | (((state->src_w >> 16) != state->crtc_w) || | 301 | (((state->src_w >> 16) != state->crtc_w) || |
303 | ((state->src_h >> 16) != state->crtc_h))) { | 302 | ((state->src_h >> 16) != state->crtc_h))) { |
304 | dev_err(plane->dev->dev, | 303 | DBG("Pipe doesn't support scaling (%dx%d -> %dx%d)\n", |
305 | "Pipe doesn't support scaling (%dx%d -> %dx%d)\n", | ||
306 | state->src_w >> 16, state->src_h >> 16, | 304 | state->src_w >> 16, state->src_h >> 16, |
307 | state->crtc_w, state->crtc_h); | 305 | state->crtc_w, state->crtc_h); |
308 | 306 | ||
@@ -313,8 +311,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane, | |||
313 | vflip = !!(state->rotation & DRM_REFLECT_Y); | 311 | vflip = !!(state->rotation & DRM_REFLECT_Y); |
314 | if ((vflip && !(mdp5_plane->caps & MDP_PIPE_CAP_VFLIP)) || | 312 | if ((vflip && !(mdp5_plane->caps & MDP_PIPE_CAP_VFLIP)) || |
315 | (hflip && !(mdp5_plane->caps & MDP_PIPE_CAP_HFLIP))) { | 313 | (hflip && !(mdp5_plane->caps & MDP_PIPE_CAP_HFLIP))) { |
316 | dev_err(plane->dev->dev, | 314 | DBG("Pipe doesn't support flip\n"); |
317 | "Pipe doesn't support flip\n"); | ||
318 | 315 | ||
319 | return -EINVAL; | 316 | return -EINVAL; |
320 | } | 317 | } |