Re: [Intel-gfx] [PATCH] drm/i915/sprite: move sprite_name() to intel_sprite.c

2023-10-27 Thread Jani Nikula 
On Thu, 12 Oct 2023, Ville Syrjälä  wrote:
> On Wed, Oct 11, 2023 at 11:22:59PM +0300, Jani Nikula wrote:
>> Move sprite_name() where its only user is, and convert it to a function,
>> removing the implicit dev_priv usage.
>> 
>> Signed-off-by: Jani Nikula 
>
> Reviewed-by: Ville Syrjälä 

Thanks, pushed to din.

>
>> ---
>>  drivers/gpu/drm/i915/display/intel_display.h | 1 -
>>  drivers/gpu/drm/i915/display/intel_sprite.c  | 7 ++-
>>  2 files changed, 6 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.h 
>> b/drivers/gpu/drm/i915/display/intel_display.h
>> index 0e5dffe8f018..163469fe67a2 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display.h
>> @@ -105,7 +105,6 @@ enum i9xx_plane_id {
>>  };
>>  
>>  #define plane_name(p) ((p) + 'A')
>> -#define sprite_name(p, s) ((p) * 
>> DISPLAY_RUNTIME_INFO(dev_priv)->num_sprites[(p)] + (s) + 'A')
>>  
>>  #define for_each_plane_id_on_crtc(__crtc, __p) \
>>  for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \
>> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c 
>> b/drivers/gpu/drm/i915/display/intel_sprite.c
>> index 1fb16510f750..d7b440c8caef 100644
>> --- a/drivers/gpu/drm/i915/display/intel_sprite.c
>> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
>> @@ -48,6 +48,11 @@
>>  #include "intel_frontbuffer.h"
>>  #include "intel_sprite.h"
>>  
>> +static char sprite_name(struct drm_i915_private *i915, enum pipe pipe, int 
>> sprite)
>> +{
>> +return pipe * DISPLAY_RUNTIME_INFO(i915)->num_sprites[pipe] + sprite + 
>> 'A';
>> +}
>> +
>>  static void i9xx_plane_linear_gamma(u16 gamma[8])
>>  {
>>  /* The points are not evenly spaced. */
>> @@ -1636,7 +1641,7 @@ intel_sprite_plane_create(struct drm_i915_private 
>> *dev_priv,
>> 0, plane_funcs,
>> formats, num_formats, modifiers,
>> DRM_PLANE_TYPE_OVERLAY,
>> -   "sprite %c", sprite_name(pipe, sprite));
>> +   "sprite %c", sprite_name(dev_priv, pipe, 
>> sprite));
>>  kfree(modifiers);
>>  
>>  if (ret)
>> -- 
>> 2.39.2

-- 
Jani Nikula, Intel

Re: [Intel-gfx] [PATCH] drm/i915/sprite: move sprite_name() to intel_sprite.c

2023-10-12 Thread Ville Syrjälä 
On Wed, Oct 11, 2023 at 11:22:59PM +0300, Jani Nikula wrote:
> Move sprite_name() where its only user is, and convert it to a function,
> removing the implicit dev_priv usage.
> 
> Signed-off-by: Jani Nikula 

Reviewed-by: Ville Syrjälä 

> ---
>  drivers/gpu/drm/i915/display/intel_display.h | 1 -
>  drivers/gpu/drm/i915/display/intel_sprite.c  | 7 ++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h 
> b/drivers/gpu/drm/i915/display/intel_display.h
> index 0e5dffe8f018..163469fe67a2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -105,7 +105,6 @@ enum i9xx_plane_id {
>  };
>  
>  #define plane_name(p) ((p) + 'A')
> -#define sprite_name(p, s) ((p) * 
> DISPLAY_RUNTIME_INFO(dev_priv)->num_sprites[(p)] + (s) + 'A')
>  
>  #define for_each_plane_id_on_crtc(__crtc, __p) \
>   for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \
> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c 
> b/drivers/gpu/drm/i915/display/intel_sprite.c
> index 1fb16510f750..d7b440c8caef 100644
> --- a/drivers/gpu/drm/i915/display/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
> @@ -48,6 +48,11 @@
>  #include "intel_frontbuffer.h"
>  #include "intel_sprite.h"
>  
> +static char sprite_name(struct drm_i915_private *i915, enum pipe pipe, int 
> sprite)
> +{
> + return pipe * DISPLAY_RUNTIME_INFO(i915)->num_sprites[pipe] + sprite + 
> 'A';
> +}
> +
>  static void i9xx_plane_linear_gamma(u16 gamma[8])
>  {
>   /* The points are not evenly spaced. */
> @@ -1636,7 +1641,7 @@ intel_sprite_plane_create(struct drm_i915_private 
> *dev_priv,
>  0, plane_funcs,
>  formats, num_formats, modifiers,
>  DRM_PLANE_TYPE_OVERLAY,
> -"sprite %c", sprite_name(pipe, sprite));
> +"sprite %c", sprite_name(dev_priv, pipe, 
> sprite));
>   kfree(modifiers);
>  
>   if (ret)
> -- 
> 2.39.2

-- 
Ville Syrjälä
Intel

[Intel-gfx] [PATCH] drm/i915/sprite: move sprite_name() to intel_sprite.c

2023-10-11 Thread Jani Nikula 
Move sprite_name() where its only user is, and convert it to a function,
removing the implicit dev_priv usage.

Signed-off-by: Jani Nikula 
---
 drivers/gpu/drm/i915/display/intel_display.h | 1 -
 drivers/gpu/drm/i915/display/intel_sprite.c  | 7 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.h 
b/drivers/gpu/drm/i915/display/intel_display.h
index 0e5dffe8f018..163469fe67a2 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -105,7 +105,6 @@ enum i9xx_plane_id {
 };
 
 #define plane_name(p) ((p) + 'A')
-#define sprite_name(p, s) ((p) * 
DISPLAY_RUNTIME_INFO(dev_priv)->num_sprites[(p)] + (s) + 'A')
 
 #define for_each_plane_id_on_crtc(__crtc, __p) \
for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c 
b/drivers/gpu/drm/i915/display/intel_sprite.c
index 1fb16510f750..d7b440c8caef 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -48,6 +48,11 @@
 #include "intel_frontbuffer.h"
 #include "intel_sprite.h"
 
+static char sprite_name(struct drm_i915_private *i915, enum pipe pipe, int 
sprite)
+{
+   return pipe * DISPLAY_RUNTIME_INFO(i915)->num_sprites[pipe] + sprite + 
'A';
+}
+
 static void i9xx_plane_linear_gamma(u16 gamma[8])
 {
/* The points are not evenly spaced. */
@@ -1636,7 +1641,7 @@ intel_sprite_plane_create(struct drm_i915_private 
*dev_priv,
   0, plane_funcs,
   formats, num_formats, modifiers,
   DRM_PLANE_TYPE_OVERLAY,
-  "sprite %c", sprite_name(pipe, sprite));
+  "sprite %c", sprite_name(dev_priv, pipe, 
sprite));
kfree(modifiers);
 
if (ret)
-- 
2.39.2