Re: [RESEND PATCH 1/2] drm/armada: Replace drm_gem_object_reference/unreference() with _get/put()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Sep 20, 2017 at 12:01:05PM -0700, Sean Paul wrote:
> On Wed, Sep 20, 2017 at 11:54 AM, Haneen Mohammed
> <hamohammed.sa@xxxxxxxxx> wrote:
> > This patch replace instances of drm_gem_object_reference/unreference with
> > *_get/put() suffixes, because get/put is shorter and consistent with the
> > kernel use of *_get/put() suffixes.
> > This was done with the following Coccinelle script:
> >
> > @r1@
> > expression e;
> > @@
> >
> > (
> > -drm_gem_object_reference(e);
> > +drm_gem_object_get(e);
> > |
> > -drm_gem_object_unreference(e);
> > +drm_gem_object_put(e);
> > |
> > -drm_gem_object_unreference_unlocked(e);
> > +drm_gem_object_put_unlocked(e);
> > )
> >
> > Signed-off-by: Haneen Mohammed <hamohammed.sa@xxxxxxxxx>
> 
> Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>

Applied to drm-misc-next

Thanks for your patch!

Sean

> 
> > ---
> >  drivers/gpu/drm/armada/armada_crtc.c  |  8 ++++----
> >  drivers/gpu/drm/armada/armada_fb.c    |  8 ++++----
> >  drivers/gpu/drm/armada/armada_fbdev.c |  6 +++---
> >  drivers/gpu/drm/armada/armada_gem.c   | 14 +++++++-------
> >  4 files changed, 18 insertions(+), 18 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
> > index 2a4d163..381dfa1 100644
> > --- a/drivers/gpu/drm/armada/armada_crtc.c
> > +++ b/drivers/gpu/drm/armada/armada_crtc.c
> > @@ -947,13 +947,13 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
> >
> >                 /* Must be a kernel-mapped object */
> >                 if (!obj->addr) {
> > -                       drm_gem_object_unreference_unlocked(&obj->obj);
> > +                       drm_gem_object_put_unlocked(&obj->obj);
> >                         return -EINVAL;
> >                 }
> >
> >                 if (obj->obj.size < w * h * 4) {
> >                         DRM_ERROR("buffer is too small\n");
> > -                       drm_gem_object_unreference_unlocked(&obj->obj);
> > +                       drm_gem_object_put_unlocked(&obj->obj);
> >                         return -ENOMEM;
> >                 }
> >         }
> > @@ -961,7 +961,7 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
> >         if (dcrtc->cursor_obj) {
> >                 dcrtc->cursor_obj->update = NULL;
> >                 dcrtc->cursor_obj->update_data = NULL;
> > -               drm_gem_object_unreference_unlocked(&dcrtc->cursor_obj->obj);
> > +               drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
> >         }
> >         dcrtc->cursor_obj = obj;
> >         dcrtc->cursor_w = w;
> > @@ -997,7 +997,7 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc)
> >         struct armada_private *priv = crtc->dev->dev_private;
> >
> >         if (dcrtc->cursor_obj)
> > -               drm_gem_object_unreference_unlocked(&dcrtc->cursor_obj->obj);
> > +               drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
> >
> >         priv->dcrtc[dcrtc->num] = NULL;
> >         drm_crtc_cleanup(&dcrtc->crtc);
> > diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c
> > index 92e6b08..51839c1 100644
> > --- a/drivers/gpu/drm/armada/armada_fb.c
> > +++ b/drivers/gpu/drm/armada/armada_fb.c
> > @@ -18,7 +18,7 @@ static void armada_fb_destroy(struct drm_framebuffer *fb)
> >         struct armada_framebuffer *dfb = drm_fb_to_armada_fb(fb);
> >
> >         drm_framebuffer_cleanup(&dfb->fb);
> > -       drm_gem_object_unreference_unlocked(&dfb->obj->obj);
> > +       drm_gem_object_put_unlocked(&dfb->obj->obj);
> >         kfree(dfb);
> >  }
> >
> > @@ -95,7 +95,7 @@ struct armada_framebuffer *armada_framebuffer_create(struct drm_device *dev,
> >          * the above call, but the caller will drop their reference
> >          * to it.  Hence we need to take our own reference.
> >          */
> > -       drm_gem_object_reference(&obj->obj);
> > +       drm_gem_object_get(&obj->obj);
> >
> >         return dfb;
> >  }
> > @@ -144,12 +144,12 @@ static struct drm_framebuffer *armada_fb_create(struct drm_device *dev,
> >                 goto err;
> >         }
> >
> > -       drm_gem_object_unreference_unlocked(&obj->obj);
> > +       drm_gem_object_put_unlocked(&obj->obj);
> >
> >         return &dfb->fb;
> >
> >   err_unref:
> > -       drm_gem_object_unreference_unlocked(&obj->obj);
> > +       drm_gem_object_put_unlocked(&obj->obj);
> >   err:
> >         DRM_ERROR("failed to initialize framebuffer: %d\n", ret);
> >         return ERR_PTR(ret);
> > diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
> > index 29c7d04..cf6bad1 100644
> > --- a/drivers/gpu/drm/armada/armada_fbdev.c
> > +++ b/drivers/gpu/drm/armada/armada_fbdev.c
> > @@ -52,13 +52,13 @@ static int armada_fb_create(struct drm_fb_helper *fbh,
> >
> >         ret = armada_gem_linear_back(dev, obj);
> >         if (ret) {
> > -               drm_gem_object_unreference_unlocked(&obj->obj);
> > +               drm_gem_object_put_unlocked(&obj->obj);
> >                 return ret;
> >         }
> >
> >         ptr = armada_gem_map_object(dev, obj);
> >         if (!ptr) {
> > -               drm_gem_object_unreference_unlocked(&obj->obj);
> > +               drm_gem_object_put_unlocked(&obj->obj);
> >                 return -ENOMEM;
> >         }
> >
> > @@ -68,7 +68,7 @@ static int armada_fb_create(struct drm_fb_helper *fbh,
> >          * A reference is now held by the framebuffer object if
> >          * successful, otherwise this drops the ref for the error path.
> >          */
> > -       drm_gem_object_unreference_unlocked(&obj->obj);
> > +       drm_gem_object_put_unlocked(&obj->obj);
> >
> >         if (IS_ERR(dfb))
> >                 return PTR_ERR(dfb);
> > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> > index a76ca21..49d40aa 100644
> > --- a/drivers/gpu/drm/armada/armada_gem.c
> > +++ b/drivers/gpu/drm/armada/armada_gem.c
> > @@ -266,7 +266,7 @@ int armada_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
> >         /* drop reference from allocate - handle holds it now */
> >         DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
> >   err:
> > -       drm_gem_object_unreference_unlocked(&dobj->obj);
> > +       drm_gem_object_put_unlocked(&dobj->obj);
> >         return ret;
> >  }
> >
> > @@ -295,7 +295,7 @@ int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
> >         }
> >
> >   err_unref:
> > -       drm_gem_object_unreference_unlocked(&obj->obj);
> > +       drm_gem_object_put_unlocked(&obj->obj);
> >
> >         return ret;
> >  }
> > @@ -334,7 +334,7 @@ int armada_gem_create_ioctl(struct drm_device *dev, void *data,
> >         /* drop reference from allocate - handle holds it now */
> >         DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
> >   err:
> > -       drm_gem_object_unreference_unlocked(&dobj->obj);
> > +       drm_gem_object_put_unlocked(&dobj->obj);
> >         return ret;
> >  }
> >
> > @@ -351,13 +351,13 @@ int armada_gem_mmap_ioctl(struct drm_device *dev, void *data,
> >                 return -ENOENT;
> >
> >         if (!dobj->obj.filp) {
> > -               drm_gem_object_unreference_unlocked(&dobj->obj);
> > +               drm_gem_object_put_unlocked(&dobj->obj);
> >                 return -EINVAL;
> >         }
> >
> >         addr = vm_mmap(dobj->obj.filp, 0, args->size, PROT_READ | PROT_WRITE,
> >                        MAP_SHARED, args->offset);
> > -       drm_gem_object_unreference_unlocked(&dobj->obj);
> > +       drm_gem_object_put_unlocked(&dobj->obj);
> >         if (IS_ERR_VALUE(addr))
> >                 return addr;
> >
> > @@ -412,7 +412,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
> >         }
> >
> >   unref:
> > -       drm_gem_object_unreference_unlocked(&dobj->obj);
> > +       drm_gem_object_put_unlocked(&dobj->obj);
> >         return ret;
> >  }
> >
> > @@ -561,7 +561,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
> >                          * Importing our own dmabuf(s) increases the
> >                          * refcount on the gem object itself.
> >                          */
> > -                       drm_gem_object_reference(obj);
> > +                       drm_gem_object_get(obj);
> >                         return obj;
> >                 }
> >         }
> > --
> > 2.7.4
> >

-- 
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux