From: mark.yao@rock-chips•com (Mark yao)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2] drm/rockchip: vop: fix crtc size in plane check
Date: Mon, 14 Mar 2016 10:39:16 +0800 [thread overview]
Message-ID: <56E62454.1070808@rock-chips.com> (raw)
In-Reply-To: <1457089443-6069-1-git-send-email-john@metanate.com>
On 2016?03?04? 19:04, John Keeping wrote:
> If the geometry of a crtc is changing in an atomic update then we must
> validate the plane size against the new state of the crtc and not the
> current size, otherwise if the crtc size is increasing the plane will be
> cropped at the previous size and will not fill the screen.
>
> Signed-off-by: John Keeping <john@metanate•com>
> ---
> On Fri, 04 Mar 2016 09:04:57 +0800, Mark yao wrote:
>> On 2016?02?22? 20:22, John Keeping wrote:
>>> If the geometry of a crtc is changing in an atomic update then we much
>> I think "we much validate" should be "we must validate".:-)
> Yes, here's v2 with that fixed.
>
>>> validate the plane size against the new state of the crtc and not the
>>> current size, otherwise if the crtc size is increasing the plane will be
>>> cropped at the previous size and will not fill the screen.
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index fd37054..82d55bd 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -549,6 +549,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
> struct drm_plane_state *state)
> {
> struct drm_crtc *crtc = state->crtc;
> + struct drm_crtc_state *crtc_state;
> struct drm_framebuffer *fb = state->fb;
> struct vop_win *vop_win = to_vop_win(plane);
> struct vop_plane_state *vop_plane_state = to_vop_plane_state(state);
> @@ -563,12 +564,13 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
> int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :
> DRM_PLANE_HELPER_NO_SCALING;
>
> - crtc = crtc ? crtc : plane->state->crtc;
> - /*
> - * Both crtc or plane->state->crtc can be null.
> - */
> if (!crtc || !fb)
> goto out_disable;
> +
> + crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc);
> + if (WARN_ON(!crtc_state))
> + return -EINVAL;
> +
> src->x1 = state->src_x;
> src->y1 = state->src_y;
> src->x2 = state->src_x + state->src_w;
> @@ -580,8 +582,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
>
> clip.x1 = 0;
> clip.y1 = 0;
> - clip.x2 = crtc->mode.hdisplay;
> - clip.y2 = crtc->mode.vdisplay;
> + clip.x2 = crtc_state->adjusted_mode.hdisplay;
> + clip.y2 = crtc_state->adjusted_mode.vdisplay;
>
> ret = drm_plane_helper_check_update(plane, crtc, state->fb,
> src, dest, &clip,
Looks good for me, applied into my drm-fixes.
Thanks for the fix.
--
?ark Yao
prev parent reply other threads:[~2016-03-14 2:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 12:22 [PATCH] drm/rockchip: vop: fix crtc size in plane check John Keeping
2016-03-04 1:04 ` Mark yao
2016-03-04 11:04 ` [PATCH v2] " John Keeping
2016-03-14 2:39 ` Mark yao [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56E62454.1070808@rock-chips.com \
--to=mark.yao@rock-chips$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox