2015-11-10 10:00:55

by Mark yao

[permalink] [raw]
Subject: [PATCH] drm/rockchip: vop: fix window origin calculation

From: Dominik Behr <[email protected]>

VOP_WINx_DSP_ST does not require subtracting 1 from the values written to
it. It actually causes the screen to be shifted by one pixel.

Signed-off-by: Mark Yao <[email protected]>
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 48719df..4730ae4 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -959,8 +959,8 @@ static int vop_update_plane_event(struct drm_plane *plane,
val = (dest.y2 - dest.y1 - 1) << 16;
val |= (dest.x2 - dest.x1 - 1) & 0xffff;
VOP_WIN_SET(vop, win, dsp_info, val);
- val = (dsp_sty - 1) << 16;
- val |= (dsp_stx - 1) & 0xffff;
+ val = dsp_sty << 16;
+ val |= dsp_stx & 0xffff;
VOP_WIN_SET(vop, win, dsp_st, val);
VOP_WIN_SET(vop, win, rb_swap, rb_swap);

--
1.7.9.5


2015-11-10 10:07:31

by Yakir Yang

[permalink] [raw]
Subject: Re: [PATCH] drm/rockchip: vop: fix window origin calculation

Hi Mark,

On 11/10/2015 05:59 PM, Mark Yao wrote:
> From: Dominik Behr <[email protected]>
>
> VOP_WINx_DSP_ST does not require subtracting 1 from the values written to
> it. It actually causes the screen to be shifted by one pixel.
>
> Signed-off-by: Mark Yao <[email protected]>

I have meet the screen shift problem on RK3036 SDK board, and this
could fix my problem, so

Tested-by: Yakir Yang <[email protected]>

- Yakir

> ---
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index 48719df..4730ae4 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -959,8 +959,8 @@ static int vop_update_plane_event(struct drm_plane *plane,
> val = (dest.y2 - dest.y1 - 1) << 16;
> val |= (dest.x2 - dest.x1 - 1) & 0xffff;
> VOP_WIN_SET(vop, win, dsp_info, val);
> - val = (dsp_sty - 1) << 16;
> - val |= (dsp_stx - 1) & 0xffff;
> + val = dsp_sty << 16;
> + val |= dsp_stx & 0xffff;
> VOP_WIN_SET(vop, win, dsp_st, val);
> VOP_WIN_SET(vop, win, rb_swap, rb_swap);
>

2015-11-10 11:42:51

by Heiko Stuebner

[permalink] [raw]
Subject: Re: [PATCH] drm/rockchip: vop: fix window origin calculation

Am Dienstag, 10. November 2015, 17:59:10 schrieb Mark Yao:
> From: Dominik Behr <[email protected]>
>
> VOP_WINx_DSP_ST does not require subtracting 1 from the values written to
> it. It actually causes the screen to be shifted by one pixel.
>
> Signed-off-by: Mark Yao <[email protected]>

funny I never noticed that shift, but now that you mention it, I see it too
on my Chromebook and the patch fixes this. I've also looked up the
matching data in the TRM, so

Reviewed-by: Heiko Stuebner <[email protected]>
Tested-by: Heiko Stuebner <[email protected]>


Heiko

2015-11-10 14:57:56

by Heiko Stuebner

[permalink] [raw]
Subject: Re: [PATCH] drm/rockchip: vop: fix window origin calculation

Am Dienstag, 10. November 2015, 17:59:10 schrieb Mark Yao:
> From: Dominik Behr <[email protected]>
>
> VOP_WINx_DSP_ST does not require subtracting 1 from the values written to
> it. It actually causes the screen to be shifted by one pixel.
>
> Signed-off-by: Mark Yao <[email protected]>

One thing I noticed, the original patch [0] had a Signed-off from
Dominik already and you should keep that as he is the author, and then
add your Signed-off below that, as you are the submitter,

So it would look like:

Signed-off-by: Dominik Behr <[email protected]>
Signed-off-by: Mark Yao <[email protected]>


That may not need a repost, but should probably be corrected when applying
the patch.

Heiko

[0] https://chromium-review.googlesource.com/#/c/233251/


> ---
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index 48719df..4730ae4 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -959,8 +959,8 @@ static int vop_update_plane_event(struct drm_plane *plane,
> val = (dest.y2 - dest.y1 - 1) << 16;
> val |= (dest.x2 - dest.x1 - 1) & 0xffff;
> VOP_WIN_SET(vop, win, dsp_info, val);
> - val = (dsp_sty - 1) << 16;
> - val |= (dsp_stx - 1) & 0xffff;
> + val = dsp_sty << 16;
> + val |= dsp_stx & 0xffff;
> VOP_WIN_SET(vop, win, dsp_st, val);
> VOP_WIN_SET(vop, win, rb_swap, rb_swap);
>
>

2015-11-11 00:31:07

by Mark yao

[permalink] [raw]
Subject: Re: [PATCH] drm/rockchip: vop: fix window origin calculation

On 2015年11月10日 22:57, Heiko Stuebner wrote:
> Am Dienstag, 10. November 2015, 17:59:10 schrieb Mark Yao:
>> From: Dominik Behr <[email protected]>
>>
>> VOP_WINx_DSP_ST does not require subtracting 1 from the values written to
>> it. It actually causes the screen to be shifted by one pixel.
>>
>> Signed-off-by: Mark Yao <[email protected]>
> One thing I noticed, the original patch [0] had a Signed-off from
> Dominik already and you should keep that as he is the author, and then
> add your Signed-off below that, as you are the submitter,
>
> So it would look like:
>
> Signed-off-by: Dominik Behr <[email protected]>
> Signed-off-by: Mark Yao <[email protected]>
>
>
> That may not need a repost, but should probably be corrected when applying
> the patch.
>
> Heiko
>
> [0] https://chromium-review.googlesource.com/#/c/233251/
>
Got it, thanks.
>> ---
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> index 48719df..4730ae4 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> @@ -959,8 +959,8 @@ static int vop_update_plane_event(struct drm_plane *plane,
>> val = (dest.y2 - dest.y1 - 1) << 16;
>> val |= (dest.x2 - dest.x1 - 1) & 0xffff;
>> VOP_WIN_SET(vop, win, dsp_info, val);
>> - val = (dsp_sty - 1) << 16;
>> - val |= (dsp_stx - 1) & 0xffff;
>> + val = dsp_sty << 16;
>> + val |= dsp_stx & 0xffff;
>> VOP_WIN_SET(vop, win, dsp_st, val);
>> VOP_WIN_SET(vop, win, rb_swap, rb_swap);
>>
>>
>
>
>


--
Mark Yao