| Message ID | 20250317082047.564404-1-andyshrk@163.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/rockchip: dw_hdmi_qp: Fix io init for dw_hdmi_qp_rockchip_resume | expand |
Hi, On Mon, Mar 17, 2025 at 04:20:39PM +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > Use cfg->ctrl_ops->io_init callback make it work for all platform. > > Fixes: 3f60dbd40d3f ("drm/rockchip: dw_hdmi_qp: Add platform ctrl callback") > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > --- It also gets rid of code duplication :) > > .../gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 23 +++---------------- > 1 file changed, 3 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c > index 3d1dddb34603..631a7080862b 100644 > --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c > @@ -600,27 +600,10 @@ static void dw_hdmi_qp_rockchip_remove(struct platform_device *pdev) > static int __maybe_unused dw_hdmi_qp_rockchip_resume(struct device *dev) > { > struct rockchip_hdmi_qp *hdmi = dev_get_drvdata(dev); > - u32 val; > - > - val = HIWORD_UPDATE(RK3588_SCLIN_MASK, RK3588_SCLIN_MASK) | > - HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) | > - HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) | > - HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK); > - regmap_write(hdmi->vo_regmap, > - hdmi->port_id ? RK3588_GRF_VO1_CON6 : RK3588_GRF_VO1_CON3, > - val); > - > - val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK, > - RK3588_SET_HPD_PATH_MASK); > - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val); > + const struct rockchip_hdmi_qp_cfg *cfg; > > - if (hdmi->port_id) > - val = HIWORD_UPDATE(RK3588_HDMI1_GRANT_SEL, > - RK3588_HDMI1_GRANT_SEL); > - else > - val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL, > - RK3588_HDMI0_GRANT_SEL); > - regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON9, val); > + cfg = of_device_get_match_data(dev); > + cfg->ctrl_ops->io_init(hdmi); I think it would be better to store the ctrl_ops (or io_init) callback in struct rockchip_hdmi_qp during driver probe and avoid another lookup of the match_data, which involves string comparisons. Otherwise: Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Greetings, -- Sebastian
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c index 3d1dddb34603..631a7080862b 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -600,27 +600,10 @@ static void dw_hdmi_qp_rockchip_remove(struct platform_device *pdev) static int __maybe_unused dw_hdmi_qp_rockchip_resume(struct device *dev) { struct rockchip_hdmi_qp *hdmi = dev_get_drvdata(dev); - u32 val; - - val = HIWORD_UPDATE(RK3588_SCLIN_MASK, RK3588_SCLIN_MASK) | - HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) | - HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) | - HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK); - regmap_write(hdmi->vo_regmap, - hdmi->port_id ? RK3588_GRF_VO1_CON6 : RK3588_GRF_VO1_CON3, - val); - - val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK, - RK3588_SET_HPD_PATH_MASK); - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val); + const struct rockchip_hdmi_qp_cfg *cfg; - if (hdmi->port_id) - val = HIWORD_UPDATE(RK3588_HDMI1_GRANT_SEL, - RK3588_HDMI1_GRANT_SEL); - else - val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL, - RK3588_HDMI0_GRANT_SEL); - regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON9, val); + cfg = of_device_get_match_data(dev); + cfg->ctrl_ops->io_init(hdmi); dw_hdmi_qp_resume(dev, hdmi->hdmi);