From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752160AbcF2NrX (ORCPT ); Wed, 29 Jun 2016 09:47:23 -0400 Received: from mail-vk0-f44.google.com ([209.85.213.44]:35445 "EHLO mail-vk0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752168AbcF2Nql (ORCPT ); Wed, 29 Jun 2016 09:46:41 -0400 MIME-Version: 1.0 In-Reply-To: <1467191701-17134-1-git-send-email-ykk@rock-chips.com> References: <1467191657-16941-1-git-send-email-ykk@rock-chips.com> <1467191701-17134-1-git-send-email-ykk@rock-chips.com> From: Sean Paul Date: Wed, 29 Jun 2016 09:44:54 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v4 01/11] drm/rockchip: analogix_dp: split the lcdc select setting into device data To: Yakir Yang Cc: Mark Yao , Inki Dae , Jingoo Han , Heiko Stuebner , Javier Martinez Canillas , =?UTF-8?Q?St=C3=A9phane_Marchesin?= , Tomasz Figa , David Airlie , Daniel Vetter , Thierry Reding , Douglas Anderson , Krzysztof Kozlowski , Emil Velikov , Dan Carpenter , Linux Kernel Mailing List , dri-devel , linux-samsung-soc , linux-rockchip@lists.infradead.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 29, 2016 at 5:15 AM, Yakir Yang wrote: > eDP controller need to declare which vop provide the video source, > and it's defined in GRF registers. > > But different chips have different GRF register address, so we need to > create a device data to declare the GRF messages for each chips. > > Signed-off-by: Yakir Yang > Acked-by: Mark Yao > Reviewed-by: Tomasz Figa Reviewed-by: Sean Paul > --- > Changes in v4: > - Assigned the GRF setting magic numbers to a #define that corresponds to > a TRM name. (Sean & Heiko) > - Pass the chip type to device type directly. (Sean) > - Add reviewed flag from Tomasz. > > Changes in v3: > - Write a kerneldoc-style comment explaining the chips data fields (Tomasz, reviewed at Google Gerrit) > [https://chromium-review.googlesource.com/#/c/346313/10/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c@39] > - Drop the '.lcdcsel_mask' number in chips data field (Tomasz, reviewed at Google Gerrit) > [https://chromium-review.googlesource.com/#/c/346313/10/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c@382] > - Add acked flag from Mark. > > drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 49 ++++++++++++++++++++----- > 1 file changed, 39 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > index c120172..0a30931 100644 > --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > @@ -14,6 +14,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -33,13 +34,26 @@ > #include "rockchip_drm_drv.h" > #include "rockchip_drm_vop.h" > > +#define RK3288_GRF_SOC_CON6 0x25c > +#define RK3288_EDP_LCDC_SEL BIT(5) > + > +#define HIWORD_UPDATE(val, mask) (val | (mask) << 16) > + > #define to_dp(nm) container_of(nm, struct rockchip_dp_device, nm) > > -/* dp grf register offset */ > -#define GRF_SOC_CON6 0x025c > -#define GRF_EDP_LCD_SEL_MASK BIT(5) > -#define GRF_EDP_SEL_VOP_LIT BIT(5) > -#define GRF_EDP_SEL_VOP_BIG 0 > +/** > + * struct rockchip_dp_chip_data - splite the grf setting of kind of chips > + * @lcdsel_grf_reg: grf register offset of lcdc select > + * @lcdsel_big: reg value of selecting vop big for eDP > + * @lcdsel_lit: reg value of selecting vop little for eDP > + * @chip_type: specific chip type > + */ > +struct rockchip_dp_chip_data { > + u32 lcdsel_grf_reg; > + u32 lcdsel_big; > + u32 lcdsel_lit; > + u32 chip_type; > +}; > > struct rockchip_dp_device { > struct drm_device *drm_dev; > @@ -51,6 +65,8 @@ struct rockchip_dp_device { > struct regmap *grf; > struct reset_control *rst; > > + const struct rockchip_dp_chip_data *data; > + > struct analogix_dp_plat_data plat_data; > }; > > @@ -119,13 +135,13 @@ static void rockchip_dp_drm_encoder_enable(struct drm_encoder *encoder) > return; > > if (ret) > - val = GRF_EDP_SEL_VOP_LIT | (GRF_EDP_LCD_SEL_MASK << 16); > + val = dp->data->lcdsel_lit; > else > - val = GRF_EDP_SEL_VOP_BIG | (GRF_EDP_LCD_SEL_MASK << 16); > + val = dp->data->lcdsel_big; > > dev_dbg(dp->dev, "vop %s output to dp\n", (ret) ? "LIT" : "BIG"); > > - ret = regmap_write(dp->grf, GRF_SOC_CON6, val); > + ret = regmap_write(dp->grf, dp->data->lcdsel_grf_reg, val); > if (ret != 0) { > dev_err(dp->dev, "Could not write to GRF: %d\n", ret); > return; > @@ -246,6 +262,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, > void *data) > { > struct rockchip_dp_device *dp = dev_get_drvdata(dev); > + const struct rockchip_dp_chip_data *dp_data; > struct drm_device *drm_dev = data; > int ret; > > @@ -256,10 +273,15 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, > */ > dev_set_drvdata(dev, NULL); > > + dp_data = of_device_get_match_data(dev); > + if (!dp_data) > + return -ENODEV; > + > ret = rockchip_dp_init(dp); > if (ret < 0) > return ret; > > + dp->data = dp_data; > dp->drm_dev = drm_dev; > > ret = rockchip_dp_drm_create_encoder(dp); > @@ -270,7 +292,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, > > dp->plat_data.encoder = &dp->encoder; > > - dp->plat_data.dev_type = RK3288_DP; > + dp->plat_data.dev_type = dp->data->chip_type; > dp->plat_data.power_on = rockchip_dp_poweron; > dp->plat_data.power_off = rockchip_dp_powerdown; > > @@ -356,8 +378,15 @@ static const struct dev_pm_ops rockchip_dp_pm_ops = { > #endif > }; > > +static const struct rockchip_dp_chip_data rk3288_dp = { > + .lcdsel_grf_reg = RK3288_GRF_SOC_CON6, > + .lcdsel_big = HIWORD_UPDATE(0, RK3288_EDP_LCDC_SEL), > + .lcdsel_lit = HIWORD_UPDATE(RK3288_EDP_LCDC_SEL, RK3288_EDP_LCDC_SEL), > + .chip_type = RK3288_DP, > +}; > + > static const struct of_device_id rockchip_dp_dt_ids[] = { > - {.compatible = "rockchip,rk3288-dp",}, > + {.compatible = "rockchip,rk3288-dp", .data = &rk3288_dp }, > {} > }; > MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); > -- > 1.9.1 > >