Commit ac7215c4 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dmc: drop "ucode" from function names 



The ucode part in the init, fini, suspend and resume function names is
just unnecessary. Drop it.

Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230207110619.1821992-1-jani.nikula@intel.com
parent b3377154

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

+3 −3
Original line number Diff line number Diff line
@@ -8639,7 +8639,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) 
	if (!HAS_DISPLAY(i915))

		return 0;



	intel_dmc_ucode_init(i915);

	intel_dmc_init(i915);



	i915->display.wq.modeset = alloc_ordered_workqueue("i915_modeset", 0);

	i915->display.wq.flip = alloc_workqueue("i915_flip", WQ_HIGHPRI |
@@ -8674,7 +8674,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) 
	return 0;



cleanup_vga_client_pw_domain_dmc:

	intel_dmc_ucode_fini(i915);

	intel_dmc_fini(i915);

	intel_power_domains_driver_remove(i915);

	intel_vga_unregister(i915);

cleanup_bios:
@@ -9000,7 +9000,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915) 
/* part #3: call after gem init */

void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)

{

	intel_dmc_ucode_fini(i915);

	intel_dmc_fini(i915);



	intel_power_domains_driver_remove(i915);

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

+10 −10
Original line number Diff line number Diff line
@@ -918,13 +918,13 @@ static void dmc_load_work_fn(struct work_struct *work) 
}



/**

 * intel_dmc_ucode_init() - initialize the firmware loading.

 * intel_dmc_init() - initialize the firmware loading.

 * @dev_priv: i915 drm device.

 *

 * This function is called at the time of loading the display driver to read

 * firmware from a .bin file and copied into a internal memory.

 */

void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)

void intel_dmc_init(struct drm_i915_private *dev_priv)

{

	struct intel_dmc *dmc = &dev_priv->display.dmc;
@@ -1002,14 +1002,14 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv) 
}



/**

 * intel_dmc_ucode_suspend() - prepare DMC firmware before system suspend

 * intel_dmc_suspend() - prepare DMC firmware before system suspend

 * @dev_priv: i915 drm device

 *

 * Prepare the DMC firmware before entering system suspend. This includes

 * flushing pending work items and releasing any resources acquired during

 * init.

 */

void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv)

void intel_dmc_suspend(struct drm_i915_private *dev_priv)

{

	if (!HAS_DMC(dev_priv))

		return;
@@ -1022,13 +1022,13 @@ void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv) 
}



/**

 * intel_dmc_ucode_resume() - init DMC firmware during system resume

 * intel_dmc_resume() - init DMC firmware during system resume

 * @dev_priv: i915 drm device

 *

 * Reinitialize the DMC firmware during system resume, reacquiring any

 * resources released in intel_dmc_ucode_suspend().

 * resources released in intel_dmc_suspend().

 */

void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv)

void intel_dmc_resume(struct drm_i915_private *dev_priv)

{

	if (!HAS_DMC(dev_priv))

		return;
@@ -1042,20 +1042,20 @@ void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv) 
}



/**

 * intel_dmc_ucode_fini() - unload the DMC firmware.

 * intel_dmc_fini() - unload the DMC firmware.

 * @dev_priv: i915 drm device.

 *

 * Firmmware unloading includes freeing the internal memory and reset the

 * firmware loading status.

 */

void intel_dmc_ucode_fini(struct drm_i915_private *dev_priv)

void intel_dmc_fini(struct drm_i915_private *dev_priv)

{

	enum intel_dmc_id dmc_id;



	if (!HAS_DMC(dev_priv))

		return;



	intel_dmc_ucode_suspend(dev_priv);

	intel_dmc_suspend(dev_priv);

	drm_WARN_ON(&dev_priv->drm, dev_priv->display.dmc.wakeref);



	for_each_dmc_id(dmc_id)

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

+4 −4
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ struct intel_dmc { 
	intel_wakeref_t wakeref;

};



void intel_dmc_ucode_init(struct drm_i915_private *i915);

void intel_dmc_init(struct drm_i915_private *i915);

void intel_dmc_load_program(struct drm_i915_private *i915);

void intel_dmc_disable_program(struct drm_i915_private *i915);

void intel_dmc_enable_pipe(struct drm_i915_private *i915, enum pipe pipe);

void intel_dmc_disable_pipe(struct drm_i915_private *i915, enum pipe pipe);

void intel_dmc_ucode_fini(struct drm_i915_private *i915);

void intel_dmc_ucode_suspend(struct drm_i915_private *i915);

void intel_dmc_ucode_resume(struct drm_i915_private *i915);

void intel_dmc_fini(struct drm_i915_private *i915);

void intel_dmc_suspend(struct drm_i915_private *i915);

void intel_dmc_resume(struct drm_i915_private *i915);

bool intel_dmc_has_payload(struct drm_i915_private *i915);

void intel_dmc_debugfs_register(struct drm_i915_private *i915);

void intel_dmc_print_error_state(struct drm_i915_error_state_buf *m,

drivers/gpu/drm/i915/i915_driver.c

+3 −3
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915) 
	intel_suspend_encoders(i915);

	intel_shutdown_encoders(i915);



	intel_dmc_ucode_suspend(i915);

	intel_dmc_suspend(i915);



	i915_gem_suspend(i915);
@@ -1099,7 +1099,7 @@ static int i915_drm_suspend(struct drm_device *dev) 


	dev_priv->suspend_count++;



	intel_dmc_ucode_suspend(dev_priv);

	intel_dmc_suspend(dev_priv);



	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
@@ -1220,7 +1220,7 @@ static int i915_drm_resume(struct drm_device *dev) 
	/* Must be called after GGTT is resumed. */

	intel_dpt_resume(dev_priv);



	intel_dmc_ucode_resume(dev_priv);

	intel_dmc_resume(dev_priv);



	i915_restore_display(dev_priv);

	intel_pps_unlock_regs_wa(dev_priv);