Commit 4cd502aa authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hotplug: convert intel_hotplug.[ch] to struct intel_display 



Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of intel_hotplug.[ch] to struct
intel_display.

Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/cf382dbfacf1445b26fbe1e7c011e7a3ea6e1594.1742481923.git.jani.nikula@intel.com
parent 3e1966e2

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

+1 −1
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ void intel_display_debugfs_register(struct intel_display *display) 
	intel_dmc_debugfs_register(display);

	intel_dp_test_debugfs_register(display);

	intel_fbc_debugfs_register(display);

	intel_hpd_debugfs_register(i915);

	intel_hpd_debugfs_register(display);

	intel_opregion_debugfs_register(display);

	intel_psr_debugfs_register(display);

	intel_wm_debugfs_register(i915);

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

+5 −9
Original line number Diff line number Diff line
@@ -315,11 +315,9 @@ static void set_display_access(struct intel_display *display, 
 */

void intel_display_driver_enable_user_access(struct intel_display *display)

{

	struct drm_i915_private *i915 = to_i915(display->drm);



	set_display_access(display, true, NULL);



	intel_hpd_enable_detection_work(i915);

	intel_hpd_enable_detection_work(display);

}



/**
@@ -341,9 +339,7 @@ void intel_display_driver_enable_user_access(struct intel_display *display) 
 */

void intel_display_driver_disable_user_access(struct intel_display *display)

{

	struct drm_i915_private *i915 = to_i915(display->drm);



	intel_hpd_disable_detection_work(i915);

	intel_hpd_disable_detection_work(display);



	set_display_access(display, false, current);

}
@@ -524,7 +520,7 @@ int intel_display_driver_probe(struct intel_display *display) 
	intel_overlay_setup(display);



	/* Only enable hotplug handling once the fbdev is fully set up. */

	intel_hpd_init(i915);

	intel_hpd_init(display);



	skl_watermark_ipc_init(i915);
@@ -558,7 +554,7 @@ void intel_display_driver_register(struct intel_display *display) 
	 * fbdev->async_cookie.

	 */

	drm_kms_helper_poll_init(display->drm);

	intel_hpd_poll_disable(i915);

	intel_hpd_poll_disable(display);



	intel_fbdev_setup(i915);
@@ -600,7 +596,7 @@ void intel_display_driver_remove_noirq(struct intel_display *display) 
	 * Due to the hpd irq storm handling the hotplug work can re-arm the

	 * poll handlers. Hence disable polling after hpd handling is shut down.

	 */

	intel_hpd_poll_fini(i915);

	intel_hpd_poll_fini(display);



	intel_unregister_dsm_handler();

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

+3 −3
Original line number Diff line number Diff line
@@ -1236,8 +1236,8 @@ static void vlv_display_power_well_init(struct intel_display *display) 
	if (display->power.domains.initializing)

		return;



	intel_hpd_init(dev_priv);

	intel_hpd_poll_disable(dev_priv);

	intel_hpd_init(display);

	intel_hpd_poll_disable(display);



	/* Re-enable the ADPA, if we have one */

	for_each_intel_encoder(display->drm, encoder) {
@@ -1265,7 +1265,7 @@ static void vlv_display_power_well_deinit(struct intel_display *display) 


	/* Prevent us from re-enabling polling on accident in late suspend */

	if (!display->drm->dev->power.is_suspended)

		intel_hpd_poll_enable(dev_priv);

		intel_hpd_poll_enable(display);

}



static void vlv_display_power_well_enable(struct intel_display *display,

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

+2 −2
Original line number Diff line number Diff line
@@ -107,14 +107,14 @@ void intel_display_reset_finish(struct intel_display *display, bool test_only) 
		intel_display_driver_init_hw(display);

		intel_clock_gating_init(i915);

		intel_cx0_pll_power_save_wa(display);

		intel_hpd_init(i915);

		intel_hpd_init(display);



		ret = __intel_display_driver_resume(display, state, ctx);

		if (ret)

			drm_err(display->drm,

				"Restoring old state failed with %i\n", ret);



		intel_hpd_poll_disable(i915);

		intel_hpd_poll_disable(display);

	}



	drm_atomic_state_put(state);

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

+1 −1
Original line number Diff line number Diff line
@@ -6117,7 +6117,7 @@ static void intel_dp_oob_hotplug_event(struct drm_connector *connector, 
	spin_unlock_irq(&i915->irq_lock);



	if (need_work)

		intel_hpd_schedule_detection(i915);

		intel_hpd_schedule_detection(display);

}



static const struct drm_connector_funcs intel_dp_connector_funcs = {