From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758983AbdKPGAt (ORCPT ); Thu, 16 Nov 2017 01:00:49 -0500 Received: from regular1.263xmail.com ([211.150.99.140]:42688 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933615AbdKPGAj (ORCPT ); Thu, 16 Nov 2017 01:00:39 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <5e01f917d0f874f4a9abd4b1f111851a> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH 2/2] drm/rockchip: vop: add rk3126 vop support To: Sandy Huang , David Airlie , Heiko Stuebner Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org References: <1510658851-90160-1-git-send-email-hjc@rock-chips.com> <1510658857-90299-1-git-send-email-hjc@rock-chips.com> From: Mark yao Message-ID: Date: Thu, 16 Nov 2017 14:00:32 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <1510658857-90299-1-git-send-email-hjc@rock-chips.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017年11月14日 19:27, Sandy Huang wrote: > RK3126 vop register layout is similar with rk3036, so some feature > can reuse with rk3036. > > RK3126 support two overlay plane and one hwc plane, max output > resolution is 1080p. it support IOMMU, and its IOMMU same as > rk3288's > > Signed-off-by: Sandy Huang Looks good. Reviewed-by:  Mark Yao > --- > drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 30 +++++++++++++++++++++++++++++ > drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 6 ++++++ > 2 files changed, 36 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c > index 4a39049..2e4eea3 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c > +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c > @@ -149,6 +149,34 @@ static const struct vop_data rk3036_vop = { > .win_size = ARRAY_SIZE(rk3036_vop_win_data), > }; > > +static const struct vop_win_phy rk3126_win1_data = { > + .data_formats = formats_win_lite, > + .nformats = ARRAY_SIZE(formats_win_lite), > + .enable = VOP_REG(RK3036_SYS_CTRL, 0x1, 1), > + .format = VOP_REG(RK3036_SYS_CTRL, 0x7, 6), > + .rb_swap = VOP_REG(RK3036_SYS_CTRL, 0x1, 19), > + .dsp_info = VOP_REG(RK3126_WIN1_DSP_INFO, 0x0fff0fff, 0), > + .dsp_st = VOP_REG(RK3126_WIN1_DSP_ST, 0x1fff1fff, 0), > + .yrgb_mst = VOP_REG(RK3126_WIN1_MST, 0xffffffff, 0), > + .yrgb_vir = VOP_REG(RK3036_WIN1_VIR, 0xffff, 0), > +}; > + > +static const struct vop_win_data rk3126_vop_win_data[] = { > + { .base = 0x00, .phy = &rk3036_win0_data, > + .type = DRM_PLANE_TYPE_PRIMARY }, > + { .base = 0x00, .phy = &rk3126_win1_data, > + .type = DRM_PLANE_TYPE_CURSOR }, > +}; > + > +static const struct vop_data rk3126_vop = { > + .intr = &rk3036_intr, > + .common = &rk3036_common, > + .modeset = &rk3036_modeset, > + .output = &rk3036_output, > + .win = rk3126_vop_win_data, > + .win_size = ARRAY_SIZE(rk3126_vop_win_data), > +}; > + > static const struct vop_scl_extension rk3288_win_full_scl_ext = { > .cbcr_vsd_mode = VOP_REG(RK3288_WIN0_CTRL1, 0x1, 31), > .cbcr_vsu_mode = VOP_REG(RK3288_WIN0_CTRL1, 0x1, 30), > @@ -510,6 +538,8 @@ static const struct vop_data rk3328_vop = { > static const struct of_device_id vop_driver_dt_match[] = { > { .compatible = "rockchip,rk3036-vop", > .data = &rk3036_vop }, > + { .compatible = "rockchip,rk3126-vop", > + .data = &rk3126_vop }, > { .compatible = "rockchip,rk3288-vop", > .data = &rk3288_vop }, > { .compatible = "rockchip,rk3368-vop", > diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h > index 4a4799f..f81b510 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h > +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h > @@ -878,4 +878,10 @@ > #define RK3036_HWC_LUT_ADDR 0x800 > /* rk3036 register definition end */ > > +/* rk3126 register definition */ > +#define RK3126_WIN1_MST 0x4c > +#define RK3126_WIN1_DSP_INFO 0x50 > +#define RK3126_WIN1_DSP_ST 0x54 > +/* rk3126 register definition end */ > + > #endif /* _ROCKCHIP_VOP_REG_H */