[PATCH v3 4/6] drm/rockchip: vop: Default enable win2/3 area0 bit
From: heiko@sntech.de (Heiko Stübner)
Date: 2015-07-22 21:50:43
Also in:
dri-devel, linux-rockchip, lkml
Am Dienstag, 21. Juli 2015, 16:25:40 schrieb Mark Yao:
Win2/3 support multiple area function, but we haven't found a suitable way to use it yet, so let's just use them as other windows with only area 0 enabled. Signed-off-by: Mark Yao <redacted>
this could go as fix into 4.2 please.
With what is currently in 4.2-rc3 I'm loosing the mouse cursor in my xf86-
armsoc xserver [0]. Likely due to 0915da7dd75f ("drm/rockchip: vop: remove
hardware cursor window"). The xserver then selects a window for the cursor
itself, which seems to be one of the currently disabled ones.
This patch fixes this and gives me back my cursor :-)
Heiko
[0] https://github.com/mmind/xf86-video-armsoc/tree/devel/rockchip
quoted hunk ↗ jump to hunk
--- Changes in v3: Adviced by Tomasz Figa - fix patch comments. Changes in v2: None drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 ++++++ 1 file changed, 6 insertions(+)diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.cb/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 47ce943..e08f318 100644--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c@@ -276,6 +276,12 @@ static const struct vop_reg_data vop_init_reg_table[] ={ {DSP_CTRL0, 0x00000000}, {WIN0_CTRL0, 0x00000080}, {WIN1_CTRL0, 0x00000080}, + /* TODO: Win2/3 support multiple area function, but we haven't found + * a suitable way to use it yet, so let's just use them as other windows + * with only area 0 enabled. + */ + {WIN2_CTRL0, 0x00000010}, + {WIN3_CTRL0, 0x00000010}, }; /*