Commit 8d68a0ac authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/sprite: move sprite_name() to intel_sprite.c 



Move sprite_name() where its only user is, and convert it to a function,
removing the implicit dev_priv usage.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231011202259.1090131-1-jani.nikula@intel.com
parent b662c196

drivers/gpu/drm/i915/display/intel_display.h

+0 −1
Original line number Diff line number Diff line
@@ -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)++) \

drivers/gpu/drm/i915/display/intel_sprite.c

+6 −1
Original line number Diff line number Diff line
@@ -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)