All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Yao <mark.yao@rock-chips.com>
To: dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>,
	Daniel Kurtz <djkurtz@chromium.org>,
	Mark Yao <mark.yao@rock-chips.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Daniel Vetter <daniel@ffwll.ch>, Rob Clark <robdclark@gmail.com>,
	tfiga@chromium.org, linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
	sandy.huang@rock-chips.com, dkm@rock-chips.com,
	zwl@rock-chips.com, xw@rock-chips.com
Subject: [PATCH v3 2/6] drm/rockchip: vop: Fix window dest start point
Date: Tue, 21 Jul 2015 16:20:03 +0800	[thread overview]
Message-ID: <1437466807-13689-3-git-send-email-mark.yao@rock-chips.com> (raw)
In-Reply-To: <1437466807-13689-1-git-send-email-mark.yao@rock-chips.com>

Dest start point use crtc_x/y is wrong, crtc_x/y is not equal
to dest.x1/y1 at plane scale.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 3558acb..c7e0283 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -634,11 +634,9 @@ static int vop_update_plane_event(struct drm_plane *plane,
 
 	actual_w = (src.x2 - src.x1) >> 16;
 	actual_h = (src.y2 - src.y1) >> 16;
-	crtc_x = max(0, crtc_x);
-	crtc_y = max(0, crtc_y);
 
-	dsp_stx = crtc_x + crtc->mode.htotal - crtc->mode.hsync_start;
-	dsp_sty = crtc_y + crtc->mode.vtotal - crtc->mode.vsync_start;
+	dsp_stx = dest.x1 + crtc->mode.htotal - crtc->mode.hsync_start;
+	dsp_sty = dest.y1 + crtc->mode.vtotal - crtc->mode.vsync_start;
 
 	offset = (src.x1 >> 16) * (fb->bits_per_pixel >> 3);
 	offset += (src.y1 >> 16) * fb->pitches[0];
-- 
1.7.9.5



WARNING: multiple messages have this Message-ID (diff)
From: Mark Yao <mark.yao@rock-chips.com>
To: dri-devel@lists.freedesktop.org
Cc: zwl@rock-chips.com, linux-kernel@vger.kernel.org,
	tfiga@chromium.org, linux-rockchip@lists.infradead.org,
	xw@rock-chips.com, dkm@rock-chips.com,
	sandy.huang@rock-chips.com, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/6] drm/rockchip: vop: Fix window dest start point
Date: Tue, 21 Jul 2015 16:20:03 +0800	[thread overview]
Message-ID: <1437466807-13689-3-git-send-email-mark.yao@rock-chips.com> (raw)
In-Reply-To: <1437466807-13689-1-git-send-email-mark.yao@rock-chips.com>

Dest start point use crtc_x/y is wrong, crtc_x/y is not equal
to dest.x1/y1 at plane scale.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 3558acb..c7e0283 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -634,11 +634,9 @@ static int vop_update_plane_event(struct drm_plane *plane,
 
 	actual_w = (src.x2 - src.x1) >> 16;
 	actual_h = (src.y2 - src.y1) >> 16;
-	crtc_x = max(0, crtc_x);
-	crtc_y = max(0, crtc_y);
 
-	dsp_stx = crtc_x + crtc->mode.htotal - crtc->mode.hsync_start;
-	dsp_sty = crtc_y + crtc->mode.vtotal - crtc->mode.vsync_start;
+	dsp_stx = dest.x1 + crtc->mode.htotal - crtc->mode.hsync_start;
+	dsp_sty = dest.y1 + crtc->mode.vtotal - crtc->mode.vsync_start;
 
 	offset = (src.x1 >> 16) * (fb->bits_per_pixel >> 3);
 	offset += (src.y1 >> 16) * fb->pitches[0];
-- 
1.7.9.5


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: mark.yao@rock-chips.com (Mark Yao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/6] drm/rockchip: vop: Fix window dest start point
Date: Tue, 21 Jul 2015 16:20:03 +0800	[thread overview]
Message-ID: <1437466807-13689-3-git-send-email-mark.yao@rock-chips.com> (raw)
In-Reply-To: <1437466807-13689-1-git-send-email-mark.yao@rock-chips.com>

Dest start point use crtc_x/y is wrong, crtc_x/y is not equal
to dest.x1/y1 at plane scale.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 3558acb..c7e0283 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -634,11 +634,9 @@ static int vop_update_plane_event(struct drm_plane *plane,
 
 	actual_w = (src.x2 - src.x1) >> 16;
 	actual_h = (src.y2 - src.y1) >> 16;
-	crtc_x = max(0, crtc_x);
-	crtc_y = max(0, crtc_y);
 
-	dsp_stx = crtc_x + crtc->mode.htotal - crtc->mode.hsync_start;
-	dsp_sty = crtc_y + crtc->mode.vtotal - crtc->mode.vsync_start;
+	dsp_stx = dest.x1 + crtc->mode.htotal - crtc->mode.hsync_start;
+	dsp_sty = dest.y1 + crtc->mode.vtotal - crtc->mode.vsync_start;
 
 	offset = (src.x1 >> 16) * (fb->bits_per_pixel >> 3);
 	offset += (src.y1 >> 16) * fb->pitches[0];
-- 
1.7.9.5

  parent reply	other threads:[~2015-07-21  8:21 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-21  8:20 [PATCH v3 0/6] drm/rockchip: fixes and new features Mark Yao
2015-07-21  8:20 ` Mark Yao
2015-07-21  8:20 ` Mark Yao
2015-07-21  8:20 ` [PATCH v3 1/6] drm/rockchip: vop: Fix virtual stride calculation Mark Yao
2015-07-21  8:20   ` Mark Yao
2015-07-21  8:20   ` Mark Yao
2015-07-21  8:20 ` Mark Yao [this message]
2015-07-21  8:20   ` [PATCH v3 2/6] drm/rockchip: vop: Fix window dest start point Mark Yao
2015-07-21  8:20   ` Mark Yao
2015-07-21  8:20 ` [PATCH v3 3/6] drm/rockchip: vop: Add yuv plane support Mark Yao
2015-07-21  8:20   ` Mark Yao
2015-07-21  8:20   ` Mark Yao
2015-07-22 21:51   ` Heiko Stübner
2015-07-22 21:51     ` Heiko Stübner
2015-07-22 21:51     ` Heiko Stübner
2015-07-23  2:01     ` Mark yao
2015-07-23  2:01       ` Mark yao
2015-07-23  2:01       ` Mark yao
2015-07-21  8:25 ` [PATCH v3 4/6] drm/rockchip: vop: Default enable win2/3 area0 bit Mark Yao
2015-07-21  8:25   ` Mark Yao
2015-07-21  8:25   ` Mark Yao
2015-07-22 21:50   ` Heiko Stübner
2015-07-22 21:50     ` Heiko Stübner
2015-07-22 21:50     ` Heiko Stübner
2015-07-21  8:27 ` [PATCH v3 5/6] drm/rockchip: vop: restore vop registers when resume Mark Yao
2015-07-21  8:27   ` Mark Yao
2015-07-21  8:27   ` Mark Yao
2015-07-21  8:28 ` [PATCH v3 6/6] drm/rockchip: vop: support plane scale Mark Yao
2015-07-21  8:28   ` Mark Yao
2015-07-21  8:28   ` Mark Yao
2015-07-22 21:50   ` Heiko Stübner
2015-07-22 21:50     ` Heiko Stübner
2015-07-22 21:50     ` Heiko Stübner
2015-07-22 21:55 ` [PATCH v3 0/6] drm/rockchip: fixes and new features Heiko Stübner
2015-07-22 21:55   ` Heiko Stübner
2015-07-22 21:55   ` Heiko Stübner

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=1437466807-13689-3-git-send-email-mark.yao@rock-chips.com \
    --to=mark.yao@rock-chips.com \
    --cc=airlied@linux.ie \
    --cc=daniel@ffwll.ch \
    --cc=djkurtz@chromium.org \
    --cc=dkm@rock-chips.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=heiko@sntech.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=p.zabel@pengutronix.de \
    --cc=robdclark@gmail.com \
    --cc=sandy.huang@rock-chips.com \
    --cc=tfiga@chromium.org \
    --cc=xw@rock-chips.com \
    --cc=zwl@rock-chips.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.