[PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
@ 2018-03-11 23:33 ` Haneen Mohammed
  0 siblings, 0 replies; 8+ messages in thread
From: Haneen Mohammed @ 2018-03-11 23:33 UTC (permalink / raw)
  To: outreachy-kernel
  Cc: VMware Graphics, Sinclair Yeh, Thomas Hellstrom, David Airlie,
	daniel.vetter, seanpaul, dri-devel

This patch replace instances of drm_framebuffer_unreference with _put()
suffix, because it is shorter and consistent with the kernel use of
*_get/put() suffixes.
This was done with the following Coccinelle script:

@r@
expression e;
@@

(
-drm_framebuffer_reference(e);
+drm_framebuffer_get(e);
|
-drm_framebuffer_unreference(e);
+drm_framebuffer_put(e);
)

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c    | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index d23a18a..be7d7fb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -500,7 +500,7 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par,
 	}
 
 	if (cur_fb) {
-		drm_framebuffer_unreference(cur_fb);
+		drm_framebuffer_put(cur_fb);
 		par->set_fb = NULL;
 	}
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 67f8446..c5e8eae 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@ -316,7 +316,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
 out_no_surface:
 	ttm_read_unlock(&dev_priv->reservation_sem);
 out_no_ttm_lock:
-	drm_framebuffer_unreference(fb);
+	drm_framebuffer_put(fb);
 out_no_fb:
 	drm_modeset_unlock_all(dev);
 out_no_copy:
@@ -393,7 +393,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
 
 	ttm_read_unlock(&dev_priv->reservation_sem);
 out_no_ttm_lock:
-	drm_framebuffer_unreference(fb);
+	drm_framebuffer_put(fb);
 out_no_fb:
 	drm_modeset_unlock_all(dev);
 out_no_copy:
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
@ 2018-03-11 23:33 ` Haneen Mohammed
  0 siblings, 0 replies; 8+ messages in thread
From: Haneen Mohammed @ 2018-03-11 23:33 UTC (permalink / raw)
  To: outreachy-kernel
  Cc: Thomas Hellstrom, David Airlie, daniel.vetter, dri-devel,
	VMware Graphics

This patch replace instances of drm_framebuffer_unreference with _put()
suffix, because it is shorter and consistent with the kernel use of
*_get/put() suffixes.
This was done with the following Coccinelle script:

@r@
expression e;
@@

(
-drm_framebuffer_reference(e);
+drm_framebuffer_get(e);
|
-drm_framebuffer_unreference(e);
+drm_framebuffer_put(e);
)

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c    | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index d23a18a..be7d7fb 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -500,7 +500,7 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par,
 	}
 
 	if (cur_fb) {
-		drm_framebuffer_unreference(cur_fb);
+		drm_framebuffer_put(cur_fb);
 		par->set_fb = NULL;
 	}
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 67f8446..c5e8eae 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@ -316,7 +316,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
 out_no_surface:
 	ttm_read_unlock(&dev_priv->reservation_sem);
 out_no_ttm_lock:
-	drm_framebuffer_unreference(fb);
+	drm_framebuffer_put(fb);
 out_no_fb:
 	drm_modeset_unlock_all(dev);
 out_no_copy:
@@ -393,7 +393,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
 
 	ttm_read_unlock(&dev_priv->reservation_sem);
 out_no_ttm_lock:
-	drm_framebuffer_unreference(fb);
+	drm_framebuffer_put(fb);
 out_no_fb:
 	drm_modeset_unlock_all(dev);
 out_no_copy:
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
  2018-03-11 23:33 ` Haneen Mohammed
@ 2018-03-12 17:34   ` Daniel Vetter
  -1 siblings, 0 replies; 8+ messages in thread
From: Daniel Vetter @ 2018-03-12 17:34 UTC (permalink / raw)
  To: Haneen Mohammed
  Cc: outreachy-kernel, VMware Graphics, Sinclair Yeh, Thomas Hellstrom,
	David Airlie, daniel.vetter, seanpaul, dri-devel

On Sun, Mar 11, 2018 at 05:33:13PM -0600, Haneen Mohammed wrote:
> This patch replace instances of drm_framebuffer_unreference with _put()
> suffix, because it is shorter and consistent with the kernel use of
> *_get/put() suffixes.
> This was done with the following Coccinelle script:
> 
> @r@
> expression e;
> @@
> 
> (
> -drm_framebuffer_reference(e);
> +drm_framebuffer_get(e);
> |
> -drm_framebuffer_unreference(e);
> +drm_framebuffer_put(e);
> )
> 
> Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Sinclair/Thomas: Ok if I pull this in through drm-misc? Makes outreachy
applicant book-keeping easier since iirc the vmwgfx tree isn't in
linux-next. But ok if you want to merge it too.
-Daniel


> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_fb.c    | 2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> index d23a18a..be7d7fb 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> @@ -500,7 +500,7 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par,
>  	}
>  
>  	if (cur_fb) {
> -		drm_framebuffer_unreference(cur_fb);
> +		drm_framebuffer_put(cur_fb);
>  		par->set_fb = NULL;
>  	}
>  
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> index 67f8446..c5e8eae 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> @@ -316,7 +316,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
>  out_no_surface:
>  	ttm_read_unlock(&dev_priv->reservation_sem);
>  out_no_ttm_lock:
> -	drm_framebuffer_unreference(fb);
> +	drm_framebuffer_put(fb);
>  out_no_fb:
>  	drm_modeset_unlock_all(dev);
>  out_no_copy:
> @@ -393,7 +393,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
>  
>  	ttm_read_unlock(&dev_priv->reservation_sem);
>  out_no_ttm_lock:
> -	drm_framebuffer_unreference(fb);
> +	drm_framebuffer_put(fb);
>  out_no_fb:
>  	drm_modeset_unlock_all(dev);
>  out_no_copy:
> -- 
> 2.7.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
@ 2018-03-12 17:34   ` Daniel Vetter
  0 siblings, 0 replies; 8+ messages in thread
From: Daniel Vetter @ 2018-03-12 17:34 UTC (permalink / raw)
  To: Haneen Mohammed
  Cc: Thomas Hellstrom, David Airlie, daniel.vetter, dri-devel,
	outreachy-kernel, VMware Graphics

On Sun, Mar 11, 2018 at 05:33:13PM -0600, Haneen Mohammed wrote:
> This patch replace instances of drm_framebuffer_unreference with _put()
> suffix, because it is shorter and consistent with the kernel use of
> *_get/put() suffixes.
> This was done with the following Coccinelle script:
> 
> @r@
> expression e;
> @@
> 
> (
> -drm_framebuffer_reference(e);
> +drm_framebuffer_get(e);
> |
> -drm_framebuffer_unreference(e);
> +drm_framebuffer_put(e);
> )
> 
> Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Sinclair/Thomas: Ok if I pull this in through drm-misc? Makes outreachy
applicant book-keeping easier since iirc the vmwgfx tree isn't in
linux-next. But ok if you want to merge it too.
-Daniel


> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_fb.c    | 2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> index d23a18a..be7d7fb 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
> @@ -500,7 +500,7 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par,
>  	}
>  
>  	if (cur_fb) {
> -		drm_framebuffer_unreference(cur_fb);
> +		drm_framebuffer_put(cur_fb);
>  		par->set_fb = NULL;
>  	}
>  
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> index 67f8446..c5e8eae 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> @@ -316,7 +316,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
>  out_no_surface:
>  	ttm_read_unlock(&dev_priv->reservation_sem);
>  out_no_ttm_lock:
> -	drm_framebuffer_unreference(fb);
> +	drm_framebuffer_put(fb);
>  out_no_fb:
>  	drm_modeset_unlock_all(dev);
>  out_no_copy:
> @@ -393,7 +393,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
>  
>  	ttm_read_unlock(&dev_priv->reservation_sem);
>  out_no_ttm_lock:
> -	drm_framebuffer_unreference(fb);
> +	drm_framebuffer_put(fb);
>  out_no_fb:
>  	drm_modeset_unlock_all(dev);
>  out_no_copy:
> -- 
> 2.7.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
  2018-03-12 17:34   ` Daniel Vetter
@ 2018-03-12 17:42     ` Sinclair Yeh
  -1 siblings, 0 replies; 8+ messages in thread
From: Sinclair Yeh @ 2018-03-12 17:42 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: Haneen Mohammed, outreachy-kernel, VMware Graphics,
	Thomas Hellstrom, David Airlie, daniel.vetter, seanpaul,
	dri-devel

Hi Daniel,


On Mon, Mar 12, 2018 at 06:34:43PM +0100, Daniel Vetter wrote:
> On Sun, Mar 11, 2018 at 05:33:13PM -0600, Haneen Mohammed wrote:
> > This patch replace instances of drm_framebuffer_unreference with _put()
> > suffix, because it is shorter and consistent with the kernel use of
> > *_get/put() suffixes.
> > This was done with the following Coccinelle script:
> > 
> > @r@
> > expression e;
> > @@
> > 
> > (
> > -drm_framebuffer_reference(e);
> > +drm_framebuffer_get(e);
> > |
> > -drm_framebuffer_unreference(e);
> > +drm_framebuffer_put(e);
> > )
> > 
> > Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
> 
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> Sinclair/Thomas: Ok if I pull this in through drm-misc? Makes outreachy
> applicant book-keeping easier since iirc the vmwgfx tree isn't in
> linux-next. But ok if you want to merge it too.

Yes, drm-misc is fine.

Thanks!

Sinclair



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
@ 2018-03-12 17:42     ` Sinclair Yeh
  0 siblings, 0 replies; 8+ messages in thread
From: Sinclair Yeh @ 2018-03-12 17:42 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: Haneen Mohammed, Thomas Hellstrom, David Airlie, daniel.vetter,
	dri-devel, outreachy-kernel, VMware Graphics

Hi Daniel,


On Mon, Mar 12, 2018 at 06:34:43PM +0100, Daniel Vetter wrote:
> On Sun, Mar 11, 2018 at 05:33:13PM -0600, Haneen Mohammed wrote:
> > This patch replace instances of drm_framebuffer_unreference with _put()
> > suffix, because it is shorter and consistent with the kernel use of
> > *_get/put() suffixes.
> > This was done with the following Coccinelle script:
> > 
> > @r@
> > expression e;
> > @@
> > 
> > (
> > -drm_framebuffer_reference(e);
> > +drm_framebuffer_get(e);
> > |
> > -drm_framebuffer_unreference(e);
> > +drm_framebuffer_put(e);
> > )
> > 
> > Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
> 
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> Sinclair/Thomas: Ok if I pull this in through drm-misc? Makes outreachy
> applicant book-keeping easier since iirc the vmwgfx tree isn't in
> linux-next. But ok if you want to merge it too.

Yes, drm-misc is fine.

Thanks!

Sinclair

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
  2018-03-12 17:42     ` Sinclair Yeh
@ 2018-03-13 10:44       ` Daniel Vetter
  -1 siblings, 0 replies; 8+ messages in thread
From: Daniel Vetter @ 2018-03-13 10:44 UTC (permalink / raw)
  To: Sinclair Yeh
  Cc: Daniel Vetter, Haneen Mohammed, outreachy-kernel, VMware Graphics,
	Thomas Hellstrom, David Airlie, daniel.vetter, seanpaul,
	dri-devel

On Mon, Mar 12, 2018 at 10:42:47AM -0700, Sinclair Yeh wrote:
> Hi Daniel,
> 
> 
> On Mon, Mar 12, 2018 at 06:34:43PM +0100, Daniel Vetter wrote:
> > On Sun, Mar 11, 2018 at 05:33:13PM -0600, Haneen Mohammed wrote:
> > > This patch replace instances of drm_framebuffer_unreference with _put()
> > > suffix, because it is shorter and consistent with the kernel use of
> > > *_get/put() suffixes.
> > > This was done with the following Coccinelle script:
> > > 
> > > @r@
> > > expression e;
> > > @@
> > > 
> > > (
> > > -drm_framebuffer_reference(e);
> > > +drm_framebuffer_get(e);
> > > |
> > > -drm_framebuffer_unreference(e);
> > > +drm_framebuffer_put(e);
> > > )
> > > 
> > > Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
> > 
> > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > 
> > Sinclair/Thomas: Ok if I pull this in through drm-misc? Makes outreachy
> > applicant book-keeping easier since iirc the vmwgfx tree isn't in
> > linux-next. But ok if you want to merge it too.
> 
> Yes, drm-misc is fine.

Thanks, applied.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put
@ 2018-03-13 10:44       ` Daniel Vetter
  0 siblings, 0 replies; 8+ messages in thread
From: Daniel Vetter @ 2018-03-13 10:44 UTC (permalink / raw)
  To: Sinclair Yeh
  Cc: Haneen Mohammed, Thomas Hellstrom, David Airlie, daniel.vetter,
	dri-devel, outreachy-kernel, VMware Graphics

On Mon, Mar 12, 2018 at 10:42:47AM -0700, Sinclair Yeh wrote:
> Hi Daniel,
> 
> 
> On Mon, Mar 12, 2018 at 06:34:43PM +0100, Daniel Vetter wrote:
> > On Sun, Mar 11, 2018 at 05:33:13PM -0600, Haneen Mohammed wrote:
> > > This patch replace instances of drm_framebuffer_unreference with _put()
> > > suffix, because it is shorter and consistent with the kernel use of
> > > *_get/put() suffixes.
> > > This was done with the following Coccinelle script:
> > > 
> > > @r@
> > > expression e;
> > > @@
> > > 
> > > (
> > > -drm_framebuffer_reference(e);
> > > +drm_framebuffer_get(e);
> > > |
> > > -drm_framebuffer_unreference(e);
> > > +drm_framebuffer_put(e);
> > > )
> > > 
> > > Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
> > 
> > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > 
> > Sinclair/Thomas: Ok if I pull this in through drm-misc? Makes outreachy
> > applicant book-keeping easier since iirc the vmwgfx tree isn't in
> > linux-next. But ok if you want to merge it too.
> 
> Yes, drm-misc is fine.

Thanks, applied.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-03-13 10:44 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-11 23:33 [PATCH DRM] drm/vmwgfx: replace drm_*_unreference with drm_*_put Haneen Mohammed
2018-03-11 23:33 ` Haneen Mohammed
2018-03-12 17:34 ` Daniel Vetter
2018-03-12 17:34   ` Daniel Vetter
2018-03-12 17:42   ` Sinclair Yeh
2018-03-12 17:42     ` Sinclair Yeh
2018-03-13 10:44     ` Daniel Vetter
2018-03-13 10:44       ` Daniel Vetter

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.