Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH] drm/i915: Try to guess PCH type even without ISA bridge
@ 2020-12-14  7:01 Xiong Zhang
  2020-12-14  7:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
                   ` (7 more replies)
  0 siblings, 8 replies; 29+ messages in thread
From: Xiong Zhang @ 2020-12-14  7:01 UTC (permalink / raw)
  To: intel-gfx; +Cc: jani.nikula, chris

From: Zhenyu Wang <zhenyuw@linux.intel.com>

Some vmm like hyperv and crosvm doesn't supply any ISA bridge to its guest,
when igd passthrough is equipped on these vmm, guest i915 display may
couldn't work as i915 detects pch type as PCH_NONE.

When i915 runs as guest, this patch guess pch type through gpu type even
without ISA bridge.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h  |  7 +++++-
 drivers/gpu/drm/i915/intel_pch.c | 37 +++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 15be8debae54..1e7b1d33708a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1756,6 +1756,11 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
 #define INTEL_DISPLAY_ENABLED(dev_priv) \
 	(drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)), !(dev_priv)->params.disable_display)
 
+static inline bool run_as_guest(void)
+{
+	return !hypervisor_is_type(X86_HYPER_NATIVE);
+}
+
 static inline bool intel_vtd_active(void)
 {
 #ifdef CONFIG_INTEL_IOMMU
@@ -1764,7 +1769,7 @@ static inline bool intel_vtd_active(void)
 #endif
 
 	/* Running as a guest, we assume the host is enforcing VT'd */
-	return !hypervisor_is_type(X86_HYPER_NATIVE);
+	return run_as_guest();
 }
 
 static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
index f31c0dabd0cc..ca5989700ecf 100644
--- a/drivers/gpu/drm/i915/intel_pch.c
+++ b/drivers/gpu/drm/i915/intel_pch.c
@@ -184,6 +184,23 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
 	return id;
 }
 
+void intel_detect_pch_virt(struct drm_i915_private *dev_priv)
+{
+	unsigned short id;
+	enum intel_pch pch_type;
+
+	id = intel_virt_detect_pch(dev_priv);
+	pch_type = intel_pch_type(dev_priv, id);
+
+	/* Sanity check virtual PCH id */
+	if (drm_WARN_ON(&dev_priv->drm,
+			id && pch_type == PCH_NONE))
+		id = 0;
+
+	dev_priv->pch_type = pch_type;
+	dev_priv->pch_id = id;
+}
+
 void intel_detect_pch(struct drm_i915_private *dev_priv)
 {
 	struct pci_dev *pch = NULL;
@@ -221,16 +238,7 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
 			break;
 		} else if (intel_is_virt_pch(id, pch->subsystem_vendor,
 					     pch->subsystem_device)) {
-			id = intel_virt_detect_pch(dev_priv);
-			pch_type = intel_pch_type(dev_priv, id);
-
-			/* Sanity check virtual PCH id */
-			if (drm_WARN_ON(&dev_priv->drm,
-					id && pch_type == PCH_NONE))
-				id = 0;
-
-			dev_priv->pch_type = pch_type;
-			dev_priv->pch_id = id;
+			intel_detect_pch_virt(dev_priv);
 			break;
 		}
 	}
@@ -246,8 +254,13 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)
 		dev_priv->pch_id = 0;
 	}
 
-	if (!pch)
-		drm_dbg_kms(&dev_priv->drm, "No PCH found.\n");
+	if (!pch) {
+		if (run_as_guest()) {
+			drm_dbg_kms(&dev_priv->drm, "No PCH found in vm, try guess..\n");
+			intel_detect_pch_virt(dev_priv);
+		} else
+			drm_dbg_kms(&dev_priv->drm, "No PCH found.\n");
+	}
 
 	pci_dev_put(pch);
 }
-- 
2.17.1

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

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

end of thread, other threads:[~2021-01-18  9:57 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-14  7:01 [Intel-gfx] [PATCH] drm/i915: Try to guess PCH type even without ISA bridge Xiong Zhang
2020-12-14  7:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-12-14  7:19 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-12-18  9:05   ` [Intel-gfx] [PATCH v2] " Xiong Zhang
2020-12-22  5:15     ` Zhenyu Wang
2020-12-23  8:39       ` Zhang, Xiong Y
2020-12-23  8:59     ` Jani Nikula
2020-12-24  2:42       ` Zhang, Xiong Y
2020-12-24  2:54       ` Zhang, Xiong Y
2020-12-24  4:49         ` Zhenyu Wang
2021-01-13  4:53       ` [Intel-gfx] [PATCH v3] " Xiong Zhang
2021-01-14  0:58       ` [Intel-gfx] [PATCH v4] " Xiong Zhang
2021-01-14  5:14         ` Zhenyu Wang
2021-01-15 10:50           ` Jani Nikula
2021-01-15 11:01             ` Joonas Lahtinen
2021-01-18  6:04               ` Zhenyu Wang
2021-01-18  9:56                 ` Jani Nikula
2020-12-18 10:16   ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Try to guess PCH type even without ISA bridge (rev2) Patchwork
2020-12-18 11:27   ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-01-13  5:23   ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Try to guess PCH type even without ISA bridge (rev3) Patchwork
2021-01-13  5:52   ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-01-14  2:01   ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Try to guess PCH type even without ISA bridge (rev4) Patchwork
2021-01-14  4:59   ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-12-14  7:22 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/i915: Try to guess PCH type even without ISA bridge Patchwork
2020-12-14  7:47 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-12-14  9:25 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-12-14 10:10 ` [Intel-gfx] [PATCH] " kernel test robot
2020-12-14 10:10 ` [Intel-gfx] [RFC PATCH] drm/i915: intel_detect_pch_virt() can be static kernel test robot
2020-12-14 12:50 ` [Intel-gfx] [PATCH] drm/i915: Try to guess PCH type even without ISA bridge kernel test robot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox