Skip to contentSkip to conversation

drm/i915: Replace *_reference/unreference() or *_ref/unref with _get/put()

PATCH Superseded Harsha Sharma 2 participants 3 messages Sep 28, 2017

Subsystems (2)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Replace *_reference/unreference() or *_ref/unref with _get/put()

Replace instances of drm_framebuffer_reference/unreference() with *_get/put() suffixes and drm_dev_unref with *_put() suffix because get/put is shorter and consistent with the kernel use of *_get/put suffixes .

---
 drivers/gpu/drm/i915/i915_pci.c                    |  2 +-
 drivers/gpu/drm/i915/intel_display.c               | 10 +++++-----
 drivers/gpu/drm/i915/intel_fbdev.c                 |  4 ++--
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_request.c  |  2 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c          |  2 +-
 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_pci.c +1 -1
index 09d97e0..2f106cc 100644
@@ -510,7 +510,7 @@ static void i915_pci_remove(struct pci_dev *pdev)
 	struct drm_device *dev = pci_get_drvdata(pdev);
 
 	i915_driver_unload(dev);
-	drm_dev_unref(dev);
+	drm_dev_put(dev);
 }
 
 static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
drivers/gpu/drm/i915/intel_display.c +5 -5
index f172755..92f8304 100644
@@ -2856,7 +2856,7 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
 
 		if (intel_plane_ggtt_offset(state) == plane_config->base) {
 			fb = c->primary->fb;
-			drm_framebuffer_reference(fb);
+			drm_framebuffer_get(fb);
 			goto valid_fb;
 		}
 	}
@@ -2887,7 +2887,7 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
 			  intel_crtc->pipe, PTR_ERR(intel_state->vma));
 
 		intel_state->vma = NULL;
-		drm_framebuffer_unreference(fb);
+		drm_framebuffer_put(fb);
 		return;
 	}
 
@@ -2908,7 +2908,7 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
 	if (i915_gem_object_is_tiled(obj))
 		dev_priv->preserve_bios_swizzle = true;
 
-	drm_framebuffer_reference(fb);
+	drm_framebuffer_get(fb);
 	primary->fb = primary->state->fb = fb;
 	primary->crtc = primary->state->crtc = &intel_crtc->base;
 
@@ -9847,7 +9847,7 @@ struct drm_framebuffer *
 	if (obj->base.size < mode->vdisplay * fb->pitches[0])
 		return NULL;
 
-	drm_framebuffer_reference(fb);
+	drm_framebuffer_get(fb);
 	return fb;
 #else
 	return NULL;
@@ -10028,7 +10028,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
 	if (ret)
 		goto fail;
 
-	drm_framebuffer_unreference(fb);
+	drm_framebuffer_put(fb);
 
 	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
 	if (ret)
drivers/gpu/drm/i915/intel_fbdev.c +2 -2
index 262e75c..1ff7149 100644
@@ -189,7 +189,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
 			      " releasing it\n",
 			      intel_fb->base.width, intel_fb->base.height,
 			      sizes->fb_width, sizes->fb_height);
-		drm_framebuffer_unreference(&intel_fb->base);
+		drm_framebuffer_put(&intel_fb->base);
 		intel_fb = ifbdev->fb = NULL;
 	}
 	if (!intel_fb || WARN_ON(!intel_fb->obj)) {
@@ -624,7 +624,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
 	ifbdev->preferred_bpp = fb->base.format->cpp[0] * 8;
 	ifbdev->fb = fb;
 
-	drm_framebuffer_reference(&ifbdev->fb->base);
+	drm_framebuffer_put(&ifbdev->fb->base);
 
 	/* Final pass to check if any active pipes don't have fbs */
 	for_each_crtc(dev, crtc) {
drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +1 -1
index 89dc25a..a7055b1 100644
@@ -389,7 +389,7 @@ int i915_gem_dmabuf_mock_selftests(void)
 
 	err = i915_subtests(tests, i915);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1 -1
index 5ea3732..75764fd 100644
@@ -345,6 +345,6 @@ int i915_gem_evict_mock_selftests(void)
 	err = i915_subtests(tests, i915);
 	mutex_unlock(&i915->drm.struct_mutex);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
index 6b132ca..bc3c4a5 100644
@@ -1540,7 +1540,7 @@ int i915_gem_gtt_mock_selftests(void)
 	err = i915_subtests(tests, i915);
 	mutex_unlock(&i915->drm.struct_mutex);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/i915_gem_object.c +1 -1
index 8f011c4..7bfd990 100644
@@ -586,7 +586,7 @@ int i915_gem_object_mock_selftests(void)
 
 	err = i915_subtests(tests, i915);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/i915_gem_request.c +1 -1
index 6664cb2..8985578 100644
@@ -260,7 +260,7 @@ int i915_gem_request_mock_selftests(void)
 		return -ENOMEM;
 
 	err = i915_subtests(tests, i915);
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 
 	return err;
 }
drivers/gpu/drm/i915/selftests/i915_vma.c +1 -1
index 2e86ec1..d8cc0a6 100644
@@ -734,7 +734,7 @@ int i915_vma_mock_selftests(void)
 	err = i915_subtests(tests, i915);
 	mutex_unlock(&i915->drm.struct_mutex);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +1 -1
index 828904b..3c8bf44 100644
@@ -475,7 +475,7 @@ int intel_breadcrumbs_mock_selftests(void)
 		return -ENOMEM;
 
 	err = i915_subtests(tests, i915->engine[RCS]);
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 
 	return err;
 }
Signature · 1 line
1.9.1
#1 lore raw
Quoted 4 lines · Harsha Sharma

Replace instances of drm_framebuffer_reference/unreference() with *_get/put() suffixes and drm_dev_unref with *_put() suffix because get/put is shorter and consistent with the kernel use of *_get/put suffixes .

Since this is done with cocci it's good to reference or include the cocci patch you've used in the commit message.

Quoted 1 line

When submitting a driver patch, please make sure you also include driver maintainers and driver-specific mailing lists, not just dri-devel.

scripts/get_maintainers.pl should help you with figuring these out.

Thanks, Daniel

Quoted 190 lines
---
 drivers/gpu/drm/i915/i915_pci.c                    |  2 +-
 drivers/gpu/drm/i915/intel_display.c               | 10 +++++-----
 drivers/gpu/drm/i915/intel_fbdev.c                 |  4 ++--
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_request.c  |  2 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c          |  2 +-
 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_pci.c +1 -1
index 09d97e0..2f106cc 100644
@@ -510,7 +510,7 @@ static void i915_pci_remove(struct pci_dev *pdev)
 	struct drm_device *dev = pci_get_drvdata(pdev);
 
 	i915_driver_unload(dev);
-	drm_dev_unref(dev);
+	drm_dev_put(dev);
 }
 
 static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
drivers/gpu/drm/i915/intel_display.c +5 -5
index f172755..92f8304 100644
@@ -2856,7 +2856,7 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
 
 		if (intel_plane_ggtt_offset(state) == plane_config->base) {
 			fb = c->primary->fb;
-			drm_framebuffer_reference(fb);
+			drm_framebuffer_get(fb);
 			goto valid_fb;
 		}
 	}
@@ -2887,7 +2887,7 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
 			  intel_crtc->pipe, PTR_ERR(intel_state->vma));
 
 		intel_state->vma = NULL;
-		drm_framebuffer_unreference(fb);
+		drm_framebuffer_put(fb);
 		return;
 	}
 
@@ -2908,7 +2908,7 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
 	if (i915_gem_object_is_tiled(obj))
 		dev_priv->preserve_bios_swizzle = true;
 
-	drm_framebuffer_reference(fb);
+	drm_framebuffer_get(fb);
 	primary->fb = primary->state->fb = fb;
 	primary->crtc = primary->state->crtc = &intel_crtc->base;
 
@@ -9847,7 +9847,7 @@ struct drm_framebuffer *
 	if (obj->base.size < mode->vdisplay * fb->pitches[0])
 		return NULL;
 
-	drm_framebuffer_reference(fb);
+	drm_framebuffer_get(fb);
 	return fb;
 #else
 	return NULL;
@@ -10028,7 +10028,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
 	if (ret)
 		goto fail;
 
-	drm_framebuffer_unreference(fb);
+	drm_framebuffer_put(fb);
 
 	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
 	if (ret)
drivers/gpu/drm/i915/intel_fbdev.c +2 -2
index 262e75c..1ff7149 100644
@@ -189,7 +189,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
 			      " releasing it\n",
 			      intel_fb->base.width, intel_fb->base.height,
 			      sizes->fb_width, sizes->fb_height);
-		drm_framebuffer_unreference(&intel_fb->base);
+		drm_framebuffer_put(&intel_fb->base);
 		intel_fb = ifbdev->fb = NULL;
 	}
 	if (!intel_fb || WARN_ON(!intel_fb->obj)) {
@@ -624,7 +624,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
 	ifbdev->preferred_bpp = fb->base.format->cpp[0] * 8;
 	ifbdev->fb = fb;
 
-	drm_framebuffer_reference(&ifbdev->fb->base);
+	drm_framebuffer_put(&ifbdev->fb->base);
 
 	/* Final pass to check if any active pipes don't have fbs */
 	for_each_crtc(dev, crtc) {
drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +1 -1
index 89dc25a..a7055b1 100644
@@ -389,7 +389,7 @@ int i915_gem_dmabuf_mock_selftests(void)
 
 	err = i915_subtests(tests, i915);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1 -1
index 5ea3732..75764fd 100644
@@ -345,6 +345,6 @@ int i915_gem_evict_mock_selftests(void)
 	err = i915_subtests(tests, i915);
 	mutex_unlock(&i915->drm.struct_mutex);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
index 6b132ca..bc3c4a5 100644
@@ -1540,7 +1540,7 @@ int i915_gem_gtt_mock_selftests(void)
 	err = i915_subtests(tests, i915);
 	mutex_unlock(&i915->drm.struct_mutex);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/i915_gem_object.c +1 -1
index 8f011c4..7bfd990 100644
@@ -586,7 +586,7 @@ int i915_gem_object_mock_selftests(void)
 
 	err = i915_subtests(tests, i915);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/i915_gem_request.c +1 -1
index 6664cb2..8985578 100644
@@ -260,7 +260,7 @@ int i915_gem_request_mock_selftests(void)
 		return -ENOMEM;
 
 	err = i915_subtests(tests, i915);
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 
 	return err;
 }
drivers/gpu/drm/i915/selftests/i915_vma.c +1 -1
index 2e86ec1..d8cc0a6 100644
@@ -734,7 +734,7 @@ int i915_vma_mock_selftests(void)
 	err = i915_subtests(tests, i915);
 	mutex_unlock(&i915->drm.struct_mutex);
 
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 	return err;
 }
 
drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +1 -1
index 828904b..3c8bf44 100644
@@ -475,7 +475,7 @@ int intel_breadcrumbs_mock_selftests(void)
 		return -ENOMEM;
 
 	err = i915_subtests(tests, i915->engine[RCS]);
-	drm_dev_unref(&i915->drm);
+	drm_dev_put(&i915->drm);
 
 	return err;
 }
Signature · 1 line
1.9.1
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
#2 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 4 lines · Harsha Sharma

Replace instances of drm_framebuffer_reference/unreference() with *_get/put() suffixes and drm_dev_unref with *_put() suffix because get/put is shorter and consistent with the kernel use of *_get/put suffixes .

Since this is done with cocci it's good to reference or include the cocci patch you've used in the commit message.

Quoted 8 lines
Quoted 1 line
Signed-off-by Harsha Sharma <[email protected] <javascript:>>

When submitting a driver patch, please make sure you also include driver maintainers and driver-specific mailing lists, not just dri-devel.

scripts/get_maintainers.pl should help you with figuring these out.

Thanks, Daniel

Hi,
Thanks for your feedback.
I have actually tried several no. of times to run get_maintainers.pl for this patch but didn't got any result for just this patch so finally send it . Is there any other way to get list of maintainers and driver-specific mailing lists ?
I'll send another version for this patch.
Thanks a lot for your time.

Regards,
Harsha Sharma

Quoted 217 lines
Quoted 15 lines

---

 drivers/gpu/drm/i915/i915_pci.c                    |  2 +- 
 drivers/gpu/drm/i915/intel_display.c               | 10 +++++----- 
 drivers/gpu/drm/i915/intel_fbdev.c                 |  4 ++-- 
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_request.c  |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_vma.c          |  2 +- 
 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c |  2 +- 
 10 files changed, 15 insertions(+), 15 deletions(-) 

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_pci.c

drivers/gpu/drm/i915/i915_pci.c static void i915_pci_remove(struct pci_dev *pdev) · line 516

Quoted 12 lines

index 09d97e0..2f106cc 100644

drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -510,7 +510,7 @@ static void i915_pci_remove(struct pci_dev *pdev) 
         struct drm_device *dev = pci_get_drvdata(pdev); 
 
         i915_driver_unload(dev); 
-        drm_dev_unref(dev); 
+        drm_dev_put(dev); 
 } 
 
 static int i915_pci_probe(struct pci_dev *pdev, const struct 

pci_device_id *ent)

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_display.c

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool

Quoted 4 lines

index f172755..92f8304 100644

drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -2856,7 +2856,7 @@ static int skl_format_to_fourcc(int format, bool 

rgb_order, bool alpha)

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool · line 2856

Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
                 if (intel_plane_ggtt_offset(state) == 

plane_config->base) {

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool

Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
                         fb = c->primary->fb; 
-                        drm_framebuffer_reference(fb); 
+                        drm_framebuffer_get(fb); 
                         goto valid_fb; 
                 } 
         } 
@@ -2887,7 +2887,7 @@ static int skl_format_to_fourcc(int format, bool 

rgb_order, bool alpha)

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool

Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
                           intel_crtc->pipe, PTR_ERR(intel_state->vma)); 
 
                 intel_state->vma = NULL; 
-                drm_framebuffer_unreference(fb); 
+                drm_framebuffer_put(fb); 
                 return; 
         } 
 
@@ -2908,7 +2908,7 @@ static int skl_format_to_fourcc(int format, bool 

rgb_order, bool alpha)

drivers/gpu/drm/i915/intel_display.c int intel_get_load_detect_pipe(struct

Quoted 18 lines
drivers/gpu/drm/i915/intel_display.c +2 -2
         if (i915_gem_object_is_tiled(obj)) 
                 dev_priv->preserve_bios_swizzle = true; 
 
-        drm_framebuffer_reference(fb); 
+        drm_framebuffer_get(fb); 
         primary->fb = primary->state->fb = fb; 
         primary->crtc = primary->state->crtc = &intel_crtc->base; 
 
@@ -9847,7 +9847,7 @@ struct drm_framebuffer * 
         if (obj->base.size < mode->vdisplay * fb->pitches[0]) 
                 return NULL; 
 
-        drm_framebuffer_reference(fb); 
+        drm_framebuffer_get(fb); 
         return fb; 
 #else 
         return NULL; 
@@ -10028,7 +10028,7 @@ int intel_get_load_detect_pipe(struct 

drm_connector *connector,

Review

Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
         if (ret) 
                 goto fail; 
 
-        drm_framebuffer_unreference(fb); 
+        drm_framebuffer_put(fb); 
 
         ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode); 
         if (ret) 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_fbdev.c

drivers/gpu/drm/i915/intel_fbdev.c static int intelfb_create(struct drm_fb_helper

Quoted 4 lines

index 262e75c..1ff7149 100644

drivers/gpu/drm/i915/intel_fbdev.c +0 -0
@@ -189,7 +189,7 @@ static int intelfb_create(struct drm_fb_helper 

*helper,

drivers/gpu/drm/i915/intel_fbdev.c static int intelfb_create(struct drm_fb_helper · line 190

Quoted 2 lines
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
                               " releasing it\n", 
                               intel_fb->base.width, 

intel_fb->base.height,

drivers/gpu/drm/i915/intel_fbdev.c static bool intel_fbdev_init_bios(struct drm_device

Quoted 7 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
                               sizes->fb_width, sizes->fb_height); 
-                drm_framebuffer_unreference(&intel_fb->base); 
+                drm_framebuffer_put(&intel_fb->base); 
                 intel_fb = ifbdev->fb = NULL; 
         } 
         if (!intel_fb || WARN_ON(!intel_fb->obj)) { 
@@ -624,7 +624,7 @@ static bool intel_fbdev_init_bios(struct drm_device 

*dev,

Review

Quoted 9 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
         ifbdev->preferred_bpp = fb->base.format->cpp[0] * 8; 
         ifbdev->fb = fb; 
 
-        drm_framebuffer_reference(&ifbdev->fb->base); 
+        drm_framebuffer_put(&ifbdev->fb->base); 
 
         /* Final pass to check if any active pipes don't have fbs */ 
         for_each_crtc(dev, crtc) { 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c

Review

Quoted 13 lines

index 89dc25a..a7055b1 100644

drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +1 -1
@@ -389,7 +389,7 @@ int i915_gem_dmabuf_mock_selftests(void) 
 
         err = i915_subtests(tests, i915); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c

Review

Quoted 12 lines

index 5ea3732..75764fd 100644

drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1 -1
@@ -345,6 +345,6 @@ int i915_gem_evict_mock_selftests(void) 
         err = i915_subtests(tests, i915); 
         mutex_unlock(&i915->drm.struct_mutex); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c

Review

Quoted 13 lines

index 6b132ca..bc3c4a5 100644

drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
@@ -1540,7 +1540,7 @@ int i915_gem_gtt_mock_selftests(void) 
         err = i915_subtests(tests, i915); 
         mutex_unlock(&i915->drm.struct_mutex); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_object.c

Review

Quoted 13 lines

index 8f011c4..7bfd990 100644

drivers/gpu/drm/i915/selftests/i915_gem_object.c +1 -1
@@ -586,7 +586,7 @@ int i915_gem_object_mock_selftests(void) 
 
         err = i915_subtests(tests, i915); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_request.c

Review

Quoted 13 lines

index 6664cb2..8985578 100644

drivers/gpu/drm/i915/selftests/i915_gem_request.c +1 -1
@@ -260,7 +260,7 @@ int i915_gem_request_mock_selftests(void) 
                 return -ENOMEM; 
 
         err = i915_subtests(tests, i915); 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
 
         return err; 
 } 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_vma.c

Review

Quoted 13 lines

index 2e86ec1..d8cc0a6 100644

drivers/gpu/drm/i915/selftests/i915_vma.c +1 -1
@@ -734,7 +734,7 @@ int i915_vma_mock_selftests(void) 
         err = i915_subtests(tests, i915); 
         mutex_unlock(&i915->drm.struct_mutex); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c

Quoted 15 lines

index 828904b..3c8bf44 100644

drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +1 -1
@@ -475,7 +475,7 @@ int intel_breadcrumbs_mock_selftests(void) 
                 return -ENOMEM; 
 
         err = i915_subtests(tests, i915->engine[RCS]); 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
 
         return err; 
 } 
Signature · 1 line
1.9.1 
Signature · 3 lines
Daniel Vetter 
Software Engineer, Intel Corporation 
http://blog.ffwll.ch 
Quoted 234 lines · Daniel Vetter
Quoted 4 lines · Harsha Sharma

Replace instances of drm_framebuffer_reference/unreference() with *_get/put() suffixes and drm_dev_unref with *_put() suffix because get/put is shorter and consistent with the kernel use of *_get/put suffixes .

Since this is done with cocci it's good to reference or include the cocci patch you've used in the commit message.

Quoted 1 line
Signed-off-by Harsha Sharma <[email protected] <javascript:>>

When submitting a driver patch, please make sure you also include driver maintainers and driver-specific mailing lists, not just dri-devel.

scripts/get_maintainers.pl should help you with figuring these out.

Thanks, Daniel

Quoted 13 lines

---

 drivers/gpu/drm/i915/i915_pci.c                    |  2 +- 
 drivers/gpu/drm/i915/intel_display.c               | 10 +++++----- 
 drivers/gpu/drm/i915/intel_fbdev.c                 |  4 ++-- 
 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c   |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_gem_request.c  |  2 +- 
 drivers/gpu/drm/i915/selftests/i915_vma.c          |  2 +- 
 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c |  2 +- 
 10 files changed, 15 insertions(+), 15 deletions(-) 

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_pci.c

drivers/gpu/drm/i915/i915_pci.c static void i915_pci_remove(struct pci_dev *pdev) · line 516

Quoted 12 lines

index 09d97e0..2f106cc 100644

drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -510,7 +510,7 @@ static void i915_pci_remove(struct pci_dev *pdev) 
         struct drm_device *dev = pci_get_drvdata(pdev); 
 
         i915_driver_unload(dev); 
-        drm_dev_unref(dev); 
+        drm_dev_put(dev); 
 } 
 
 static int i915_pci_probe(struct pci_dev *pdev, const struct 

pci_device_id *ent)

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_display.c

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool

Quoted 4 lines

index f172755..92f8304 100644

drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -2856,7 +2856,7 @@ static int skl_format_to_fourcc(int format, bool 

rgb_order, bool alpha)

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool · line 2856

Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
                 if (intel_plane_ggtt_offset(state) == 

plane_config->base) {

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool

Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
                         fb = c->primary->fb; 
-                        drm_framebuffer_reference(fb); 
+                        drm_framebuffer_get(fb); 
                         goto valid_fb; 
                 } 
         } 
@@ -2887,7 +2887,7 @@ static int skl_format_to_fourcc(int format, bool 

rgb_order, bool alpha)

drivers/gpu/drm/i915/intel_display.c static int skl_format_to_fourcc(int format, bool

Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
                           intel_crtc->pipe, PTR_ERR(intel_state->vma)); 
 
                 intel_state->vma = NULL; 
-                drm_framebuffer_unreference(fb); 
+                drm_framebuffer_put(fb); 
                 return; 
         } 
 
@@ -2908,7 +2908,7 @@ static int skl_format_to_fourcc(int format, bool 

rgb_order, bool alpha)

drivers/gpu/drm/i915/intel_display.c int intel_get_load_detect_pipe(struct

Quoted 18 lines
drivers/gpu/drm/i915/intel_display.c +2 -2
         if (i915_gem_object_is_tiled(obj)) 
                 dev_priv->preserve_bios_swizzle = true; 
 
-        drm_framebuffer_reference(fb); 
+        drm_framebuffer_get(fb); 
         primary->fb = primary->state->fb = fb; 
         primary->crtc = primary->state->crtc = &intel_crtc->base; 
 
@@ -9847,7 +9847,7 @@ struct drm_framebuffer * 
         if (obj->base.size < mode->vdisplay * fb->pitches[0]) 
                 return NULL; 
 
-        drm_framebuffer_reference(fb); 
+        drm_framebuffer_get(fb); 
         return fb; 
 #else 
         return NULL; 
@@ -10028,7 +10028,7 @@ int intel_get_load_detect_pipe(struct 

drm_connector *connector,

Review

Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
         if (ret) 
                 goto fail; 
 
-        drm_framebuffer_unreference(fb); 
+        drm_framebuffer_put(fb); 
 
         ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode); 
         if (ret) 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_fbdev.c

drivers/gpu/drm/i915/intel_fbdev.c static int intelfb_create(struct drm_fb_helper

Quoted 4 lines

index 262e75c..1ff7149 100644

drivers/gpu/drm/i915/intel_fbdev.c +0 -0
@@ -189,7 +189,7 @@ static int intelfb_create(struct drm_fb_helper 

*helper,

drivers/gpu/drm/i915/intel_fbdev.c static int intelfb_create(struct drm_fb_helper · line 190

Quoted 2 lines
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
                               " releasing it\n", 
                               intel_fb->base.width, 

intel_fb->base.height,

drivers/gpu/drm/i915/intel_fbdev.c static bool intel_fbdev_init_bios(struct drm_device

Quoted 7 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
                               sizes->fb_width, sizes->fb_height); 
-                drm_framebuffer_unreference(&intel_fb->base); 
+                drm_framebuffer_put(&intel_fb->base); 
                 intel_fb = ifbdev->fb = NULL; 
         } 
         if (!intel_fb || WARN_ON(!intel_fb->obj)) { 
@@ -624,7 +624,7 @@ static bool intel_fbdev_init_bios(struct drm_device 

*dev,

Review

Quoted 9 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
         ifbdev->preferred_bpp = fb->base.format->cpp[0] * 8; 
         ifbdev->fb = fb; 
 
-        drm_framebuffer_reference(&ifbdev->fb->base); 
+        drm_framebuffer_put(&ifbdev->fb->base); 
 
         /* Final pass to check if any active pipes don't have fbs */ 
         for_each_crtc(dev, crtc) { 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c

Review

Quoted 13 lines

index 89dc25a..a7055b1 100644

drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +1 -1
@@ -389,7 +389,7 @@ int i915_gem_dmabuf_mock_selftests(void) 
 
         err = i915_subtests(tests, i915); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c

Review

Quoted 12 lines

index 5ea3732..75764fd 100644

drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1 -1
@@ -345,6 +345,6 @@ int i915_gem_evict_mock_selftests(void) 
         err = i915_subtests(tests, i915); 
         mutex_unlock(&i915->drm.struct_mutex); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c

Review

Quoted 13 lines

index 6b132ca..bc3c4a5 100644

drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
@@ -1540,7 +1540,7 @@ int i915_gem_gtt_mock_selftests(void) 
         err = i915_subtests(tests, i915); 
         mutex_unlock(&i915->drm.struct_mutex); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_object.c

Review

Quoted 13 lines

index 8f011c4..7bfd990 100644

drivers/gpu/drm/i915/selftests/i915_gem_object.c +1 -1
@@ -586,7 +586,7 @@ int i915_gem_object_mock_selftests(void) 
 
         err = i915_subtests(tests, i915); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_gem_request.c

Review

Quoted 13 lines

index 6664cb2..8985578 100644

drivers/gpu/drm/i915/selftests/i915_gem_request.c +1 -1
@@ -260,7 +260,7 @@ int i915_gem_request_mock_selftests(void) 
                 return -ENOMEM; 
 
         err = i915_subtests(tests, i915); 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
 
         return err; 
 } 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/i915_vma.c

Review

Quoted 13 lines

index 2e86ec1..d8cc0a6 100644

drivers/gpu/drm/i915/selftests/i915_vma.c +1 -1
@@ -734,7 +734,7 @@ int i915_vma_mock_selftests(void) 
         err = i915_subtests(tests, i915); 
         mutex_unlock(&i915->drm.struct_mutex); 
 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
         return err; 
 } 
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c

Quoted 15 lines

index 828904b..3c8bf44 100644

drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +1 -1
@@ -475,7 +475,7 @@ int intel_breadcrumbs_mock_selftests(void) 
                 return -ENOMEM; 
 
         err = i915_subtests(tests, i915->engine[RCS]); 
-        drm_dev_unref(&i915->drm); 
+        drm_dev_put(&i915->drm); 
 
         return err; 
 } 
Signature · 1 line
1.9.1 
Signature · 3 lines
Daniel Vetter 
Software Engineer, Intel Corporation 
http://blog.ffwll.ch