Commit 5a4dd6f0 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move hotplug to display.hotplug 



Move display hotplug related members under drm_i915_private display
sub-struct.

Rename struct i915_hotplug to intel_hotplug while at it.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c1c7562a31c115e9d6a131861e4ca9c97d4f7e09.1661346845.git.jani.nikula@intel.com
parent a30a6fe9

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

+2 −2
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ intel_dp_hotplug(struct intel_encoder *encoder, 
static bool ibx_digital_port_connected(struct intel_encoder *encoder)

{

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

	u32 bit = dev_priv->hotplug.pch_hpd[encoder->hpd_pin];

	u32 bit = dev_priv->display.hotplug.pch_hpd[encoder->hpd_pin];



	return intel_de_read(dev_priv, SDEISR) & bit;

}
@@ -1223,7 +1223,7 @@ static bool gm45_digital_port_connected(struct intel_encoder *encoder) 
static bool ilk_digital_port_connected(struct intel_encoder *encoder)

{

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

	u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin];

	u32 bit = dev_priv->display.hotplug.hpd[encoder->hpd_pin];



	return intel_de_read(dev_priv, DEISR) & bit;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -4038,7 +4038,7 @@ intel_ddi_hotplug(struct intel_encoder *encoder, 
static bool lpt_digital_port_connected(struct intel_encoder *encoder)

{

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

	u32 bit = dev_priv->hotplug.pch_hpd[encoder->hpd_pin];

	u32 bit = dev_priv->display.hotplug.pch_hpd[encoder->hpd_pin];



	return intel_de_read(dev_priv, SDEISR) & bit;

}
@@ -4046,7 +4046,7 @@ static bool lpt_digital_port_connected(struct intel_encoder *encoder) 
static bool hsw_digital_port_connected(struct intel_encoder *encoder)

{

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

	u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin];

	u32 bit = dev_priv->display.hotplug.hpd[encoder->hpd_pin];



	return intel_de_read(dev_priv, DEISR) & bit;

}
@@ -4054,7 +4054,7 @@ static bool hsw_digital_port_connected(struct intel_encoder *encoder) 
static bool bdw_digital_port_connected(struct intel_encoder *encoder)

{

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

	u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin];

	u32 bit = dev_priv->display.hotplug.hpd[encoder->hpd_pin];



	return intel_de_read(dev_priv, GEN8_DE_PORT_ISR) & bit;

}

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

+40 −0
Original line number Diff line number Diff line
@@ -102,6 +102,45 @@ struct intel_dpll { 
	} ref_clks;

};



struct intel_hotplug {

	struct delayed_work hotplug_work;



	const u32 *hpd, *pch_hpd;



	struct {

		unsigned long last_jiffies;

		int count;

		enum {

			HPD_ENABLED = 0,

			HPD_DISABLED = 1,

			HPD_MARK_DISABLED = 2

		} state;

	} stats[HPD_NUM_PINS];

	u32 event_bits;

	u32 retry_bits;

	struct delayed_work reenable_work;



	u32 long_port_mask;

	u32 short_port_mask;

	struct work_struct dig_port_work;



	struct work_struct poll_init_work;

	bool poll_enabled;



	unsigned int hpd_storm_threshold;

	/* Whether or not to count short HPD IRQs in HPD storms */

	u8 hpd_short_storm_enabled;



	/*

	 * if we get a HPD irq from DP and a HPD irq from non-DP

	 * the non-DP HPD could block the workqueue on a mode config

	 * mutex getting, that userspace may have taken. However

	 * userspace is waiting on the DP workqueue to run which is

	 * blocked behind the non-DP one.

	 */

	struct workqueue_struct *dp_wq;

};



struct intel_wm {

	/*

	 * Raw watermark latency values:
@@ -202,6 +241,7 @@ struct intel_display { 
	struct intel_audio audio;

	struct intel_dmc dmc;

	struct intel_dpll dpll;

	struct intel_hotplug hotplug;

	struct intel_wm wm;

};

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

+8 −8
Original line number Diff line number Diff line
@@ -1618,14 +1618,14 @@ static const struct file_operations i915_cur_wm_latency_fops = { 
static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data)

{

	struct drm_i915_private *dev_priv = m->private;

	struct i915_hotplug *hotplug = &dev_priv->hotplug;

	struct intel_hotplug *hotplug = &dev_priv->display.hotplug;



	/* Synchronize with everything first in case there's been an HPD

	 * storm, but we haven't finished handling it in the kernel yet

	 */

	intel_synchronize_irq(dev_priv);

	flush_work(&dev_priv->hotplug.dig_port_work);

	flush_delayed_work(&dev_priv->hotplug.hotplug_work);

	flush_work(&dev_priv->display.hotplug.dig_port_work);

	flush_delayed_work(&dev_priv->display.hotplug.hotplug_work);



	seq_printf(m, "Threshold: %d\n", hotplug->hpd_storm_threshold);

	seq_printf(m, "Detected: %s\n",
@@ -1640,7 +1640,7 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file, 
{

	struct seq_file *m = file->private_data;

	struct drm_i915_private *dev_priv = m->private;

	struct i915_hotplug *hotplug = &dev_priv->hotplug;

	struct intel_hotplug *hotplug = &dev_priv->display.hotplug;

	unsigned int new_threshold;

	int i;

	char *newline;
@@ -1679,7 +1679,7 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file, 
	spin_unlock_irq(&dev_priv->irq_lock);



	/* Re-enable hpd immediately if we were in an irq storm */

	flush_delayed_work(&dev_priv->hotplug.reenable_work);

	flush_delayed_work(&dev_priv->display.hotplug.reenable_work);



	return len;

}
@@ -1703,7 +1703,7 @@ static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data) 
	struct drm_i915_private *dev_priv = m->private;



	seq_printf(m, "Enabled: %s\n",

		   str_yes_no(dev_priv->hotplug.hpd_short_storm_enabled));

		   str_yes_no(dev_priv->display.hotplug.hpd_short_storm_enabled));



	return 0;

}
@@ -1721,7 +1721,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file, 
{

	struct seq_file *m = file->private_data;

	struct drm_i915_private *dev_priv = m->private;

	struct i915_hotplug *hotplug = &dev_priv->hotplug;

	struct intel_hotplug *hotplug = &dev_priv->display.hotplug;

	char *newline;

	char tmp[16];

	int i;
@@ -1757,7 +1757,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file, 
	spin_unlock_irq(&dev_priv->irq_lock);



	/* Re-enable hpd immediately if we were in an irq storm */

	flush_delayed_work(&dev_priv->hotplug.reenable_work);

	flush_delayed_work(&dev_priv->display.hotplug.reenable_work);



	return len;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -5033,9 +5033,9 @@ static void intel_dp_oob_hotplug_event(struct drm_connector *connector) 
	struct drm_i915_private *i915 = to_i915(connector->dev);



	spin_lock_irq(&i915->irq_lock);

	i915->hotplug.event_bits |= BIT(encoder->hpd_pin);

	i915->display.hotplug.event_bits |= BIT(encoder->hpd_pin);

	spin_unlock_irq(&i915->irq_lock);

	queue_delayed_work(system_wq, &i915->hotplug.hotplug_work, 0);

	queue_delayed_work(system_wq, &i915->display.hotplug.hotplug_work, 0);

}



static const struct drm_connector_funcs intel_dp_connector_funcs = {