drm/hisilicon: Code refactoring for hibmc_drm_drv

Use the devm_drm_dev_alloc provided by the drm framework to alloc
a structure hibmc_drm_private.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1606901212-8214-2-git-send-email-tiantao6@hisilicon.com

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
index ea962acfeae0897f7b0b61ecdd2814a463cc2afd..096eea985b6f9ee68675759449774086bf259847 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
@@ -499,7 +499,7 @@ static const struct drm_crtc_helper_funcs hibmc_crtc_helper_funcs = {
 
 int hibmc_de_init(struct hibmc_drm_private *priv)
 {
-       struct drm_device *dev = priv->dev;
+       struct drm_device *dev = &priv->dev;
        struct drm_crtc *crtc = &priv->crtc;
        struct drm_plane *plane = &priv->primary_plane;
        int ret;

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
index d845657fd99cc4f15034e3ed768e69335462e229..13e8a287f54b99f1b4c8f1d53a5e7a309c8514bf 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
@@ -79,31 +79,32 @@ static const struct dev_pm_ops hibmc_pm_ops = {
 
 static int hibmc_kms_init(struct hibmc_drm_private *priv)
 {
+       struct drm_device *dev = &priv->dev;
        int ret;
 
-       drm_mode_config_init(priv->dev);
+       drm_mode_config_init(dev);
        priv->mode_config_initialized = true;
 
-       priv->dev->mode_config.min_width = 0;
-       priv->dev->mode_config.min_height = 0;
-       priv->dev->mode_config.max_width = 1920;
-       priv->dev->mode_config.max_height = 1200;
+       dev->mode_config.min_width = 0;
+       dev->mode_config.min_height = 0;
+       dev->mode_config.max_width = 1920;
+       dev->mode_config.max_height = 1200;
 
-       priv->dev->mode_config.fb_base = priv->fb_base;
-       priv->dev->mode_config.preferred_depth = 32;
-       priv->dev->mode_config.prefer_shadow = 1;
+       dev->mode_config.fb_base = priv->fb_base;
+       dev->mode_config.preferred_depth = 32;
+       dev->mode_config.prefer_shadow = 1;
 
-       priv->dev->mode_config.funcs = (void *)&hibmc_mode_funcs;
+       dev->mode_config.funcs = (void *)&hibmc_mode_funcs;
 
        ret = hibmc_de_init(priv);
        if (ret) {
-               drm_err(priv->dev, "failed to init de: %d\n", ret);
+               drm_err(dev, "failed to init de: %d\n", ret);
                return ret;
        }
 
        ret = hibmc_vdac_init(priv);
        if (ret) {
-               drm_err(priv->dev, "failed to init vdac: %d\n", ret);
+               drm_err(dev, "failed to init vdac: %d\n", ret);
                return ret;
        }
 
@@ -113,7 +114,7 @@ static int hibmc_kms_init(struct hibmc_drm_private *priv)
 static void hibmc_kms_fini(struct hibmc_drm_private *priv)
 {
        if (priv->mode_config_initialized) {
-               drm_mode_config_cleanup(priv->dev);
+               drm_mode_config_cleanup(&priv->dev);
                priv->mode_config_initialized = false;
        }
 }
@@ -202,7 +203,7 @@ static void hibmc_hw_config(struct hibmc_drm_private *priv)
 
 static int hibmc_hw_map(struct hibmc_drm_private *priv)
 {
-       struct drm_device *dev = priv->dev;
+       struct drm_device *dev = &priv->dev;
        struct pci_dev *pdev = dev->pdev;
        resource_size_t addr, size, ioaddr, iosize;
 
@@ -258,17 +259,9 @@ static int hibmc_unload(struct drm_device *dev)
 
 static int hibmc_load(struct drm_device *dev)
 {
-       struct hibmc_drm_private *priv;
+       struct hibmc_drm_private *priv = to_hibmc_drm_private(dev);
        int ret;
 
-       priv = drmm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv) {
-               drm_err(dev, "no memory to allocate for hibmc_drm_private\n");
-               return -ENOMEM;
-       }
-       dev->dev_private = priv;
-       priv->dev = dev;
-
        ret = hibmc_hw_init(priv);
        if (ret)
                goto err;
@@ -310,6 +303,7 @@ err:
 static int hibmc_pci_probe(struct pci_dev *pdev,
                           const struct pci_device_id *ent)
 {
+       struct hibmc_drm_private *priv;
        struct drm_device *dev;
        int ret;
 
@@ -318,12 +312,14 @@ 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)) {
+       priv = devm_drm_dev_alloc(&pdev->dev, &hibmc_driver,
+                                 struct hibmc_drm_private, dev);
+       if (IS_ERR(priv)) {
                DRM_ERROR("failed to allocate drm_device\n");
-               return PTR_ERR(dev);
+               return PTR_ERR(priv);
        }
 
+       dev = &priv->dev;
        dev->pdev = pdev;
        pci_set_drvdata(pdev, dev);
 

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
index f310a83d9c48d89c9d1160130f03c6e5bbbe4ff1..7e0c756a3323be168240fba55e708e82800c1d03 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
@@ -37,7 +37,7 @@ struct hibmc_drm_private {
        resource_size_t  fb_size;
 
        /* drm */
-       struct drm_device  *dev;
+       struct drm_device dev;
        struct drm_plane primary_plane;
        struct drm_crtc crtc;
        struct drm_encoder encoder;
@@ -52,7 +52,7 @@ static inline struct hibmc_connector *to_hibmc_connector(struct drm_connector *c
 
 static inline struct hibmc_drm_private *to_hibmc_drm_private(struct drm_device *dev)
 {
-       return dev->dev_private;
+       return container_of(dev, struct hibmc_drm_private, dev);
 }
 
 void hibmc_set_power_mode(struct hibmc_drm_private *priv,

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
index 74e26c27d8785de74377d3572a625c914245589e..d35548dd7f654039c92ba74539224b7f25279362 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
@@ -96,7 +96,7 @@ static const struct drm_encoder_funcs hibmc_encoder_funcs = {
 
 int hibmc_vdac_init(struct hibmc_drm_private *priv)
 {
-       struct drm_device *dev = priv->dev;
+       struct drm_device *dev = &priv->dev;
        struct hibmc_connector *hibmc_connector = &priv->connector;
        struct drm_encoder *encoder = &priv->encoder;
        struct drm_connector *connector = &hibmc_connector->base;

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index 602ece11bb4a4b01bd5269fb823c877d7751b3ce..e84fb81849a784c4dd245f7bc26ac2a38f7348eb 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -25,7 +25,7 @@ int hibmc_mm_init(struct hibmc_drm_private *hibmc)
 {
        struct drm_vram_mm *vmm;
        int ret;
-       struct drm_device *dev = hibmc->dev;
+       struct drm_device *dev = &hibmc->dev;
 
        vmm = drm_vram_helper_alloc_mm(dev,
                                       pci_resource_start(dev->pdev, 0),
@@ -41,10 +41,12 @@ int hibmc_mm_init(struct hibmc_drm_private *hibmc)
 
 void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
 {
-       if (!hibmc->dev->vram_mm)
+       struct drm_device *dev = &hibmc->dev;
+
+       if (!dev->vram_mm)
                return;
 
-       drm_vram_helper_release_mm(hibmc->dev);
+       drm_vram_helper_release_mm(dev);
 }
 
 int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,