Update i915 PXP and MEI Driver to DII client.

Signed-off-by: Sun, Jing <[email protected]>
projectceladon · Jan 3, 2025 · a8a3681 · a8a3681
1 parent 7735521
commit a8a3681
Show file tree

Hide file tree

Showing 13 changed files with 213 additions and 95 deletions.
diff --git a/drivers/gpu/drm/i915/gt/iov/intel_iov_ggtt.c b/drivers/gpu/drm/i915/gt/iov/intel_iov_ggtt.c
@@ -173,7 +173,7 @@ static bool is_pte_replicable(struct intel_iov *iov, gen8_pte_t pte)
 void intel_iov_ggtt_vf_update_pte(struct intel_iov *iov, u32 offset, gen8_pte_t pte)
 {
 	struct intel_iov_vf_ggtt_ptes *buffer = &iov->vf.ptes_buffer;
-	u16 max_copies = FIELD_MAX(VF2PF_MMIO_UPDATE_GGTT_REQUEST_MSG_1_NUM_COPIES);
+	u16 max_copies = (u8)FIELD_MAX(VF2PF_MMIO_UPDATE_GGTT_REQUEST_MSG_1_NUM_COPIES);
 	u16 max_ptes = MMIO_UPDATE_GGTT_MAX_PTES;
 	u32 pte_offset = (offset >> PAGE_SHIFT) - (iov->vf.config.ggtt_base >> PAGE_SHIFT);
 

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
@@ -853,7 +853,9 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (ret)
 		goto out_cleanup_modeset2;
 
-	intel_pxp_init(i915);
+	ret = intel_pxp_init(i915);
+	if (ret != -ENODEV)
+		drm_dbg(&i915->drm, "pxp init failed with %d\n", ret);
 
 	ret = intel_display_driver_probe(i915);
 	if (ret)