From: Alex Bee <knaerzche@gmail•com>
To: "Sandy Huang" <hjc@rock-chips•com>, "Heiko Stübner " <heiko@sntech•de>
Cc: David Airlie <airlied@linux•ie>, Alex Bee <knaerzche@gmail•com>,
dri-devel@lists•freedesktop.org, linux-kernel@vger•kernel.org,
linux-rockchip@lists•infradead.org,
Daniel Vetter <daniel@ffwll•ch>,
linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/5] drm: rockchip: add scaling for RK3036 win1
Date: Sat, 18 Jul 2020 22:03:19 +0200 [thread overview]
Message-ID: <20200718200323.3559-2-knaerzche@gmail.com> (raw)
In-Reply-To: <20200718200323.3559-1-knaerzche@gmail.com>
This patch adds register definitions needed to make scaling work on
RK3036's win1.
Signed-off-by: Alex Bee <knaerzche@gmail•com>
---
drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index 80053d91a301..b046910129fb 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -77,15 +77,20 @@ static const uint64_t format_modifiers_win_lite[] = {
DRM_FORMAT_MOD_INVALID,
};
-static const struct vop_scl_regs rk3036_win_scl = {
+static const struct vop_scl_regs rk3036_win0_scl = {
.scale_yrgb_x = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 0x0),
.scale_yrgb_y = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 16),
.scale_cbcr_x = VOP_REG(RK3036_WIN0_SCL_FACTOR_CBR, 0xffff, 0x0),
.scale_cbcr_y = VOP_REG(RK3036_WIN0_SCL_FACTOR_CBR, 0xffff, 16),
};
+static const struct vop_scl_regs rk3036_win1_scl = {
+ .scale_yrgb_x = VOP_REG(RK3036_WIN1_SCL_FACTOR_YRGB, 0xffff, 0x0),
+ .scale_yrgb_y = VOP_REG(RK3036_WIN1_SCL_FACTOR_YRGB, 0xffff, 16),
+};
+
static const struct vop_win_phy rk3036_win0_data = {
- .scl = &rk3036_win_scl,
+ .scl = &rk3036_win0_scl,
.data_formats = formats_win_full,
.nformats = ARRAY_SIZE(formats_win_full),
.format_modifiers = format_modifiers_win_full,
@@ -102,6 +107,7 @@ static const struct vop_win_phy rk3036_win0_data = {
};
static const struct vop_win_phy rk3036_win1_data = {
+ .scl = &rk3036_win1_scl,
.data_formats = formats_win_lite,
.nformats = ARRAY_SIZE(formats_win_lite),
.format_modifiers = format_modifiers_win_lite,
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-18 20:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 20:03 [PATCH 0/5] drm: rockchip: various ports for older VOPs Alex Bee
2020-07-18 20:03 ` Alex Bee [this message]
2020-07-18 20:03 ` [PATCH 2/5] drm: rockchip: add missing registers for RK3188 Alex Bee
2020-07-20 8:22 ` [PATCH 2/5] drm: rockchip: add missing registers for RK3188【请注意，邮件由linux-rockchip-bounces+andy.yan=rock-chips.com@lists•infradead.org代发】 Andy Yan
2020-07-20 14:46 ` Alex Bee
2020-07-21 1:17 ` Andy Yan
2020-07-21 2:46 ` Alex Bee
2020-07-18 20:03 ` [PATCH 3/5] drm: rockchip: add alpha support for RK3036, RK3066, RK3126 and RK3188 Alex Bee
2020-07-18 20:03 ` [PATCH 4/5] drm: rockchip: set alpha_en to 0 if it is not used Alex Bee
2020-07-18 20:03 ` [PATCH 5/5] drm: rockchip: use overlay windows as such Alex Bee
2020-07-25 9:08 ` Paolo Sabatino
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=20200718200323.3559-2-knaerzche@gmail.com \
--to=knaerzche@gmail$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=daniel@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=heiko@sntech$(echo .)de \
--cc=hjc@rock-chips$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-rockchip@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