summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/rockchip
diff options
context:
space:
mode:
authoryao mark2015-06-26 12:07:28 +0200
committerMark Yao2015-07-13 08:11:19 +0200
commitd3cae7df5b44d5b4dd7bcaf3a73382c8c10de83b (patch)
tree98b1e38b37cbe7c35f05f759dd9e040572c439e9 /drivers/gpu/drm/rockchip
parentdrm/rockchip: Drop owner assignment from platform_driver (diff)
downloadkernel-qcow2-linux-d3cae7df5b44d5b4dd7bcaf3a73382c8c10de83b.tar.gz
kernel-qcow2-linux-d3cae7df5b44d5b4dd7bcaf3a73382c8c10de83b.tar.xz
kernel-qcow2-linux-d3cae7df5b44d5b4dd7bcaf3a73382c8c10de83b.zip
drm/rockchip: vop: switch cursor plane to window 3
Window 1 support scale and yuv format, it's waste use it for a cursor, use window 3 is enough. Signed-off-by: Mark Yao <mark.yao@rock-chips.com> Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/rockchip')
-rw-r--r--drivers/gpu/drm/rockchip/rockchip_drm_vop.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 6254e985aff5..65fde4b42662 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -293,13 +293,14 @@ static const struct vop_reg_data vop_init_reg_table[] = {
/*
* Note: rk3288 has a dedicated 'cursor' window, however, that window requires
* special support to get alpha blending working. For now, just use overlay
- * window 1 for the drm cursor.
+ * window 3 for the drm cursor.
+ *
*/
static const struct vop_win_data rk3288_vop_win_data[] = {
{ .base = 0x00, .phy = &win01_data, .type = DRM_PLANE_TYPE_PRIMARY },
- { .base = 0x40, .phy = &win01_data, .type = DRM_PLANE_TYPE_CURSOR },
+ { .base = 0x40, .phy = &win01_data, .type = DRM_PLANE_TYPE_OVERLAY },
{ .base = 0x00, .phy = &win23_data, .type = DRM_PLANE_TYPE_OVERLAY },
- { .base = 0x50, .phy = &win23_data, .type = DRM_PLANE_TYPE_OVERLAY },
+ { .base = 0x50, .phy = &win23_data, .type = DRM_PLANE_TYPE_CURSOR },
{ .base = 0x00, .phy = &cursor_data, .type = DRM_PLANE_TYPE_OVERLAY },
};