Hi
Am 06.03.20 um 04:42 schrieb Tian Tao:
> using the load and unload function provided by drm framework instead of
> doing the same work in the hibmc_pci_probe and do some code cleanup.
>
> Signed-off-by: Tian Tao <tiantao6@xxxxxxxxxxxxx>
> Signed-off-by: Gong junjie <gongjunjie2@xxxxxxxxxx>
> ---
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 62 +++++++++----------------
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 +
> 2 files changed, 24 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> index 79a180a..51f1c70 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> @@ -23,7 +23,7 @@
> #include <drm/drm_print.h>
> #include <drm/drm_probe_helper.h>
> #include <drm/drm_vblank.h>
> -
> +#include <drm/drm_pci.h>
> #include "hibmc_drm_drv.h"
> #include "hibmc_drm_regs.h"
>
> @@ -49,6 +49,8 @@ static irqreturn_t hibmc_drm_interrupt(int irq, void *arg)
>
> static struct drm_driver hibmc_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> + .load = hibmc_load,
> + .unload = hibmc_unload,
These callbacks are deprecated and not to be used. During the last weeks
and months, we've been working on removing them from the other remaining
drivers. Therefore nak.
Best regards
Thomas
> .fops = &hibmc_fops,
> .name = "hibmc",
> .date = "20160828",
> @@ -232,6 +234,21 @@ static int hibmc_hw_map(struct hibmc_drm_private *priv)
> return 0;
> }
>
> +static void hibmc_hw_unmap(struct hibmc_drm_private *priv)
> +{
> + struct drm_device *dev = priv->dev;
> +
> + if (priv->mmio) {
> + devm_iounmap(dev->dev, priv->mmio);
> + priv->mmio = NULL;
> + }
> +
> + if (priv->fb_map) {
> + devm_iounmap(dev->dev, priv->fb_map);
> + priv->fb_map = NULL;
> + }
> +}
> +
> static int hibmc_hw_init(struct hibmc_drm_private *priv)
> {
> int ret;
> @@ -245,7 +262,7 @@ static int hibmc_hw_init(struct hibmc_drm_private *priv)
> return 0;
> }
>
> -static int hibmc_unload(struct drm_device *dev)
> +void hibmc_unload(struct drm_device *dev)
> {
> struct hibmc_drm_private *priv = dev->dev_private;
>
> @@ -258,11 +275,12 @@ static int hibmc_unload(struct drm_device *dev)
>
> hibmc_kms_fini(priv);
> hibmc_mm_fini(priv);
> + hibmc_hw_unmap(priv);
> dev->dev_private = NULL;
> return 0;
> }
>
> -static int hibmc_load(struct drm_device *dev)
> +int hibmc_load(struct drm_device *dev, unsigned long flags)
> {
> struct hibmc_drm_private *priv;
> int ret;
> @@ -332,43 +350,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
> if (ret)
> return ret;
>
> - dev = drm_dev_alloc(&hibmc_driver, &pdev->dev);
> - if (IS_ERR(dev)) {
> - DRM_ERROR("failed to allocate drm_device\n");
> - return PTR_ERR(dev);
> - }
> -
> - dev->pdev = pdev;
> - pci_set_drvdata(pdev, dev);
> -
> - ret = pci_enable_device(pdev);
> - if (ret) {
> - DRM_ERROR("failed to enable pci device: %d\n", ret);
> - goto err_free;
> - }
> -
> - ret = hibmc_load(dev);
> - if (ret) {
> - DRM_ERROR("failed to load hibmc: %d\n", ret);
> - goto err_disable;
> - }
> -
> - ret = drm_dev_register(dev, 0);
> - if (ret) {
> - DRM_ERROR("failed to register drv for userspace access: %d\n",
> - ret);
> - goto err_unload;
> - }
> - return 0;
> -
> -err_unload:
> - hibmc_unload(dev);
> -err_disable:
> - pci_disable_device(pdev);
> -err_free:
> - drm_dev_put(dev);
> -
> - return ret;
> + return drm_get_pci_dev(pdev, ent, &hibmc_driver);
> }
>
> static void hibmc_pci_remove(struct pci_dev *pdev)
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> index 50a0c1f..4e89cd7 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> @@ -37,6 +37,8 @@ void hibmc_set_power_mode(struct hibmc_drm_private *priv,
> void hibmc_set_current_gate(struct hibmc_drm_private *priv,
> unsigned int gate);
>
> +int hibmc_load(struct drm_device *dev, unsigned long flags);
> +void hibmc_unload(struct drm_device *dev);
> int hibmc_de_init(struct hibmc_drm_private *priv);
> int hibmc_vdac_init(struct hibmc_drm_private *priv);
>
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
