Commit a2b1d9ec authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Clean up some namespacing 



Rename a few functions from intel_crtc_foo_init() to
intel_foo_crtc_init() so that the namespaec clearly
indicates what feature/file we're talking about.

I left out intel_crtc_crc_init() because the whole crc
stuff uses intel_crtc_ as its namespace currently.

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


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent cf867d6a

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

+1 −1
Original line number Diff line number Diff line
@@ -2209,7 +2209,7 @@ static const struct intel_color_funcs ilk_color_funcs = { 
	.read_luts = ilk_read_luts,

};



void intel_crtc_color_init(struct intel_crtc *crtc)

void intel_color_crtc_init(struct intel_crtc *crtc)

{

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);

	bool has_ctm = INTEL_INFO(dev_priv)->display.color.degamma_lut_size != 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct drm_i915_private; 
struct drm_property_blob;



void intel_color_init_hooks(struct drm_i915_private *i915);

void intel_crtc_color_init(struct intel_crtc *crtc);

void intel_color_crtc_init(struct intel_crtc *crtc);

int intel_color_check(struct intel_crtc_state *crtc_state);

void intel_color_commit_noarm(const struct intel_crtc_state *crtc_state);

void intel_color_commit_arm(const struct intel_crtc_state *crtc_state);

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

+2 −2
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) 
						BIT(DRM_SCALING_FILTER_DEFAULT) |

						BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));



	intel_crtc_color_init(crtc);

	intel_crtc_drrs_init(crtc);

	intel_color_crtc_init(crtc);

	intel_drrs_crtc_init(crtc);

	intel_crtc_crc_init(crtc);



	cpu_latency_qos_add_request(&crtc->vblank_pm_qos, PM_QOS_DEFAULT_VALUE);

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

+2 −2
Original line number Diff line number Diff line
@@ -284,14 +284,14 @@ void intel_drrs_flush(struct drm_i915_private *dev_priv, 
}



/**

 * intel_crtc_drrs_init - Init DRRS for CRTC

 * intel_drrs_crtc_init - Init DRRS for CRTC

 * @crtc: crtc

 *

 * This function is called only once at driver load to initialize basic

 * DRRS stuff.

 *

 */

void intel_crtc_drrs_init(struct intel_crtc *crtc)

void intel_drrs_crtc_init(struct intel_crtc *crtc)

{

	INIT_DELAYED_WORK(&crtc->drrs.work, intel_drrs_downclock_work);

	mutex_init(&crtc->drrs.mutex);

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void intel_drrs_invalidate(struct drm_i915_private *dev_priv, 
			   unsigned int frontbuffer_bits);

void intel_drrs_flush(struct drm_i915_private *dev_priv,

		      unsigned int frontbuffer_bits);

void intel_crtc_drrs_init(struct intel_crtc *crtc);

void intel_drrs_crtc_init(struct intel_crtc *crtc);

void intel_drrs_crtc_debugfs_add(struct intel_crtc *crtc);

void intel_drrs_connector_debugfs_add(struct intel_connector *connector);