diff mbox

drm/rockchip: vop: fix window origin calculation

Message ID 1447149550-18595-1-git-send-email-mark.yao@rock-chips.com
State New
Headers show

Commit Message

yao mark Nov. 10, 2015, 9:59 a.m. UTC
From: Dominik Behr <dbehr@chromium.org>

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 <mark.yao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Yakir Yang Nov. 10, 2015, 10:07 a.m. UTC | #1
Hi Mark,

On 11/10/2015 05:59 PM, Mark Yao wrote:
> From: Dominik Behr <dbehr@chromium.org>
>
> 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 <mark.yao@rock-chips.com>

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

Tested-by: Yakir Yang <ykk@rock-chips.com>

- 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);
>
Heiko Stübner Nov. 10, 2015, 11:42 a.m. UTC | #2
Am Dienstag, 10. November 2015, 17:59:10 schrieb Mark Yao:
> From: Dominik Behr <dbehr@chromium.org>
> 
> 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 <mark.yao@rock-chips.com>

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 <heiko@sntech.de>
Tested-by: Heiko Stuebner <heiko@sntech.de>


Heiko
Heiko Stübner Nov. 10, 2015, 2:57 p.m. UTC | #3
Am Dienstag, 10. November 2015, 17:59:10 schrieb Mark Yao:
> From: Dominik Behr <dbehr@chromium.org>
> 
> 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 <mark.yao@rock-chips.com>

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 <dbehr@chromium.org>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>


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);
>  
>
yao mark Nov. 11, 2015, 12:30 a.m. UTC | #4
On 2015?11?10? 22:57, Heiko Stuebner wrote:
> Am Dienstag, 10. November 2015, 17:59:10 schrieb Mark Yao:
>> From: Dominik Behr <dbehr@chromium.org>
>>
>> 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 <mark.yao@rock-chips.com>
> 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 <dbehr@chromium.org>
> Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
>
>
> 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);
>>   
>>
>
>
>
diff mbox

Patch

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);