All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v4 0/5] HPD support during suspend for BXT/APL.
@ 2017-06-12 15:24 Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 1/5] drm/i915/bxt: Corrected the guid for bxt Animesh Manna
                   ` (6 more replies)
  0 siblings, 7 replies; 9+ messages in thread
From: Animesh Manna @ 2017-06-12 15:24 UTC (permalink / raw)
  To: intel-gfx

Along with below patches sharing some background details/design.
- On BXT, Display cannot generate an interrupt when in D3.
- Without display in D3, S0ix can be achieved, Power impact will be zero if d3 is blocked. PMCSR for Graphics/Display is irrelevant, as the power management for them is taken care by the PUNIT using RC6/DC9 hints and *not* through PMCSR write trigger.

So solution is based on below principles:
- Display should not be put into D3 for HPD to work.
- With D0+DC9 we can achieve S0ix and at the same time helps to get the interrupt.
- Using pci_save_state() during suspend to take control from OSPM and blocking D3, while resuming, giving back to OSPM by pci_restore_state(). 
- _DSM method is used to program pmc hpd control register to enable hpd during suspend.

Please have a look and send your comments/suggestions.

v1: Initial version sent as RFC.

v2: Updated version after addressing review comments from Imre,David.

v3: Updated version after addressing review commnets from Imre, Ville,
    Chris.

v4: New version updated after bios changes on APL platform.

Animesh Manna (5):
  drm/i915/bxt: Corrected the guid for bxt.
  drm/i915/bxt: VBT changes for hpd as wakeup feature
  drm/i915/bxt: Added _DSM call to set HPD_CTL.
  drm/i915/bxt: Block D3 during suspend.
  drm/i915: Enable HPD interrupts with master ctl interrupt

 drivers/gpu/drm/i915/i915_drv.c         |  5 +++
 drivers/gpu/drm/i915/i915_drv.h         |  3 ++
 drivers/gpu/drm/i915/i915_irq.c         | 69 +++++++++++++++++++++++++++++++--
 drivers/gpu/drm/i915/i915_reg.h         |  8 ++++
 drivers/gpu/drm/i915/intel_acpi.c       | 59 ++++++++++++++++++++++++----
 drivers/gpu/drm/i915/intel_bios.c       |  4 ++
 drivers/gpu/drm/i915/intel_runtime_pm.c |  3 +-
 drivers/gpu/drm/i915/intel_vbt_defs.h   |  3 +-
 8 files changed, 141 insertions(+), 13 deletions(-)

-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH v4 1/5] drm/i915/bxt: Corrected the guid for bxt.
  2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
@ 2017-06-12 15:24 ` Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 2/5] drm/i915/bxt: VBT changes for hpd as wakeup feature Animesh Manna
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Animesh Manna @ 2017-06-12 15:24 UTC (permalink / raw)
  To: intel-gfx; +Cc: Bharath K Veera, Ananth Krishna R

Guid is changed for bxt platform, so corrected the guid for bxt.

v1: Initial version as RFC.

v2: Based on review comment from Jani and David,
have kept guid as binary format.

v3: Based on review comment from Chris and Jani,
    - kept the const for guid.
    - corrected the file permission.

Signed-off-by: Ananth Krishna R <ananth.krishna.r@intel.com>
Signed-off-by: Bharath K Veera <bharath.k.veera@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
 drivers/gpu/drm/i915/intel_acpi.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
index eb638a1..5c49cef 100644
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
@@ -23,6 +23,14 @@
 	0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c
 };
 
+static const u8 intel_dsm_guid_bxt[] = {
+	0xc6, 0x41, 0x5b, 0x3e,
+	0x1d, 0xeb,
+	0x60, 0x42,
+	0x9d, 0x15,
+	0xc7, 0x1f, 0xba, 0xda, 0xe4, 0x14
+};
+
 static char *intel_dsm_port_name(u8 id)
 {
 	switch (id) {
@@ -113,20 +121,30 @@ static void intel_dsm_platform_mux_info(void)
 static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 {
 	acpi_handle dhandle;
+	struct drm_device *dev = pci_get_drvdata(pdev);
+	struct drm_i915_private *dev_priv = to_i915(dev);
 
 	dhandle = ACPI_HANDLE(&pdev->dev);
 	if (!dhandle)
 		return false;
 
-	if (!acpi_check_dsm(dhandle, intel_dsm_guid, INTEL_DSM_REVISION_ID,
-			    1 << INTEL_DSM_FN_PLATFORM_MUX_INFO)) {
-		DRM_DEBUG_KMS("no _DSM method for intel device\n");
-		return false;
-	}
-
 	intel_dsm_priv.dhandle = dhandle;
-	intel_dsm_platform_mux_info();
 
+	if (IS_BROXTON(dev_priv)) {
+		union acpi_object *obj;
+
+		obj = acpi_evaluate_dsm(dhandle, intel_dsm_guid_bxt,
+					INTEL_DSM_REVISION_ID, 0, NULL);
+		if (!obj)
+			return false;
+	} else {
+		if (acpi_check_dsm(dhandle, intel_dsm_guid,
+				    INTEL_DSM_REVISION_ID,
+				    1 << INTEL_DSM_FN_PLATFORM_MUX_INFO))
+			intel_dsm_platform_mux_info();
+		else
+			return false;
+	}
 	return true;
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v4 2/5] drm/i915/bxt: VBT changes for hpd as wakeup feature
  2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 1/5] drm/i915/bxt: Corrected the guid for bxt Animesh Manna
@ 2017-06-12 15:24 ` Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 3/5] drm/i915/bxt: Added _DSM call to set HPD_CTL Animesh Manna
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Animesh Manna @ 2017-06-12 15:24 UTC (permalink / raw)
  To: intel-gfx

To support hpd during sleep a new feature flag is
added in vbt and also in dev_priv for enabling/disabling
inside driver. By default this feature will be
disabled and based on oem request this feature can
be enabled by changing vbt feature flag.

v1: Initial version as RFC.

v2: Based on review comments from Jani,
- Used bool instead of enum for hpd feature flag.
- Updating feature flag at the first place based on vbt
entry.

v3: Based on review comment from Jani,
    - removed the if condition check, directly update driver flag
    with vbt feature flag.

Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: A.Sunil Kamath <sunil.kamath@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h       | 3 +++
 drivers/gpu/drm/i915/intel_bios.c     | 4 ++++
 drivers/gpu/drm/i915/intel_vbt_defs.h | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 81dd9e9..96b989b 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1672,6 +1672,9 @@ struct intel_vbt_data {
 		const u8 *sequence[MIPI_SEQ_MAX];
 	} dsi;
 
+	/* HPD as wakesoure for DC9 BXT */
+	bool hpd_wakeup_enabled;
+
 	int crt_ddc_pin;
 
 	int child_dev_num;
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 639d45c..4f724ce 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -561,6 +561,10 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
 	if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP)
 		dev_priv->vbt.edp.support = 1;
 
+	dev_priv->vbt.hpd_wakeup_enabled = driver->hpd_wakeup_source;
+	DRM_DEBUG_KMS("HPD as wakeup source:%s\n",
+		      yesno(driver->hpd_wakeup_source));
+
 	DRM_DEBUG_KMS("DRRS State Enabled:%d\n", driver->drrs_enabled);
 	/*
 	 * If DRRS is not supported, drrs_type has to be set to 0.
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index a92e776..608e7dd 100644
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -563,7 +563,8 @@ struct bdb_driver_features {
 	u16 tbt_enabled:1;
 	u16 psr_enabled:1;
 	u16 ips_enabled:1;
-	u16 reserved3:4;
+	u16 reserved3:3;
+	u16 hpd_wakeup_source:1;
 	u16 pc_feature_valid:1;
 } __packed;
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v4 3/5] drm/i915/bxt: Added _DSM call to set HPD_CTL.
  2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 1/5] drm/i915/bxt: Corrected the guid for bxt Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 2/5] drm/i915/bxt: VBT changes for hpd as wakeup feature Animesh Manna
@ 2017-06-12 15:24 ` Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 4/5] drm/i915/bxt: Block D3 during suspend Animesh Manna
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Animesh Manna @ 2017-06-12 15:24 UTC (permalink / raw)
  To: intel-gfx

_DSM is added to program HPD_CTL(0x1094) register
of PMC from i915 driver which will be called
based on driver feature flag.

During S0ix display engine is completely powered down. Hot plug will be
missed by display HPD detection logic. GPIO unit detect any edge on HPD
pin and then triggers PMC->Punit to power up and restore display.
By programming PMC hpd control register we are enabling the manual
trigger from Punit which will be done by writing the PM interrupt register.

Note: Display engine continue to get HPD interrupt even after DC9 but
the system is in S0 state (VNN will be on).

v1: Initial version as RFC.

v2: Modified the commit message.

Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
 drivers/gpu/drm/i915/intel_acpi.c | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
index 5c49cef..e7d15720 100644
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
@@ -10,6 +10,8 @@
 
 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */
 #define INTEL_DSM_FN_PLATFORM_MUX_INFO 1 /* No args */
+#define INTEL_DSM_SET_HPD_WAKEUP 17
+#define HPD_WAKEUP_EN_VAL 0xFCF0
 
 static struct intel_dsm_priv {
 	acpi_handle dhandle;
@@ -118,6 +120,30 @@ static void intel_dsm_platform_mux_info(void)
 	ACPI_FREE(pkg);
 }
 
+static void intel_dsm_set_hpd_wakeup(const u8 *guid)
+{
+	union acpi_object *obj;
+	union acpi_object argv = {
+		.integer.type = ACPI_TYPE_INTEGER,
+		.integer.value = HPD_WAKEUP_EN_VAL,
+	};
+	union acpi_object argv4;
+
+	argv4.type = ACPI_TYPE_PACKAGE;
+	argv4.package.count = 1;
+	argv4.package.elements = &argv;
+
+	obj = acpi_evaluate_dsm(intel_dsm_priv.dhandle, guid,
+			INTEL_DSM_REVISION_ID, INTEL_DSM_SET_HPD_WAKEUP,
+			&argv4);
+
+	if (!obj)
+		DRM_DEBUG_DRIVER("failed to evaluate _DSM\n");
+
+	ACPI_FREE(obj);
+}
+
+
 static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 {
 	acpi_handle dhandle;
@@ -131,11 +157,12 @@ static bool intel_dsm_pci_probe(struct pci_dev *pdev)
 	intel_dsm_priv.dhandle = dhandle;
 
 	if (IS_BROXTON(dev_priv)) {
-		union acpi_object *obj;
-
-		obj = acpi_evaluate_dsm(dhandle, intel_dsm_guid_bxt,
-					INTEL_DSM_REVISION_ID, 0, NULL);
-		if (!obj)
+		if (dev_priv->vbt.hpd_wakeup_enabled &&
+		    acpi_check_dsm(dhandle, intel_dsm_guid_bxt,
+				   INTEL_DSM_REVISION_ID,
+				   1 << INTEL_DSM_SET_HPD_WAKEUP))
+			intel_dsm_set_hpd_wakeup(intel_dsm_guid_bxt);
+		else
 			return false;
 	} else {
 		if (acpi_check_dsm(dhandle, intel_dsm_guid,
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v4 4/5] drm/i915/bxt: Block D3 during suspend.
  2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
                   ` (2 preceding siblings ...)
  2017-06-12 15:24 ` [PATCH v4 3/5] drm/i915/bxt: Added _DSM call to set HPD_CTL Animesh Manna
@ 2017-06-12 15:24 ` Animesh Manna
  2017-06-12 15:24 ` [PATCH v4 5/5] drm/i915: Enable HPD interrupts with master ctl interrupt Animesh Manna
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Animesh Manna @ 2017-06-12 15:24 UTC (permalink / raw)
  To: intel-gfx

For BXT, display engine can not generate interrupt when in D3.
On the othen hand S0ix can be achieved without display in D3. So,
Display should not put into D3 for HPD to work and will not
have any power impact.

v1: Initial version as RFC.

v2: Based on review comment from David,
condition check for hpd_wakeup_enabled is removed before
calling pci_restore_state.

Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7a925c5..0c55ce53 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2448,6 +2448,9 @@ static int intel_runtime_suspend(struct device *kdev)
 	if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
 		intel_hpd_poll_init(dev_priv);
 
+	if (dev_priv->vbt.hpd_wakeup_enabled)
+		pci_save_state(pdev);
+
 	DRM_DEBUG_KMS("Device suspended\n");
 	return 0;
 }
@@ -2464,6 +2467,8 @@ static int intel_runtime_resume(struct device *kdev)
 
 	DRM_DEBUG_KMS("Resuming device\n");
 
+	pci_restore_state(pdev);
+
 	WARN_ON_ONCE(atomic_read(&dev_priv->pm.wakeref_count));
 	disable_rpm_wakeref_asserts(dev_priv);
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [PATCH v4 5/5] drm/i915: Enable HPD interrupts with master ctl interrupt
  2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
                   ` (3 preceding siblings ...)
  2017-06-12 15:24 ` [PATCH v4 4/5] drm/i915/bxt: Block D3 during suspend Animesh Manna
@ 2017-06-12 15:24 ` Animesh Manna
  2017-06-12 15:45 ` ✗ Fi.CI.BAT: failure for HPD support during suspend for BXT/APL. (rev3) Patchwork
  2017-06-27 12:01 ` [PATCH v4 0/5] HPD support during suspend for BXT/APL David Weinehall
  6 siblings, 0 replies; 9+ messages in thread
From: Animesh Manna @ 2017-06-12 15:24 UTC (permalink / raw)
  To: intel-gfx

While suspending the device hpd related interrupts are enabled
to get the interrupt when device is in suspend state.

Though display is in DC9 but system can be in S0 or S0i3 state.
Hot plug during S0 state will generate de_port_interrupt but if
system is in S0i3 state then display driver will get hotplug
interrupt as pcu_hpd_interrupt which will come via pmc. So
added the interrupt handling for pcu hpd interrupt.

v1: Initial version as RFC.

v2: Based on review comments from Imre, Ville,
    - separate hpd_bxt_pcu structure added.
    - pcu_irq_ack/pcu_irq_handler pair added to handle pcu interrupt.
    - sequence for enabling pcu interrupt is modified.
    - Removed the definition of pcu interrupt mask bit as it is matching
    with enable bit.

Cc: Imre Deak <imre.deak@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: A.Sunil Kamath <sunil.kamath@intel.com>
---
 drivers/gpu/drm/i915/i915_irq.c         | 69 +++++++++++++++++++++++++++++++--
 drivers/gpu/drm/i915/i915_reg.h         |  8 ++++
 drivers/gpu/drm/i915/intel_runtime_pm.c |  3 +-
 3 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4cd9ee1..1981234 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -115,6 +115,12 @@
 	[HPD_PORT_C] = BXT_DE_PORT_HP_DDIC
 };
 
+static const u32 hpd_bxt_pcu[HPD_NUM_PINS] = {
+	[HPD_PORT_A] = BXT_PCU_DC9_HP_DDIA,
+	[HPD_PORT_B] = BXT_PCU_DC9_HP_DDIB,
+	[HPD_PORT_C] = BXT_PCU_DC9_HP_DDIC
+};
+
 /* IIR can theoretically queue up two events. Be paranoid. */
 #define GEN8_IRQ_RESET_NDX(type, which) do { \
 	I915_WRITE(GEN8_##type##_IMR(which), 0xffffffff); \
@@ -2565,12 +2571,48 @@ static void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv,
 	return ret;
 }
 
+static irqreturn_t
+gen8_pcu_irq_ack(struct drm_i915_private *dev_priv,
+		 u32 master_ctl, u32 *pcu_iir)
+{
+	irqreturn_t ret = IRQ_NONE;
+
+	if (master_ctl & GEN8_PCU_IRQ) {
+		*pcu_iir = I915_READ(GEN8_PCU_IIR);
+
+		if (*pcu_iir) {
+			I915_WRITE(GEN8_PCU_IIR, *pcu_iir);
+			ret = IRQ_HANDLED;
+		} else {
+			DRM_ERROR("The master control interrupt lied (PCU)!\n");
+		}
+	}
+
+	return ret;
+}
+
+static void
+gen8_pcu_irq_handler(struct drm_i915_private *dev_priv, u32 pcu_iir)
+{
+	bool found = false;
+
+	if (IS_BROXTON(dev_priv) && (pcu_iir & BXT_PCU_DC9_HOTPLUG_MASK)) {
+		u32 tmp_mask = pcu_iir & BXT_PCU_DC9_HOTPLUG_MASK;
+
+		bxt_hpd_irq_handler(dev_priv, tmp_mask,	hpd_bxt_pcu);
+		found = true;
+	}
+	if ((!found) && pcu_iir)
+		DRM_ERROR("Unexpected PCU interrupt\n");
+}
+
 static irqreturn_t gen8_irq_handler(int irq, void *arg)
 {
 	struct drm_device *dev = arg;
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	u32 master_ctl;
 	u32 gt_iir[4] = {};
+	u32 pcu_iir = 0;
 	irqreturn_t ret;
 
 	if (!intel_irqs_enabled(dev_priv))
@@ -2588,7 +2630,9 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
 
 	/* Find, clear, then process each source of interrupt */
 	ret = gen8_gt_irq_ack(dev_priv, master_ctl, gt_iir);
+	ret |= gen8_pcu_irq_ack(dev_priv, master_ctl, &pcu_iir);
 	gen8_gt_irq_handler(dev_priv, gt_iir);
+	gen8_pcu_irq_handler(dev_priv, pcu_iir);
 	ret |= gen8_de_irq_handler(dev_priv, master_ctl);
 
 	I915_WRITE_FW(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
@@ -2990,9 +3034,11 @@ static void gen8_irq_reset(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	int pipe;
 
-	I915_WRITE(GEN8_MASTER_IRQ, 0);
-	POSTING_READ(GEN8_MASTER_IRQ);
-
+	if (!dev_priv->vbt.hpd_wakeup_enabled) {
+		I915_WRITE(GEN8_MASTER_IRQ, 0);
+		POSTING_READ(GEN8_MASTER_IRQ);
+		GEN5_IRQ_RESET(GEN8_DE_PORT_);
+	}
 	gen8_gt_irq_reset(dev_priv);
 
 	for_each_pipe(dev_priv, pipe)
@@ -3000,7 +3046,6 @@ static void gen8_irq_reset(struct drm_device *dev)
 						   POWER_DOMAIN_PIPE(pipe)))
 			GEN8_IRQ_RESET_NDX(DE_PIPE, pipe);
 
-	GEN5_IRQ_RESET(GEN8_DE_PORT_);
 	GEN5_IRQ_RESET(GEN8_DE_MISC_);
 	GEN5_IRQ_RESET(GEN8_PCU_);
 
@@ -4382,6 +4427,17 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv)
 	dev_priv->pm.irqs_enabled = false;
 }
 
+static void bxt_enable_pcu_interrupt(struct drm_i915_private *dev_priv)
+{
+	u32 de_pcu_hpd_enable_mask, de_pcu_imr, de_pcu_ier;
+
+	de_pcu_hpd_enable_mask = BXT_PCU_DC9_HOTPLUG_MASK;
+
+	de_pcu_imr = (I915_READ(GEN8_PCU_IMR) & ~de_pcu_hpd_enable_mask);
+	de_pcu_ier = (I915_READ(GEN8_PCU_IER) | de_pcu_hpd_enable_mask);
+	GEN5_IRQ_INIT(GEN8_PCU_, de_pcu_imr, de_pcu_ier);
+}
+
 /**
  * intel_runtime_pm_disable_interrupts - runtime interrupt disabling
  * @dev_priv: i915 device instance
@@ -4394,6 +4450,11 @@ void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv)
 	dev_priv->drm.driver->irq_uninstall(&dev_priv->drm);
 	dev_priv->pm.irqs_enabled = false;
 	synchronize_irq(dev_priv->drm.irq);
+
+	if (IS_BROXTON(dev_priv) && dev_priv->vbt.hpd_wakeup_enabled) {
+		bxt_enable_pcu_interrupt(dev_priv);
+		dev_priv->pm.irqs_enabled = true;
+	}
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b6d69e2..f8c347d 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6471,6 +6471,14 @@ enum {
 #define GEN8_PCU_IIR _MMIO(0x444e8)
 #define GEN8_PCU_IER _MMIO(0x444ec)
 
+/* BXT PCU DC9 hotplug control */
+#define BXT_PCU_DC9_HP_DDIA		(1<<31)
+#define BXT_PCU_DC9_HP_DDIB		(1<<30)
+#define BXT_PCU_DC9_HP_DDIC		(1<<29)
+#define BXT_PCU_DC9_HOTPLUG_MASK	(BXT_PCU_DC9_HP_DDIA | \
+					 BXT_PCU_DC9_HP_DDIB | \
+					 BXT_PCU_DC9_HP_DDIC)
+
 #define ILK_DISPLAY_CHICKEN2	_MMIO(0x42004)
 /* Required on all Ironlake and Sandybridge according to the B-Spec. */
 #define  ILK_ELPIN_409_SELECT	(1 << 25)
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 8a6f287..7add767 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -550,7 +550,8 @@ static void assert_can_enable_dc9(struct drm_i915_private *dev_priv)
 	WARN_ONCE(I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC5,
 		  "DC5 still not disabled to enable DC9.\n");
 	WARN_ONCE(I915_READ(HSW_PWR_WELL_DRIVER), "Power well on.\n");
-	WARN_ONCE(intel_irqs_enabled(dev_priv),
+	if (!dev_priv->vbt.hpd_wakeup_enabled)
+		WARN_ONCE(intel_irqs_enabled(dev_priv),
 		  "Interrupts not disabled yet.\n");
 
 	 /*
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* ✗ Fi.CI.BAT: failure for HPD support during suspend for BXT/APL. (rev3)
  2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
                   ` (4 preceding siblings ...)
  2017-06-12 15:24 ` [PATCH v4 5/5] drm/i915: Enable HPD interrupts with master ctl interrupt Animesh Manna
@ 2017-06-12 15:45 ` Patchwork
  2017-06-27 12:01 ` [PATCH v4 0/5] HPD support during suspend for BXT/APL David Weinehall
  6 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-06-12 15:45 UTC (permalink / raw)
  To: Animesh Manna; +Cc: intel-gfx

== Series Details ==

Series: HPD support during suspend for BXT/APL. (rev3)
URL   : https://patchwork.freedesktop.org/series/15833/
State : failure

== Summary ==

Series 15833v3 HPD support during suspend for BXT/APL.
https://patchwork.freedesktop.org/api/1.0/series/15833/revisions/3/mbox/

Test core_auth:
        Subgroup basic-auth:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test core_prop_blob:
        Subgroup basic:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test drv_getparams_basic:
        Subgroup basic-eu-total:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-subslice-total:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test drv_hangman:
        Subgroup error-state-basic:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_basic:
        Subgroup bad-close:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup create-close:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup create-fd-close:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_busy:
        Subgroup basic-busy-default:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-hang-default:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_close_race:
        Subgroup basic-process:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-threads:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_cpu_reloc:
        Subgroup basic:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_cs_tlb:
        Subgroup basic-default:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_ctx_basic:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_ctx_create:
        Subgroup basic:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-files:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_ctx_exec:
        Subgroup basic:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_ctx_param:
        Subgroup basic:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-default:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_ctx_switch:
        Subgroup basic-default:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-default-heavy:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
Test gem_exec_basic:
        Subgroup basic-blt:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-bsd:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-bsd1:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-bsd2:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-default:
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-skl-gvtdvm)
        Subgroup basic-render:
                pass       -> SKIP       (fi-bdw-gvtdvm)
WARNING: Long output truncated

61b6c35664a36f6a4742bdf9533eaffd9127dba9 drm-tip: 2017y-06m-12d-14h-25m-28s UTC integration manifest
4520d50 drm/i915: Enable HPD interrupts with master ctl interrupt
283c3d9 drm/i915/bxt: Block D3 during suspend.
e1c5633 drm/i915/bxt: Added _DSM call to set HPD_CTL.
65acfab drm/i915/bxt: VBT changes for hpd as wakeup feature
142e784 drm/i915/bxt: Corrected the guid for bxt.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4935/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v4 0/5] HPD support during suspend for BXT/APL.
  2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
                   ` (5 preceding siblings ...)
  2017-06-12 15:45 ` ✗ Fi.CI.BAT: failure for HPD support during suspend for BXT/APL. (rev3) Patchwork
@ 2017-06-27 12:01 ` David Weinehall
  2017-06-28  7:29   ` Animesh Manna
  6 siblings, 1 reply; 9+ messages in thread
From: David Weinehall @ 2017-06-27 12:01 UTC (permalink / raw)
  To: Animesh Manna; +Cc: intel-gfx

On Mon, Jun 12, 2017 at 08:54:02PM +0530, Animesh Manna wrote:
> Along with below patches sharing some background details/design.
> - On BXT, Display cannot generate an interrupt when in D3.
> - Without display in D3, S0ix can be achieved, Power impact will be zero if d3 is blocked. PMCSR for Graphics/Display is irrelevant, as the power management for them is taken care by the PUNIT using RC6/DC9 hints and *not* through PMCSR write trigger.

Does this apply to GLK as well?

> 
> So solution is based on below principles:
> - Display should not be put into D3 for HPD to work.
> - With D0+DC9 we can achieve S0ix and at the same time helps to get the interrupt.
> - Using pci_save_state() during suspend to take control from OSPM and blocking D3, while resuming, giving back to OSPM by pci_restore_state(). 
> - _DSM method is used to program pmc hpd control register to enable hpd during suspend.
> 
> Please have a look and send your comments/suggestions.
> 
> v1: Initial version sent as RFC.
> 
> v2: Updated version after addressing review comments from Imre,David.
> 
> v3: Updated version after addressing review commnets from Imre, Ville,
>     Chris.
> 
> v4: New version updated after bios changes on APL platform.
> 
> Animesh Manna (5):
>   drm/i915/bxt: Corrected the guid for bxt.
>   drm/i915/bxt: VBT changes for hpd as wakeup feature
>   drm/i915/bxt: Added _DSM call to set HPD_CTL.
>   drm/i915/bxt: Block D3 during suspend.
>   drm/i915: Enable HPD interrupts with master ctl interrupt
> 
>  drivers/gpu/drm/i915/i915_drv.c         |  5 +++
>  drivers/gpu/drm/i915/i915_drv.h         |  3 ++
>  drivers/gpu/drm/i915/i915_irq.c         | 69 +++++++++++++++++++++++++++++++--
>  drivers/gpu/drm/i915/i915_reg.h         |  8 ++++
>  drivers/gpu/drm/i915/intel_acpi.c       | 59 ++++++++++++++++++++++++----
>  drivers/gpu/drm/i915/intel_bios.c       |  4 ++
>  drivers/gpu/drm/i915/intel_runtime_pm.c |  3 +-
>  drivers/gpu/drm/i915/intel_vbt_defs.h   |  3 +-
>  8 files changed, 141 insertions(+), 13 deletions(-)
> 
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v4 0/5] HPD support during suspend for BXT/APL.
  2017-06-27 12:01 ` [PATCH v4 0/5] HPD support during suspend for BXT/APL David Weinehall
@ 2017-06-28  7:29   ` Animesh Manna
  0 siblings, 0 replies; 9+ messages in thread
From: Animesh Manna @ 2017-06-28  7:29 UTC (permalink / raw)
  To: intel-gfx

Hi,


On 6/27/2017 5:31 PM, David Weinehall wrote:
> On Mon, Jun 12, 2017 at 08:54:02PM +0530, Animesh Manna wrote:
>> Along with below patches sharing some background details/design.
>> - On BXT, Display cannot generate an interrupt when in D3.
>> - Without display in D3, S0ix can be achieved, Power impact will be zero if d3 is blocked. PMCSR for Graphics/Display is irrelevant, as the power management for them is taken care by the PUNIT using RC6/DC9 hints and *not* through PMCSR write trigger.
> Does this apply to GLK as well?
Yes, as per bspec this apply for GLK as well.

Regards,
Animesh
>
>> So solution is based on below principles:
>> - Display should not be put into D3 for HPD to work.
>> - With D0+DC9 we can achieve S0ix and at the same time helps to get the interrupt.
>> - Using pci_save_state() during suspend to take control from OSPM and blocking D3, while resuming, giving back to OSPM by pci_restore_state().
>> - _DSM method is used to program pmc hpd control register to enable hpd during suspend.
>>
>> Please have a look and send your comments/suggestions.
>>
>> v1: Initial version sent as RFC.
>>
>> v2: Updated version after addressing review comments from Imre,David.
>>
>> v3: Updated version after addressing review commnets from Imre, Ville,
>>      Chris.
>>
>> v4: New version updated after bios changes on APL platform.
>>
>> Animesh Manna (5):
>>    drm/i915/bxt: Corrected the guid for bxt.
>>    drm/i915/bxt: VBT changes for hpd as wakeup feature
>>    drm/i915/bxt: Added _DSM call to set HPD_CTL.
>>    drm/i915/bxt: Block D3 during suspend.
>>    drm/i915: Enable HPD interrupts with master ctl interrupt
>>
>>   drivers/gpu/drm/i915/i915_drv.c         |  5 +++
>>   drivers/gpu/drm/i915/i915_drv.h         |  3 ++
>>   drivers/gpu/drm/i915/i915_irq.c         | 69 +++++++++++++++++++++++++++++++--
>>   drivers/gpu/drm/i915/i915_reg.h         |  8 ++++
>>   drivers/gpu/drm/i915/intel_acpi.c       | 59 ++++++++++++++++++++++++----
>>   drivers/gpu/drm/i915/intel_bios.c       |  4 ++
>>   drivers/gpu/drm/i915/intel_runtime_pm.c |  3 +-
>>   drivers/gpu/drm/i915/intel_vbt_defs.h   |  3 +-
>>   8 files changed, 141 insertions(+), 13 deletions(-)
>>
>> -- 
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2017-06-28  7:30 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-12 15:24 [PATCH v4 0/5] HPD support during suspend for BXT/APL Animesh Manna
2017-06-12 15:24 ` [PATCH v4 1/5] drm/i915/bxt: Corrected the guid for bxt Animesh Manna
2017-06-12 15:24 ` [PATCH v4 2/5] drm/i915/bxt: VBT changes for hpd as wakeup feature Animesh Manna
2017-06-12 15:24 ` [PATCH v4 3/5] drm/i915/bxt: Added _DSM call to set HPD_CTL Animesh Manna
2017-06-12 15:24 ` [PATCH v4 4/5] drm/i915/bxt: Block D3 during suspend Animesh Manna
2017-06-12 15:24 ` [PATCH v4 5/5] drm/i915: Enable HPD interrupts with master ctl interrupt Animesh Manna
2017-06-12 15:45 ` ✗ Fi.CI.BAT: failure for HPD support during suspend for BXT/APL. (rev3) Patchwork
2017-06-27 12:01 ` [PATCH v4 0/5] HPD support during suspend for BXT/APL David Weinehall
2017-06-28  7:29   ` Animesh Manna

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.