]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/gvt: Fix failure when ACPI is not enabled
authorZhenyu Wang <zhenyuw@linux.intel.com>
Fri, 21 Oct 2016 01:59:10 +0000 (09:59 +0800)
committerZhenyu Wang <zhenyuw@linux.intel.com>
Mon, 24 Oct 2016 02:43:47 +0000 (10:43 +0800)
Directly use memremap instead of acpi function for opregion mapping.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
drivers/gpu/drm/i915/gvt/opregion.c

index 973c8a9d0b1534c9125a00a2a6b584997871fbf5..95218913b0bc19f089fa71c0c21ed445f5c96096 100644 (file)
@@ -163,7 +163,7 @@ int intel_vgpu_init_opregion(struct intel_vgpu *vgpu, u32 gpa)
  */
 void intel_gvt_clean_opregion(struct intel_gvt *gvt)
 {
-       iounmap(gvt->opregion.opregion_va);
+       memunmap(gvt->opregion.opregion_va);
        gvt->opregion.opregion_va = NULL;
 }
 
@@ -181,8 +181,8 @@ int intel_gvt_init_opregion(struct intel_gvt *gvt)
        pci_read_config_dword(gvt->dev_priv->drm.pdev, INTEL_GVT_PCI_OPREGION,
                        &gvt->opregion.opregion_pa);
 
-       gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
-                       INTEL_GVT_OPREGION_SIZE);
+       gvt->opregion.opregion_va = memremap(gvt->opregion.opregion_pa,
+                                            INTEL_GVT_OPREGION_SIZE, MEMREMAP_WB);
        if (!gvt->opregion.opregion_va) {
                gvt_err("fail to map host opregion\n");
                return -EFAULT;