Commit 86a1758d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: rename intel_display_driver_* functions 



Follow the usual naming conventions.

v2:
- Also rename references in comments (Gustavo)

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6ff7b76018bf4cf611037d7bf027c975cddfe2af.1681465222.git.jani.nikula@intel.com
parent 40053823

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

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ void intel_display_finish_reset(struct drm_i915_private *i915) 
		 * so need a full re-initialization.

		 */

		intel_pps_unlock_regs_wa(i915);

		intel_modeset_init_hw(i915);

		intel_display_driver_init_hw(i915);

		intel_clock_gating_init(i915);

		intel_hpd_init(i915);

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

+8 −8
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev) 
	return false;

}



void intel_modeset_init_hw(struct drm_i915_private *i915)

void intel_display_driver_init_hw(struct drm_i915_private *i915)

{

	struct intel_cdclk_state *cdclk_state;
@@ -170,7 +170,7 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) 
}



/* part #1: call before irq install */

int intel_modeset_init_noirq(struct drm_i915_private *i915)

int intel_display_driver_probe_noirq(struct drm_i915_private *i915)

{

	int ret;
@@ -246,7 +246,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) 
}



/* part #2: call after irq install, but before gem init */

int intel_modeset_init_nogem(struct drm_i915_private *i915)

int intel_display_driver_probe_nogem(struct drm_i915_private *i915)

{

	struct drm_device *dev = &i915->drm;

	enum pipe pipe;
@@ -281,7 +281,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) 
	intel_fdi_pll_freq_update(i915);



	intel_update_czclk(i915);

	intel_modeset_init_hw(i915);

	intel_display_driver_init_hw(i915);

	intel_dpll_update_ref_clks(i915);



	intel_hdcp_component_init(i915);
@@ -318,7 +318,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) 
}



/* part #3: call after gem init */

int intel_modeset_init(struct drm_i915_private *i915)

int intel_display_driver_probe(struct drm_i915_private *i915)

{

	int ret;
@@ -382,7 +382,7 @@ void intel_display_driver_register(struct drm_i915_private *i915) 
}



/* part #1: call before irq uninstall */

void intel_modeset_driver_remove(struct drm_i915_private *i915)

void intel_display_driver_remove(struct drm_i915_private *i915)

{

	if (!HAS_DISPLAY(i915))

		return;
@@ -402,7 +402,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915) 
}



/* part #2: call after irq uninstall */

void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)

void intel_display_driver_remove_noirq(struct drm_i915_private *i915)

{

	if (!HAS_DISPLAY(i915))

		return;
@@ -436,7 +436,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)

void intel_display_driver_remove_nogem(struct drm_i915_private *i915)

{

	intel_dmc_fini(i915);

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

+7 −7
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ struct drm_i915_private; 
struct pci_dev;



bool intel_display_driver_probe_defer(struct pci_dev *pdev);

void intel_modeset_init_hw(struct drm_i915_private *i915);

int intel_modeset_init_noirq(struct drm_i915_private *i915);

int intel_modeset_init_nogem(struct drm_i915_private *i915);

int intel_modeset_init(struct drm_i915_private *i915);

void intel_display_driver_init_hw(struct drm_i915_private *i915);

int intel_display_driver_probe_noirq(struct drm_i915_private *i915);

int intel_display_driver_probe_nogem(struct drm_i915_private *i915);

int intel_display_driver_probe(struct drm_i915_private *i915);

void intel_display_driver_register(struct drm_i915_private *i915);

void intel_modeset_driver_remove(struct drm_i915_private *i915);

void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915);

void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915);

void intel_display_driver_remove(struct drm_i915_private *i915);

void intel_display_driver_remove_noirq(struct drm_i915_private *i915);

void intel_display_driver_remove_nogem(struct drm_i915_private *i915);

void intel_display_driver_unregister(struct drm_i915_private *i915);



#endif /* __INTEL_DISPLAY_DRIVER_H__ */

drivers/gpu/drm/i915/i915_driver.c

+13 −12
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) 
 * @ent: matching PCI ID entry

 *

 * The driver probe routine has to do several things:

 *   - drive output discovery via intel_modeset_init()

 *   - drive output discovery via intel_display_driver_probe()

 *   - initialize the memory manager

 *   - allocate initial config memory

 *   - setup the DRM framebuffer with the allocated memory
@@ -781,7 +781,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (ret < 0)

		goto out_cleanup_mmio;



	ret = intel_modeset_init_noirq(i915);

	ret = intel_display_driver_probe_noirq(i915);

	if (ret < 0)

		goto out_cleanup_hw;
@@ -789,7 +789,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (ret)

		goto out_cleanup_modeset;



	ret = intel_modeset_init_nogem(i915);

	ret = intel_display_driver_probe_nogem(i915);

	if (ret)

		goto out_cleanup_irq;
@@ -799,7 +799,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	intel_pxp_init(i915);



	ret = intel_modeset_init(i915);

	ret = intel_display_driver_probe(i915);

	if (ret)

		goto out_cleanup_gem;
@@ -819,14 +819,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	i915_gem_driver_release(i915);

out_cleanup_modeset2:

	/* FIXME clean up the error path */

	intel_modeset_driver_remove(i915);

	intel_display_driver_remove(i915);

	intel_irq_uninstall(i915);

	intel_modeset_driver_remove_noirq(i915);

	intel_display_driver_remove_noirq(i915);

	goto out_cleanup_modeset;

out_cleanup_irq:

	intel_irq_uninstall(i915);

out_cleanup_modeset:

	intel_modeset_driver_remove_nogem(i915);

	intel_display_driver_remove_nogem(i915);

out_cleanup_hw:

	i915_driver_hw_remove(i915);

	intel_memory_regions_driver_release(i915);
@@ -862,16 +862,16 @@ void i915_driver_remove(struct drm_i915_private *i915) 


	intel_gvt_driver_remove(i915);



	intel_modeset_driver_remove(i915);

	intel_display_driver_remove(i915);



	intel_irq_uninstall(i915);



	intel_modeset_driver_remove_noirq(i915);

	intel_display_driver_remove_noirq(i915);



	i915_reset_error_state(i915);

	i915_gem_driver_remove(i915);



	intel_modeset_driver_remove_nogem(i915);

	intel_display_driver_remove_nogem(i915);



	i915_driver_hw_remove(i915);
@@ -1224,7 +1224,7 @@ static int i915_drm_resume(struct drm_device *dev) 
	 *

	 * drm_mode_config_reset() needs AUX interrupts.

	 *

	 * Modeset enabling in intel_modeset_init_hw() also needs working

	 * Modeset enabling in intel_display_driver_init_hw() also needs working

	 * interrupts.

	 */

	intel_runtime_pm_enable_interrupts(dev_priv);
@@ -1234,7 +1234,8 @@ static int i915_drm_resume(struct drm_device *dev) 


	i915_gem_resume(dev_priv);



	intel_modeset_init_hw(dev_priv);

	intel_display_driver_init_hw(dev_priv);



	intel_clock_gating_init(dev_priv);

	intel_hpd_init(dev_priv);

drivers/gpu/drm/i915/i915_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -4360,7 +4360,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv) 
	/*

	 * FIXME we can get called twice during driver probe

	 * error handling as well as during driver remove due to

	 * intel_modeset_driver_remove() calling us out of sequence.

	 * intel_display_driver_remove() calling us out of sequence.

	 * Would be nice if it didn't do that...

	 */

	if (!dev_priv->irq_enabled)