hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rob Clark 2016-10-17 12:00:21 -04:00
parent 1455adbd45
commit 2c38184883
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
View File

@ -272,7 +272,7 @@ const struct mdp5_cfg_hw msm8x16_config = {
.count = 2, .count = 2,
.base = { 0x14000, 0x16000 }, .base = { 0x14000, 0x16000 },
.caps = MDP_PIPE_CAP_HFLIP | MDP_PIPE_CAP_VFLIP | .caps = MDP_PIPE_CAP_HFLIP | MDP_PIPE_CAP_VFLIP |
MDP_PIPE_CAP_SCALE | MDP_PIPE_CAP_DECIMATION, MDP_PIPE_CAP_DECIMATION,
}, },
.pipe_dma = { .pipe_dma = {
.count = 1, .count = 1,

9
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
View File

@ -307,8 +307,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
format = to_mdp_format(msm_framebuffer_format(state->fb)); format = to_mdp_format(msm_framebuffer_format(state->fb));
if (MDP_FORMAT_IS_YUV(format) && if (MDP_FORMAT_IS_YUV(format) &&
!pipe_supports_yuv(mdp5_plane->caps)) { !pipe_supports_yuv(mdp5_plane->caps)) {
dev_err(plane->dev->dev, DBG("Pipe doesn't support YUV\n");
"Pipe doesn't support YUV\n");
return -EINVAL; return -EINVAL;
} }
@ -316,8 +315,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
if (!(mdp5_plane->caps & MDP_PIPE_CAP_SCALE) && if (!(mdp5_plane->caps & MDP_PIPE_CAP_SCALE) &&
(((state->src_w >> 16) != state->crtc_w) || (((state->src_w >> 16) != state->crtc_w) ||
((state->src_h >> 16) != state->crtc_h))) { ((state->src_h >> 16) != state->crtc_h))) {
dev_err(plane->dev->dev, DBG("Pipe doesn't support scaling (%dx%d -> %dx%d)\n",
"Pipe doesn't support scaling (%dx%d -> %dx%d)\n",
state->src_w >> 16, state->src_h >> 16, state->src_w >> 16, state->src_h >> 16,
state->crtc_w, state->crtc_h); state->crtc_w, state->crtc_h);
@ -333,8 +331,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane,
if ((vflip && !(mdp5_plane->caps & MDP_PIPE_CAP_VFLIP)) || if ((vflip && !(mdp5_plane->caps & MDP_PIPE_CAP_VFLIP)) ||
(hflip && !(mdp5_plane->caps & MDP_PIPE_CAP_HFLIP))) { (hflip && !(mdp5_plane->caps & MDP_PIPE_CAP_HFLIP))) {
dev_err(plane->dev->dev, DBG("Pipe doesn't support flip\n");
"Pipe doesn't support flip\n");
return -EINVAL; return -EINVAL;
} }