drm/i915: Replace *_reference/unreference() or *_ref/unref with _get/put()
Subsystems (2)
PATCH v2 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.
Done with following coccinelle semantic patch
@@
expression ex;
@@
(
-drm_framebuffer_unreference(ex);
+drm_framebuffer_put(ex);
|
-drm_dev_unref(ex);
+drm_dev_put(ex);
|
-drm_framebuffer_reference(ex);
+drm_framebuffer_get(ex);
)
---
Changes in v2:
-Added coccinelle patch in log message
-cc to all driver-specific mailing lists
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Replace *_reference/unreference() or *_ref/unref with _get/put()
== Series Details ==
== Series Details ==
Series: drm/i915: Replace *_reference/unreference() or *_ref/unref with _get/put()
URL : https://patchwork.freedesktop.org/series/31283/
State : failure
== Summary ==
Series 31283v1 drm/i915: Replace *_reference/unreference() or *_ref/unref with _get/put()
https://patchwork.freedesktop.org/api/1.0/series/31283/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> INCOMPLETE (fi-ivb-3770)
pass -> DMESG-WARN (fi-byt-j1900)
pass -> INCOMPLETE (fi-hsw-4770)
pass -> INCOMPLETE (fi-hsw-4770r)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (fi-byt-j1900)fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:458s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:476s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:396s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:576s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:287s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:531s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:536s fi-byt-j1900 total:245 pass:214 dwarn:1 dfail:0 fail:0 skip:29 fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:563s fi-cnl-y total:289 pass:261 dwarn:1 dfail:0 fail:0 skip:27 time:633s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:431s fi-glk-1 total:289 pass:257 dwarn:3 dfail:0 fail:0 skip:29 time:588s fi-hsw-4770 total:118 pass:100 dwarn:0 dfail:0 fail:0 skip:17 fi-hsw-4770r total:118 pass:100 dwarn:0 dfail:0 fail:0 skip:17 fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:474s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:507s fi-ivb-3770 total:118 pass:96 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:505s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:577s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:490s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:595s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:659s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:478s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:534s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:578s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:470s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:591s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:434s
fi-byt-n2820 failed to connect after reboot
2f14e319a2fd0125bcb06b00095afa6cab5134bd drm-tip: 2017y-10m-02d-09h-23m-23s UTC integration manifest 513daac4b852 drm/i915: Replace *_reference/unreference() or *_ref/unref with _get/put()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5871/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · Harsha Sharma
Replace instances of drm_framebuffer_reference/unreference() with *_get/put() suffixes and
drm_dev_unrefwith*_put()suffix because get/put is shorter and consistent with the kernel use of *_get/put suffixes.
Done with following coccinelle semantic patch@@
expression ex;
@@(
(quoted diff) +1
-1-drm_framebuffer_unreference(ex); +drm_framebuffer_put(ex);|
(quoted diff) +1
-1-drm_dev_unref(ex); +drm_dev_put(ex);|
(quoted diff) +1
-1-drm_framebuffer_reference(ex); +drm_framebuffer_get(ex);)
Signed-off-by Harsha Sharma <[email protected]>---
Changes in v2:
-Added coccinelle patch in log message
-cc to all driver-specific mailing lists
Quoted 12 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(-)
Hi,
Any update regarding this ?
Thanks.
Regards,
Harsha Sharma
Quoted 175 lines
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)drivers/gpu/drm/i915/intel_display.c +5
-5@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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
-2@@ -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; } --
Quoted 2 lines
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx