7 files changed, 9 insertions, 16 deletions

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index bf64380d8d56..a45b32ba029e 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -738,10 +738,6 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev)
         if (!ddev)
                 return -ENOMEM;
 
-        ret = drm_dev_set_unique(ddev, dev_name(ddev->dev));
-        if (ret)
-                goto err_unref;
-
         ret = atmel_hlcdc_dc_load(ddev);
         if (ret)
                 goto err_unref;
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index eaa4316f3c45..bf934cdea21c 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -633,8 +633,17 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
                 }
         }
 
+        if (parent) {
+                ret = drm_dev_set_unique(dev, dev_name(parent));
+                if (ret)
+                        goto err_setunique;
+        }
+
         return dev;
 
+err_setunique:
+        if (drm_core_check_feature(dev, DRIVER_GEM))
+                drm_gem_destroy(dev);
 err_ctxbitmap:
         drm_legacy_ctxbitmap_cleanup(dev);
         drm_ht_remove(&dev->map_hash);
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index 1930234ba5f1..fca97d3fc846 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -363,7 +363,6 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
         fsl_dev->np = dev->of_node;
         drm->dev_private = fsl_dev;
         dev_set_drvdata(dev, fsl_dev);
-        drm_dev_set_unique(drm, dev_name(dev));
 
         ret = drm_dev_register(drm, 0);
         if (ret < 0)
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 2d23f95f17ce..b3a563c44bcd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -1046,10 +1046,6 @@ nouveau_platform_device_create(const struct nvkm_device_tegra_func *func,
                 goto err_free;
         }
 
-        err = drm_dev_set_unique(drm, dev_name(&pdev->dev));
-        if (err < 0)
-                goto err_free;
-
         drm->platformdev = pdev;
         platform_set_drvdata(pdev, drm);
 
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 215d6c44af55..afbb7407c44f 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -450,10 +450,6 @@ static int rockchip_drm_bind(struct device *dev)
         if (!drm)
                 return -ENOMEM;
 
-        ret = drm_dev_set_unique(drm, dev_name(dev));
-        if (ret)
-                goto err_free;
-
         ret = drm_dev_register(drm, 0);
         if (ret)
                 goto err_free;
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index e0f827790a5e..ff948d27d118 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -991,7 +991,6 @@ static int host1x_drm_probe(struct host1x_device *dev)
         if (!drm)
                 return -ENOMEM;
 
-        drm_dev_set_unique(drm, dev_name(&dev->dev));
         dev_set_drvdata(&dev->dev, drm);
 
         err = drm_dev_register(drm, 0);
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index cbcbbb83500e..f1655fff8425 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -184,8 +184,6 @@ static int vc4_drm_bind(struct device *dev)
         vc4->dev = drm;
         drm->dev_private = vc4;
 
-        drm_dev_set_unique(drm, dev_name(dev));
-
         vc4_bo_cache_init(drm);
 
         drm_mode_config_init(drm);