| Message ID | 20241101105028.2177274-5-shiyongbang@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add dp module in hibmc driver | expand |
On Fri, Nov 01, 2024 at 06:50:28PM +0800, Yongbang Shi wrote: > From: baihan li <libaihan@huawei.com> > > To support DP interface displaying in hibmc driver. Add > a encoder and connector for DP modual. > > Signed-off-by: baihan li <libaihan@huawei.com> > Signed-off-by: yongbang shi <shiyongbang@huawei.com> > --- > ChangeLog: > v2 -> v3: > - fix build errors reported by kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202410251136.1m7BlR68-lkp@intel.com/ > v1 -> v2: > - deleting struct dp_mode and dp_mode_cfg function, suggested by Dmitry Baryshkov. > - modifying drm_simple_encoder_init function, suggested by Dmitry Baryshkov. > - refactoring struct hibmc_connector, suggested by Dmitry Baryshkov. > - withdrawing the modification in hibmc_kms_init, suggested by Dmitry Baryshkov. > v1:https://lore.kernel.org/all/20240930100610.782363-1-shiyongbang@huawei.com/ > --- > drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 128 ++++++++++++++++++ > .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 16 +++ > .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 21 +-- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 41 +++--- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 20 +-- > 6 files changed, 188 insertions(+), 40 deletions(-) > create mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/Makefile b/drivers/gpu/drm/hisilicon/hibmc/Makefile > index 214228052ccf..95a4ed599d98 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/Makefile > +++ b/drivers/gpu/drm/hisilicon/hibmc/Makefile > @@ -1,5 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0-only > hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_i2c.o \ > - dp/dp_aux.o dp/dp_link.o dp/dp_hw.o > + dp/dp_aux.o dp/dp_link.o dp/dp_hw.o hibmc_drm_dp.o > > obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c > new file mode 100644 > index 000000000000..1e0f2ef39ba6 > --- /dev/null > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c > @@ -0,0 +1,128 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +// Copyright (c) 2024 Hisilicon Limited. > + > +#include <linux/io.h> > + > +#include <drm/drm_probe_helper.h> > +#include <drm/drm_simple_kms_helper.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_modes.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_edid.h> > + > +#include "hibmc_drm_drv.h" > +#include "dp/dp_hw.h" > + > +static int hibmc_dp_connector_get_modes(struct drm_connector *connector) > +{ > + int count; > + > + count = drm_add_modes_noedid(connector, connector->dev->mode_config.max_width, > + connector->dev->mode_config.max_height); > + drm_set_preferred_mode(connector, 1024, 768); // temporary implementation > + > + return count; > +} > + > +static const struct drm_connector_helper_funcs hibmc_dp_conn_helper_funcs = { > + .get_modes = hibmc_dp_connector_get_modes, > +}; > + > +static const struct drm_connector_funcs hibmc_dp_conn_funcs = { > + .reset = drm_atomic_helper_connector_reset, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = drm_connector_cleanup, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int hibmc_dp_prepare(struct hibmc_dp *dp, struct drm_display_mode *mode) inline at the calling site > +{ > + int ret; > + > + hibmc_dp_display_en(dp, false); > + > + ret = hibmc_dp_mode_set(dp, mode); > + if (ret) > + drm_err(dp->drm_dev, "hibmc dp mode set failed: %d\n", ret); > + > + return ret; > +} > + > +static void hibmc_dp_encoder_enable(struct drm_encoder *drm_encoder, > + struct drm_atomic_state *state) > +{ > + struct hibmc_dp *dp = container_of(drm_encoder, struct hibmc_dp, encoder); > + struct drm_display_mode *mode = &drm_encoder->crtc->state->mode; > + > + if (hibmc_dp_prepare(dp, mode)) > + return; > + > + hibmc_dp_display_en(dp, true); > +} > + > +static void hibmc_dp_encoder_disable(struct drm_encoder *drm_encoder, > + struct drm_atomic_state *state) > +{ > + struct hibmc_dp *dp = container_of(drm_encoder, struct hibmc_dp, encoder); > + > + hibmc_dp_display_en(dp, false); > +} > + > +static const struct drm_encoder_helper_funcs hibmc_dp_encoder_helper_funcs = { > + .atomic_enable = hibmc_dp_encoder_enable, > + .atomic_disable = hibmc_dp_encoder_disable, > +}; > + > +void hibmc_dp_uninit(struct hibmc_drm_private *priv) > +{ > + hibmc_dp_hw_uninit(&priv->dp); > +} > + > +int hibmc_dp_init(struct hibmc_drm_private *priv) > +{ > + struct drm_device *dev = &priv->dev; > + struct drm_crtc *crtc = &priv->crtc; > + struct hibmc_dp *dp = &priv->dp; > + struct drm_connector *connector = &dp->connector; > + struct drm_encoder *encoder = &dp->encoder; > + int ret; > + > + dp->mmio = priv->mmio; > + dp->drm_dev = dev; > + > + ret = hibmc_dp_hw_init(&priv->dp); > + if (ret) { > + drm_err(dev, "hibmc dp hw init failed: %d\n", ret); > + return ret; > + } > + > + hibmc_dp_display_en(&priv->dp, false); > + > + encoder->possible_crtcs = drm_crtc_mask(crtc); > + ret = drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_TMDS, NULL); > + if (ret) { > + drm_err(dev, "init dp encoder failed: %d\n", ret); > + goto err_init; > + } > + > + drm_encoder_helper_add(encoder, &hibmc_dp_encoder_helper_funcs); > + > + ret = drm_connector_init(dev, connector, &hibmc_dp_conn_funcs, > + DRM_MODE_CONNECTOR_DisplayPort); > + if (ret) { > + drm_err(dev, "init dp connector failed: %d\n", ret); > + goto err_init; > + } > + > + drm_connector_helper_add(connector, &hibmc_dp_conn_helper_funcs); > + > + drm_connector_attach_encoder(connector, encoder); > + > + return 0; > + > +err_init: > + hibmc_dp_hw_uninit(&priv->dp); > + > + return ret; > +} > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > index 9f9b19ea0587..f98ac94a18b9 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c > @@ -27,6 +27,10 @@ > #include "hibmc_drm_drv.h" > #include "hibmc_drm_regs.h" > > +#define DP_HOST_SERDES_CTRL 0x1f001c > +#define DP_HOST_SERDES_CTRL_VAL 0x8A00 > +#define DP_HOST_SERDES_CTRL_MASK 0x7FFFE > + > DEFINE_DRM_GEM_FOPS(hibmc_fops); > > static irqreturn_t hibmc_interrupt(int irq, void *arg) > @@ -116,6 +120,14 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv) > return ret; > } > > + /* if DP existed, init DP */ > + if ((readl(priv->mmio + DP_HOST_SERDES_CTRL) & > + DP_HOST_SERDES_CTRL_MASK) == DP_HOST_SERDES_CTRL_VAL) { > + ret = hibmc_dp_init(priv); > + if (ret) > + drm_err(dev, "failed to init dp: %d\n", ret); > + } > + > ret = hibmc_vdac_init(priv); > if (ret) { > drm_err(dev, "failed to init vdac: %d\n", ret); > @@ -239,6 +251,7 @@ static int hibmc_hw_init(struct hibmc_drm_private *priv) > > static int hibmc_unload(struct drm_device *dev) > { > + struct hibmc_drm_private *priv = to_hibmc_drm_private(dev); > struct pci_dev *pdev = to_pci_dev(dev->dev); > > drm_atomic_helper_shutdown(dev); > @@ -247,6 +260,9 @@ static int hibmc_unload(struct drm_device *dev) > > pci_disable_msi(to_pci_dev(dev->dev)); > > + if (priv->dp.encoder.possible_crtcs) > + hibmc_dp_uninit(priv); > + > return 0; > } > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > index 6b566f3aeecb..1b78d313a6c2 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > @@ -19,10 +19,12 @@ > #include <linux/i2c.h> > > #include <drm/drm_framebuffer.h> > +#include "dp/dp_hw.h" > > -struct hibmc_connector { > - struct drm_connector base; > - > +struct hibmc_vdac { > + struct drm_device *dev; > + struct drm_encoder encoder; > + struct drm_connector connector; > struct i2c_adapter adapter; > struct i2c_algo_bit_data bit_data; > }; > @@ -35,13 +37,13 @@ struct hibmc_drm_private { > struct drm_device dev; > struct drm_plane primary_plane; > struct drm_crtc crtc; > - struct drm_encoder encoder; > - struct hibmc_connector connector; > + struct hibmc_dp dp; > + struct hibmc_vdac vdac; Please separate hibmc_vdac and hibmc_dp-related changes into separate patches. > }; > > -static inline struct hibmc_connector *to_hibmc_connector(struct drm_connector *connector) > +static inline struct hibmc_vdac *to_hibmc_vdac(struct drm_connector *connector) > { > - return container_of(connector, struct hibmc_connector, base); > + return container_of(connector, struct hibmc_vdac, connector); > } > > static inline struct hibmc_drm_private *to_hibmc_drm_private(struct drm_device *dev) > @@ -57,6 +59,9 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv, > int hibmc_de_init(struct hibmc_drm_private *priv); > int hibmc_vdac_init(struct hibmc_drm_private *priv); > > -int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_connector *connector); > +int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_vdac *connector); > + > +int hibmc_dp_init(struct hibmc_drm_private *priv); > +void hibmc_dp_uninit(struct hibmc_drm_private *priv); > > #endif > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c > index e6e48651c15c..99b3b77b5445 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c > @@ -25,8 +25,8 @@ > > static void hibmc_set_i2c_signal(void *data, u32 mask, int value) > { > - struct hibmc_connector *hibmc_connector = data; > - struct hibmc_drm_private *priv = to_hibmc_drm_private(hibmc_connector->base.dev); > + struct hibmc_vdac *vdac = data; > + struct hibmc_drm_private *priv = to_hibmc_drm_private(vdac->connector.dev); > u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION); > > if (value) { > @@ -45,8 +45,8 @@ static void hibmc_set_i2c_signal(void *data, u32 mask, int value) > > static int hibmc_get_i2c_signal(void *data, u32 mask) > { > - struct hibmc_connector *hibmc_connector = data; > - struct hibmc_drm_private *priv = to_hibmc_drm_private(hibmc_connector->base.dev); > + struct hibmc_vdac *vdac = data; > + struct hibmc_drm_private *priv = to_hibmc_drm_private(vdac->connector.dev); > u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION); > > if ((tmp_dir & mask) != mask) { > @@ -77,22 +77,21 @@ static int hibmc_ddc_getscl(void *data) > return hibmc_get_i2c_signal(data, I2C_SCL_MASK); > } > > -int hibmc_ddc_create(struct drm_device *drm_dev, > - struct hibmc_connector *connector) > +int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_vdac *vdac) > { > - connector->adapter.owner = THIS_MODULE; > - snprintf(connector->adapter.name, I2C_NAME_SIZE, "HIS i2c bit bus"); > - connector->adapter.dev.parent = drm_dev->dev; > - i2c_set_adapdata(&connector->adapter, connector); > - connector->adapter.algo_data = &connector->bit_data; > - > - connector->bit_data.udelay = 20; > - connector->bit_data.timeout = usecs_to_jiffies(2000); > - connector->bit_data.data = connector; > - connector->bit_data.setsda = hibmc_ddc_setsda; > - connector->bit_data.setscl = hibmc_ddc_setscl; > - connector->bit_data.getsda = hibmc_ddc_getsda; > - connector->bit_data.getscl = hibmc_ddc_getscl; > - > - return i2c_bit_add_bus(&connector->adapter); > + vdac->adapter.owner = THIS_MODULE; > + snprintf(vdac->adapter.name, I2C_NAME_SIZE, "HIS i2c bit bus"); > + vdac->adapter.dev.parent = drm_dev->dev; > + i2c_set_adapdata(&vdac->adapter, vdac); > + vdac->adapter.algo_data = &vdac->bit_data; > + > + vdac->bit_data.udelay = 20; > + vdac->bit_data.timeout = usecs_to_jiffies(2000); > + vdac->bit_data.data = vdac; > + vdac->bit_data.setsda = hibmc_ddc_setsda; > + vdac->bit_data.setscl = hibmc_ddc_setscl; > + vdac->bit_data.getsda = hibmc_ddc_getsda; > + vdac->bit_data.getscl = hibmc_ddc_getscl; > + > + return i2c_bit_add_bus(&vdac->adapter); > } > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c > index 409c551c92af..05e19ea4c9f9 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c > @@ -24,11 +24,11 @@ > > static int hibmc_connector_get_modes(struct drm_connector *connector) > { > - struct hibmc_connector *hibmc_connector = to_hibmc_connector(connector); > + struct hibmc_vdac *vdac = to_hibmc_vdac(connector); > const struct drm_edid *drm_edid; > int count; > > - drm_edid = drm_edid_read_ddc(connector, &hibmc_connector->adapter); > + drm_edid = drm_edid_read_ddc(connector, &vdac->adapter); > > drm_edid_connector_update(connector, drm_edid); > > @@ -51,9 +51,9 @@ static int hibmc_connector_get_modes(struct drm_connector *connector) > > static void hibmc_connector_destroy(struct drm_connector *connector) > { > - struct hibmc_connector *hibmc_connector = to_hibmc_connector(connector); > + struct hibmc_vdac *vdac = to_hibmc_vdac(connector); > > - i2c_del_adapter(&hibmc_connector->adapter); > + i2c_del_adapter(&vdac->adapter); > drm_connector_cleanup(connector); > } > > @@ -93,20 +93,20 @@ static const struct drm_encoder_helper_funcs hibmc_encoder_helper_funcs = { > int hibmc_vdac_init(struct hibmc_drm_private *priv) > { > struct drm_device *dev = &priv->dev; > - struct hibmc_connector *hibmc_connector = &priv->connector; > - struct drm_encoder *encoder = &priv->encoder; > + struct hibmc_vdac *vdac = &priv->vdac; > + struct drm_encoder *encoder = &vdac->encoder; > struct drm_crtc *crtc = &priv->crtc; > - struct drm_connector *connector = &hibmc_connector->base; > + struct drm_connector *connector = &vdac->connector; > int ret; > > - ret = hibmc_ddc_create(dev, hibmc_connector); > + ret = hibmc_ddc_create(dev, vdac); > if (ret) { > drm_err(dev, "failed to create ddc: %d\n", ret); > return ret; > } > > encoder->possible_crtcs = drm_crtc_mask(crtc); > - ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_DAC); > + ret = drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_DAC, NULL); > if (ret) { > drm_err(dev, "failed to init encoder: %d\n", ret); > return ret; > @@ -117,7 +117,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) > ret = drm_connector_init_with_ddc(dev, connector, > &hibmc_connector_funcs, > DRM_MODE_CONNECTOR_VGA, > - &hibmc_connector->adapter); > + &vdac->adapter); > if (ret) { > drm_err(dev, "failed to init connector: %d\n", ret); > return ret; > -- > 2.33.0 >
diff --git a/drivers/gpu/drm/hisilicon/hibmc/Makefile b/drivers/gpu/drm/hisilicon/hibmc/Makefile index 214228052ccf..95a4ed599d98 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/Makefile +++ b/drivers/gpu/drm/hisilicon/hibmc/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_i2c.o \ - dp/dp_aux.o dp/dp_link.o dp/dp_hw.o + dp/dp_aux.o dp/dp_link.o dp/dp_hw.o hibmc_drm_dp.o obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c new file mode 100644 index 000000000000..1e0f2ef39ba6 --- /dev/null +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright (c) 2024 Hisilicon Limited. + +#include <linux/io.h> + +#include <drm/drm_probe_helper.h> +#include <drm/drm_simple_kms_helper.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_modes.h> +#include <drm/drm_drv.h> +#include <drm/drm_edid.h> + +#include "hibmc_drm_drv.h" +#include "dp/dp_hw.h" + +static int hibmc_dp_connector_get_modes(struct drm_connector *connector) +{ + int count; + + count = drm_add_modes_noedid(connector, connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); + drm_set_preferred_mode(connector, 1024, 768); // temporary implementation + + return count; +} + +static const struct drm_connector_helper_funcs hibmc_dp_conn_helper_funcs = { + .get_modes = hibmc_dp_connector_get_modes, +}; + +static const struct drm_connector_funcs hibmc_dp_conn_funcs = { + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int hibmc_dp_prepare(struct hibmc_dp *dp, struct drm_display_mode *mode) +{ + int ret; + + hibmc_dp_display_en(dp, false); + + ret = hibmc_dp_mode_set(dp, mode); + if (ret) + drm_err(dp->drm_dev, "hibmc dp mode set failed: %d\n", ret); + + return ret; +} + +static void hibmc_dp_encoder_enable(struct drm_encoder *drm_encoder, + struct drm_atomic_state *state) +{ + struct hibmc_dp *dp = container_of(drm_encoder, struct hibmc_dp, encoder); + struct drm_display_mode *mode = &drm_encoder->crtc->state->mode; + + if (hibmc_dp_prepare(dp, mode)) + return; + + hibmc_dp_display_en(dp, true); +} + +static void hibmc_dp_encoder_disable(struct drm_encoder *drm_encoder, + struct drm_atomic_state *state) +{ + struct hibmc_dp *dp = container_of(drm_encoder, struct hibmc_dp, encoder); + + hibmc_dp_display_en(dp, false); +} + +static const struct drm_encoder_helper_funcs hibmc_dp_encoder_helper_funcs = { + .atomic_enable = hibmc_dp_encoder_enable, + .atomic_disable = hibmc_dp_encoder_disable, +}; + +void hibmc_dp_uninit(struct hibmc_drm_private *priv) +{ + hibmc_dp_hw_uninit(&priv->dp); +} + +int hibmc_dp_init(struct hibmc_drm_private *priv) +{ + struct drm_device *dev = &priv->dev; + struct drm_crtc *crtc = &priv->crtc; + struct hibmc_dp *dp = &priv->dp; + struct drm_connector *connector = &dp->connector; + struct drm_encoder *encoder = &dp->encoder; + int ret; + + dp->mmio = priv->mmio; + dp->drm_dev = dev; + + ret = hibmc_dp_hw_init(&priv->dp); + if (ret) { + drm_err(dev, "hibmc dp hw init failed: %d\n", ret); + return ret; + } + + hibmc_dp_display_en(&priv->dp, false); + + encoder->possible_crtcs = drm_crtc_mask(crtc); + ret = drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_TMDS, NULL); + if (ret) { + drm_err(dev, "init dp encoder failed: %d\n", ret); + goto err_init; + } + + drm_encoder_helper_add(encoder, &hibmc_dp_encoder_helper_funcs); + + ret = drm_connector_init(dev, connector, &hibmc_dp_conn_funcs, + DRM_MODE_CONNECTOR_DisplayPort); + if (ret) { + drm_err(dev, "init dp connector failed: %d\n", ret); + goto err_init; + } + + drm_connector_helper_add(connector, &hibmc_dp_conn_helper_funcs); + + drm_connector_attach_encoder(connector, encoder); + + return 0; + +err_init: + hibmc_dp_hw_uninit(&priv->dp); + + return ret; +} diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 9f9b19ea0587..f98ac94a18b9 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -27,6 +27,10 @@ #include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h" +#define DP_HOST_SERDES_CTRL 0x1f001c +#define DP_HOST_SERDES_CTRL_VAL 0x8A00 +#define DP_HOST_SERDES_CTRL_MASK 0x7FFFE + DEFINE_DRM_GEM_FOPS(hibmc_fops); static irqreturn_t hibmc_interrupt(int irq, void *arg) @@ -116,6 +120,14 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv) return ret; } + /* if DP existed, init DP */ + if ((readl(priv->mmio + DP_HOST_SERDES_CTRL) & + DP_HOST_SERDES_CTRL_MASK) == DP_HOST_SERDES_CTRL_VAL) { + ret = hibmc_dp_init(priv); + if (ret) + drm_err(dev, "failed to init dp: %d\n", ret); + } + ret = hibmc_vdac_init(priv); if (ret) { drm_err(dev, "failed to init vdac: %d\n", ret); @@ -239,6 +251,7 @@ static int hibmc_hw_init(struct hibmc_drm_private *priv) static int hibmc_unload(struct drm_device *dev) { + struct hibmc_drm_private *priv = to_hibmc_drm_private(dev); struct pci_dev *pdev = to_pci_dev(dev->dev); drm_atomic_helper_shutdown(dev); @@ -247,6 +260,9 @@ static int hibmc_unload(struct drm_device *dev) pci_disable_msi(to_pci_dev(dev->dev)); + if (priv->dp.encoder.possible_crtcs) + hibmc_dp_uninit(priv); + return 0; } diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 6b566f3aeecb..1b78d313a6c2 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -19,10 +19,12 @@ #include <linux/i2c.h> #include <drm/drm_framebuffer.h> +#include "dp/dp_hw.h" -struct hibmc_connector { - struct drm_connector base; - +struct hibmc_vdac { + struct drm_device *dev; + struct drm_encoder encoder; + struct drm_connector connector; struct i2c_adapter adapter; struct i2c_algo_bit_data bit_data; }; @@ -35,13 +37,13 @@ struct hibmc_drm_private { struct drm_device dev; struct drm_plane primary_plane; struct drm_crtc crtc; - struct drm_encoder encoder; - struct hibmc_connector connector; + struct hibmc_dp dp; + struct hibmc_vdac vdac; }; -static inline struct hibmc_connector *to_hibmc_connector(struct drm_connector *connector) +static inline struct hibmc_vdac *to_hibmc_vdac(struct drm_connector *connector) { - return container_of(connector, struct hibmc_connector, base); + return container_of(connector, struct hibmc_vdac, connector); } static inline struct hibmc_drm_private *to_hibmc_drm_private(struct drm_device *dev) @@ -57,6 +59,9 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv, int hibmc_de_init(struct hibmc_drm_private *priv); int hibmc_vdac_init(struct hibmc_drm_private *priv); -int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_connector *connector); +int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_vdac *connector); + +int hibmc_dp_init(struct hibmc_drm_private *priv); +void hibmc_dp_uninit(struct hibmc_drm_private *priv); #endif diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c index e6e48651c15c..99b3b77b5445 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c @@ -25,8 +25,8 @@ static void hibmc_set_i2c_signal(void *data, u32 mask, int value) { - struct hibmc_connector *hibmc_connector = data; - struct hibmc_drm_private *priv = to_hibmc_drm_private(hibmc_connector->base.dev); + struct hibmc_vdac *vdac = data; + struct hibmc_drm_private *priv = to_hibmc_drm_private(vdac->connector.dev); u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION); if (value) { @@ -45,8 +45,8 @@ static void hibmc_set_i2c_signal(void *data, u32 mask, int value) static int hibmc_get_i2c_signal(void *data, u32 mask) { - struct hibmc_connector *hibmc_connector = data; - struct hibmc_drm_private *priv = to_hibmc_drm_private(hibmc_connector->base.dev); + struct hibmc_vdac *vdac = data; + struct hibmc_drm_private *priv = to_hibmc_drm_private(vdac->connector.dev); u32 tmp_dir = readl(priv->mmio + GPIO_DATA_DIRECTION); if ((tmp_dir & mask) != mask) { @@ -77,22 +77,21 @@ static int hibmc_ddc_getscl(void *data) return hibmc_get_i2c_signal(data, I2C_SCL_MASK); } -int hibmc_ddc_create(struct drm_device *drm_dev, - struct hibmc_connector *connector) +int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_vdac *vdac) { - connector->adapter.owner = THIS_MODULE; - snprintf(connector->adapter.name, I2C_NAME_SIZE, "HIS i2c bit bus"); - connector->adapter.dev.parent = drm_dev->dev; - i2c_set_adapdata(&connector->adapter, connector); - connector->adapter.algo_data = &connector->bit_data; - - connector->bit_data.udelay = 20; - connector->bit_data.timeout = usecs_to_jiffies(2000); - connector->bit_data.data = connector; - connector->bit_data.setsda = hibmc_ddc_setsda; - connector->bit_data.setscl = hibmc_ddc_setscl; - connector->bit_data.getsda = hibmc_ddc_getsda; - connector->bit_data.getscl = hibmc_ddc_getscl; - - return i2c_bit_add_bus(&connector->adapter); + vdac->adapter.owner = THIS_MODULE; + snprintf(vdac->adapter.name, I2C_NAME_SIZE, "HIS i2c bit bus"); + vdac->adapter.dev.parent = drm_dev->dev; + i2c_set_adapdata(&vdac->adapter, vdac); + vdac->adapter.algo_data = &vdac->bit_data; + + vdac->bit_data.udelay = 20; + vdac->bit_data.timeout = usecs_to_jiffies(2000); + vdac->bit_data.data = vdac; + vdac->bit_data.setsda = hibmc_ddc_setsda; + vdac->bit_data.setscl = hibmc_ddc_setscl; + vdac->bit_data.getsda = hibmc_ddc_getsda; + vdac->bit_data.getscl = hibmc_ddc_getscl; + + return i2c_bit_add_bus(&vdac->adapter); } diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c index 409c551c92af..05e19ea4c9f9 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c @@ -24,11 +24,11 @@ static int hibmc_connector_get_modes(struct drm_connector *connector) { - struct hibmc_connector *hibmc_connector = to_hibmc_connector(connector); + struct hibmc_vdac *vdac = to_hibmc_vdac(connector); const struct drm_edid *drm_edid; int count; - drm_edid = drm_edid_read_ddc(connector, &hibmc_connector->adapter); + drm_edid = drm_edid_read_ddc(connector, &vdac->adapter); drm_edid_connector_update(connector, drm_edid); @@ -51,9 +51,9 @@ static int hibmc_connector_get_modes(struct drm_connector *connector) static void hibmc_connector_destroy(struct drm_connector *connector) { - struct hibmc_connector *hibmc_connector = to_hibmc_connector(connector); + struct hibmc_vdac *vdac = to_hibmc_vdac(connector); - i2c_del_adapter(&hibmc_connector->adapter); + i2c_del_adapter(&vdac->adapter); drm_connector_cleanup(connector); } @@ -93,20 +93,20 @@ static const struct drm_encoder_helper_funcs hibmc_encoder_helper_funcs = { int hibmc_vdac_init(struct hibmc_drm_private *priv) { struct drm_device *dev = &priv->dev; - struct hibmc_connector *hibmc_connector = &priv->connector; - struct drm_encoder *encoder = &priv->encoder; + struct hibmc_vdac *vdac = &priv->vdac; + struct drm_encoder *encoder = &vdac->encoder; struct drm_crtc *crtc = &priv->crtc; - struct drm_connector *connector = &hibmc_connector->base; + struct drm_connector *connector = &vdac->connector; int ret; - ret = hibmc_ddc_create(dev, hibmc_connector); + ret = hibmc_ddc_create(dev, vdac); if (ret) { drm_err(dev, "failed to create ddc: %d\n", ret); return ret; } encoder->possible_crtcs = drm_crtc_mask(crtc); - ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_DAC); + ret = drmm_encoder_init(dev, encoder, NULL, DRM_MODE_ENCODER_DAC, NULL); if (ret) { drm_err(dev, "failed to init encoder: %d\n", ret); return ret; @@ -117,7 +117,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) ret = drm_connector_init_with_ddc(dev, connector, &hibmc_connector_funcs, DRM_MODE_CONNECTOR_VGA, - &hibmc_connector->adapter); + &vdac->adapter); if (ret) { drm_err(dev, "failed to init connector: %d\n", ret); return ret;