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