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

Commit 07cd2e36 authored by Rob Clark's avatar Rob Clark
Browse files

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: default avatarRob Clark <robdclark@gmail.com>
parent 31e4801a

drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ const struct mdp5_cfg_hw msm8x16_config = { 
		.count = 2,

		.base = { 0x14000, 0x16000 },

		.caps = MDP_PIPE_CAP_HFLIP | MDP_PIPE_CAP_VFLIP |

				MDP_PIPE_CAP_SCALE | MDP_PIPE_CAP_DECIMATION,

				MDP_PIPE_CAP_DECIMATION,

	},

	.pipe_dma = {

		.count = 1,

drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c

+3 −6
Original line number Diff line number Diff line
@@ -292,8 +292,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane, 
		format = to_mdp_format(msm_framebuffer_format(state->fb));

		if (MDP_FORMAT_IS_YUV(format) &&

			!pipe_supports_yuv(mdp5_plane->caps)) {

			dev_err(plane->dev->dev,

				"Pipe doesn't support YUV\n");

			DBG("Pipe doesn't support YUV\n");



			return -EINVAL;

		}
@@ -301,8 +300,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane, 
		if (!(mdp5_plane->caps & MDP_PIPE_CAP_SCALE) &&

			(((state->src_w >> 16) != state->crtc_w) ||

			((state->src_h >> 16) != state->crtc_h))) {

			dev_err(plane->dev->dev,

				"Pipe doesn't support scaling (%dx%d -> %dx%d)\n",

			DBG("Pipe doesn't support scaling (%dx%d -> %dx%d)\n",

				state->src_w >> 16, state->src_h >> 16,

				state->crtc_w, state->crtc_h);
@@ -313,8 +311,7 @@ static int mdp5_plane_atomic_check(struct drm_plane *plane, 
		vflip = !!(state->rotation & DRM_REFLECT_Y);

		if ((vflip && !(mdp5_plane->caps & MDP_PIPE_CAP_VFLIP)) ||

			(hflip && !(mdp5_plane->caps & MDP_PIPE_CAP_HFLIP))) {

			dev_err(plane->dev->dev,

				"Pipe doesn't support flip\n");

			DBG("Pipe doesn't support flip\n");



			return -EINVAL;

		}