* [PATCH] drm/rockchip: vop: fix some register define error for px30
@ 2018-08-28 8:32 Sandy Huang
2018-08-29 12:03 ` Heiko Stuebner
0 siblings, 1 reply; 2+ messages in thread
From: Sandy Huang @ 2018-08-28 8:32 UTC (permalink / raw)
To: hjc, heiko, David Airlie
Cc: dri-devel, linux-arm-kernel, linux-rockchip, linux-kernel
1. interrupt register define error lead to enable interrupt failed;
2. px30 unsupport hdmi output;
3. there are some hardware designed bug, we must swap win2 gate and
enable offset, otherwise will appear vop iommu pagefault.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index d824ca6..7f29913 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -190,10 +190,10 @@ static const int px30_vop_intrs[] = {
static const struct vop_intr px30_intr = {
.intrs = px30_vop_intrs,
.nintrs = ARRAY_SIZE(px30_vop_intrs),
- .line_flag_num[0] = VOP_REG(PX30_LINE_FLAG, 0xfff, 12),
- .status = VOP_REG_SYNC(PX30_INTR_STATUS, 0xf, 0),
- .enable = VOP_REG_SYNC(PX30_INTR_EN, 0xf, 4),
- .clear = VOP_REG_SYNC(PX30_INTR_CLEAR, 0xf, 8),
+ .line_flag_num[0] = VOP_REG(PX30_LINE_FLAG, 0xfff, 0),
+ .status = VOP_REG_MASK_SYNC(PX30_INTR_STATUS, 0xffff, 0),
+ .enable = VOP_REG_MASK_SYNC(PX30_INTR_EN, 0xffff, 0),
+ .clear = VOP_REG_MASK_SYNC(PX30_INTR_CLEAR, 0xffff, 0),
};
static const struct vop_common px30_common = {
@@ -212,10 +212,8 @@ static const struct vop_modeset px30_modeset = {
static const struct vop_output px30_output = {
.rgb_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0xf, 1),
- .hdmi_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0xf, 9),
.mipi_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0xf, 25),
.rgb_en = VOP_REG(PX30_DSP_CTRL0, 0x1, 0),
- .hdmi_en = VOP_REG(PX30_DSP_CTRL0, 0x1, 8),
.mipi_en = VOP_REG(PX30_DSP_CTRL0, 0x1, 24),
};
@@ -257,8 +255,8 @@ static const struct vop_win_phy px30_win1_data = {
static const struct vop_win_phy px30_win2_data = {
.data_formats = formats_win_lite,
.nformats = ARRAY_SIZE(formats_win_lite),
- .gate = VOP_REG(PX30_WIN2_CTRL0, 0x1, 0),
- .enable = VOP_REG(PX30_WIN2_CTRL0, 0x1, 4),
+ .gate = VOP_REG(PX30_WIN2_CTRL0, 0x1, 4),
+ .enable = VOP_REG(PX30_WIN2_CTRL0, 0x1, 0),
.format = VOP_REG(PX30_WIN2_CTRL0, 0x3, 5),
.rb_swap = VOP_REG(PX30_WIN2_CTRL0, 0x1, 20),
.dsp_info = VOP_REG(PX30_WIN2_DSP_INFO0, 0x0fff0fff, 0),
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/rockchip: vop: fix some register define error for px30
2018-08-28 8:32 [PATCH] drm/rockchip: vop: fix some register define error for px30 Sandy Huang
@ 2018-08-29 12:03 ` Heiko Stuebner
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Stuebner @ 2018-08-29 12:03 UTC (permalink / raw)
To: Sandy Huang
Cc: David Airlie, dri-devel, linux-arm-kernel, linux-rockchip, linux-kernel
Am Dienstag, 28. August 2018, 10:32:30 CEST schrieb Sandy Huang:
> 1. interrupt register define error lead to enable interrupt failed;
> 2. px30 unsupport hdmi output;
> 3. there are some hardware designed bug, we must swap win2 gate and
> enable offset, otherwise will appear vop iommu pagefault.
>
> Signed-off-by: Sandy Huang <hjc@rock-chips.com>
applied to drm-misc-next, as the px30 dts support is not part of 4.19
so this will only be an issue for future kernels.
Thanks
Heiko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-29 12:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-28 8:32 [PATCH] drm/rockchip: vop: fix some register define error for px30 Sandy Huang
2018-08-29 12:03 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).