[PATCH 0/2] drm/armada: Replace {un/reference} with {put, get} functions

[PATCH 0/2] drm/armada: Replace {un/reference} with {put, get} functions

[Thomas Zimmermann]

This patch set replaces functions named {un,reference} by their
{put,get} counterparts. Affected data types are struct drm_framebuffer
and struct drm_device.

With the reference-counting functions being named {put,get}, the DRM
interface is more aligned to Linux kernel nameing standard. The patch
set does not change driver-internal interfaces.

Thomas Zimmermann (2):
  drm/armada: Replace drm_framebuffer_{un/reference} with put,get
    functions
  drm/armada: Replace drm_dev_unref with drm_dev_put

 drivers/gpu/drm/armada/armada_crtc.c    | 8 ++++----
 drivers/gpu/drm/armada/armada_drv.c     | 6 +++---
 drivers/gpu/drm/armada/armada_overlay.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

--
2.14.4

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

[PATCH 1/2] drm/armada: Replace drm_framebuffer_{un/reference} with put, get functions

[Thomas Zimmermann]

This patch unifies the naming of DRM functions for reference counting
of struct drm_framebuffer. The resulting code is more aligned with the
rest of the Linux kernel interfaces.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
---
 drivers/gpu/drm/armada/armada_crtc.c    | 8 ++++----
 drivers/gpu/drm/armada/armada_overlay.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 03eeee11dd5b..38724b554a54 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1220,7 +1220,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
 		 * Take a reference on the new framebuffer - we want to
 		 * hold on to it while the hardware is displaying it.
 		 */
-		drm_framebuffer_reference(fb);
+		drm_framebuffer_get(fb);
 
 		work->old_fb = plane->fb;
 	} else {
@@ -1239,7 +1239,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
 	if (!dplane->state.vsync_update) {
 		work->fn(dcrtc, work);
 		if (work->old_fb)
-			drm_framebuffer_unreference(work->old_fb);
+			drm_framebuffer_put(work->old_fb);
 		return 0;
 	}
 
@@ -1248,7 +1248,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
 	if (ret) {
 		work->fn(dcrtc, work);
 		if (work->old_fb)
-			drm_framebuffer_unreference(work->old_fb);
+			drm_framebuffer_put(work->old_fb);
 	}
 
 	dplane->next_work = !dplane->next_work;
@@ -1308,7 +1308,7 @@ int armada_drm_plane_disable(struct drm_plane *plane,
 	if (armada_drm_plane_work_queue(dcrtc, work)) {
 		work->fn(dcrtc, work);
 		if (work->old_fb)
-			drm_framebuffer_unreference(work->old_fb);
+			drm_framebuffer_put(work->old_fb);
 	}
 
 	dplane->next_work = !dplane->next_work;
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index c391955009d6..bb2874d84d74 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -228,7 +228,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
 		 * Take a reference on the new framebuffer - we want to
 		 * hold on to it while the hardware is displaying it.
 		 */
-		drm_framebuffer_reference(fb);
+		drm_framebuffer_get(fb);
 
 		work->old_fb = plane->fb;
 	} else {
-- 
2.14.4

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

[PATCH 2/2] drm/armada: Replace drm_dev_unref with drm_dev_put

[Thomas Zimmermann]

This patch unifies the naming of DRM functions for reference counting
of struct drm_device. The resulting code is more aligned with the rest
of the Linux kernel interfaces.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
---
 drivers/gpu/drm/armada/armada_drv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 4b11b6b52f1d..d1705d298a39 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -109,7 +109,7 @@ static int armada_drm_bind(struct device *dev)
 
 	/*
 	 * The drm_device structure must be at the start of
-	 * armada_private for drm_dev_unref() to work correctly.
+	 * armada_private for drm_dev_put() to work correctly.
 	 */
 	BUILD_BUG_ON(offsetof(struct armada_private, drm) != 0);
 
@@ -180,7 +180,7 @@ static int armada_drm_bind(struct device *dev)
 	drm_mode_config_cleanup(&priv->drm);
 	drm_mm_takedown(&priv->linear);
 	flush_work(&priv->fb_unref_work);
-	drm_dev_unref(&priv->drm);
+	drm_dev_put(&priv->drm);
 	return ret;
 }
 
@@ -200,7 +200,7 @@ static void armada_drm_unbind(struct device *dev)
 	drm_mm_takedown(&priv->linear);
 	flush_work(&priv->fb_unref_work);
 
-	drm_dev_unref(&priv->drm);
+	drm_dev_put(&priv->drm);
 }
 
 static int compare_of(struct device *dev, void *data)
-- 
2.14.4

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

Re: [PATCH 1/2] drm/armada: Replace drm_framebuffer_{un/reference} with put,get functions

[Russell King - ARM Linux]

This will conflict badly with patches to convert armada-drm to atomic
modeset.  Is there any rush for this change?

On Mon, Jun 18, 2018 at 03:20:59PM +0200, Thomas Zimmermann wrote:
> This patch unifies the naming of DRM functions for reference counting
> of struct drm_framebuffer. The resulting code is more aligned with the
> rest of the Linux kernel interfaces.
> 
> Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
> ---
>  drivers/gpu/drm/armada/armada_crtc.c    | 8 ++++----
>  drivers/gpu/drm/armada/armada_overlay.c | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
> index 03eeee11dd5b..38724b554a54 100644
> --- a/drivers/gpu/drm/armada/armada_crtc.c
> +++ b/drivers/gpu/drm/armada/armada_crtc.c
> @@ -1220,7 +1220,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
>  		 * Take a reference on the new framebuffer - we want to
>  		 * hold on to it while the hardware is displaying it.
>  		 */
> -		drm_framebuffer_reference(fb);
> +		drm_framebuffer_get(fb);
>  
>  		work->old_fb = plane->fb;
>  	} else {
> @@ -1239,7 +1239,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
>  	if (!dplane->state.vsync_update) {
>  		work->fn(dcrtc, work);
>  		if (work->old_fb)
> -			drm_framebuffer_unreference(work->old_fb);
> +			drm_framebuffer_put(work->old_fb);
>  		return 0;
>  	}
>  
> @@ -1248,7 +1248,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
>  	if (ret) {
>  		work->fn(dcrtc, work);
>  		if (work->old_fb)
> -			drm_framebuffer_unreference(work->old_fb);
> +			drm_framebuffer_put(work->old_fb);
>  	}
>  
>  	dplane->next_work = !dplane->next_work;
> @@ -1308,7 +1308,7 @@ int armada_drm_plane_disable(struct drm_plane *plane,
>  	if (armada_drm_plane_work_queue(dcrtc, work)) {
>  		work->fn(dcrtc, work);
>  		if (work->old_fb)
> -			drm_framebuffer_unreference(work->old_fb);
> +			drm_framebuffer_put(work->old_fb);
>  	}
>  
>  	dplane->next_work = !dplane->next_work;
> diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
> index c391955009d6..bb2874d84d74 100644
> --- a/drivers/gpu/drm/armada/armada_overlay.c
> +++ b/drivers/gpu/drm/armada/armada_overlay.c
> @@ -228,7 +228,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
>  		 * Take a reference on the new framebuffer - we want to
>  		 * hold on to it while the hardware is displaying it.
>  		 */
> -		drm_framebuffer_reference(fb);
> +		drm_framebuffer_get(fb);
>  
>  		work->old_fb = plane->fb;
>  	} else {
> -- 
> 2.14.4
> 

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] drm/armada: Replace drm_framebuffer_{un/reference} with put,get functions

[Thomas Zimmermann]

[-- Attachment #1.1.1: Type: text/plain, Size: 3213 bytes --]

Hi

Am 26.06.2018 um 17:01 schrieb Russell King - ARM Linux:
> This will conflict badly with patches to convert armada-drm to atomic
> modeset.  Is there any rush for this change?

Not really. If you point me to the atomic-modeset changes, I'd send you
a port of the patches.


> 
> On Mon, Jun 18, 2018 at 03:20:59PM +0200, Thomas Zimmermann wrote:
>> This patch unifies the naming of DRM functions for reference counting
>> of struct drm_framebuffer. The resulting code is more aligned with the
>> rest of the Linux kernel interfaces.
>>
>> Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
>> ---
>>  drivers/gpu/drm/armada/armada_crtc.c    | 8 ++++----
>>  drivers/gpu/drm/armada/armada_overlay.c | 2 +-
>>  2 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
>> index 03eeee11dd5b..38724b554a54 100644
>> --- a/drivers/gpu/drm/armada/armada_crtc.c
>> +++ b/drivers/gpu/drm/armada/armada_crtc.c
>> @@ -1220,7 +1220,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
>>  		 * Take a reference on the new framebuffer - we want to
>>  		 * hold on to it while the hardware is displaying it.
>>  		 */
>> -		drm_framebuffer_reference(fb);
>> +		drm_framebuffer_get(fb);
>>  
>>  		work->old_fb = plane->fb;
>>  	} else {
>> @@ -1239,7 +1239,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
>>  	if (!dplane->state.vsync_update) {
>>  		work->fn(dcrtc, work);
>>  		if (work->old_fb)
>> -			drm_framebuffer_unreference(work->old_fb);
>> +			drm_framebuffer_put(work->old_fb);
>>  		return 0;
>>  	}
>>  
>> @@ -1248,7 +1248,7 @@ static int armada_drm_primary_update(struct drm_plane *plane,
>>  	if (ret) {
>>  		work->fn(dcrtc, work);
>>  		if (work->old_fb)
>> -			drm_framebuffer_unreference(work->old_fb);
>> +			drm_framebuffer_put(work->old_fb);
>>  	}
>>  
>>  	dplane->next_work = !dplane->next_work;
>> @@ -1308,7 +1308,7 @@ int armada_drm_plane_disable(struct drm_plane *plane,
>>  	if (armada_drm_plane_work_queue(dcrtc, work)) {
>>  		work->fn(dcrtc, work);
>>  		if (work->old_fb)
>> -			drm_framebuffer_unreference(work->old_fb);
>> +			drm_framebuffer_put(work->old_fb);
>>  	}
>>  
>>  	dplane->next_work = !dplane->next_work;
>> diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
>> index c391955009d6..bb2874d84d74 100644
>> --- a/drivers/gpu/drm/armada/armada_overlay.c
>> +++ b/drivers/gpu/drm/armada/armada_overlay.c
>> @@ -228,7 +228,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
>>  		 * Take a reference on the new framebuffer - we want to
>>  		 * hold on to it while the hardware is displaying it.
>>  		 */
>> -		drm_framebuffer_reference(fb);
>> +		drm_framebuffer_get(fb);
>>  
>>  		work->old_fb = plane->fb;
>>  	} else {
>> -- 
>> 2.14.4
>>
> 


-- 
Implement thread-safe and fault-tolerant software in C: visit picotm.org
--
GnuPG:          http://tdz.users.sourceforge.net/tdz.asc
Fingerprint:    16FF F599 82F8 E5AA 18C6 5220 D9DA D7D4 4EF1 DF08
Website:        tzimmermann.org


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

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

Re: [PATCH 2/2] drm/armada: Replace drm_dev_unref with drm_dev_put

[Russell King - ARM Linux]

On Mon, Jun 18, 2018 at 03:21:00PM +0200, Thomas Zimmermann wrote:
> This patch unifies the naming of DRM functions for reference counting
> of struct drm_device. The resulting code is more aligned with the rest
> of the Linux kernel interfaces.

Appled, thanks.

> 
> Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
> ---
>  drivers/gpu/drm/armada/armada_drv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> index 4b11b6b52f1d..d1705d298a39 100644
> --- a/drivers/gpu/drm/armada/armada_drv.c
> +++ b/drivers/gpu/drm/armada/armada_drv.c
> @@ -109,7 +109,7 @@ static int armada_drm_bind(struct device *dev)
>  
>  	/*
>  	 * The drm_device structure must be at the start of
> -	 * armada_private for drm_dev_unref() to work correctly.
> +	 * armada_private for drm_dev_put() to work correctly.
>  	 */
>  	BUILD_BUG_ON(offsetof(struct armada_private, drm) != 0);
>  
> @@ -180,7 +180,7 @@ static int armada_drm_bind(struct device *dev)
>  	drm_mode_config_cleanup(&priv->drm);
>  	drm_mm_takedown(&priv->linear);
>  	flush_work(&priv->fb_unref_work);
> -	drm_dev_unref(&priv->drm);
> +	drm_dev_put(&priv->drm);
>  	return ret;
>  }
>  
> @@ -200,7 +200,7 @@ static void armada_drm_unbind(struct device *dev)
>  	drm_mm_takedown(&priv->linear);
>  	flush_work(&priv->fb_unref_work);
>  
> -	drm_dev_unref(&priv->drm);
> +	drm_dev_put(&priv->drm);
>  }
>  
>  static int compare_of(struct device *dev, void *data)
> -- 
> 2.14.4
> 

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel