xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/gvt: Fix failure when ACPI is not enabled

Browse Source 
Directly use memremap instead of acpi function for opregion mapping.

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
This commit is contained in:
Zhenyu Wang
2016-10-21 09:59:10 +08:00
parent 19e6393fb5
commit d1bbef6d15
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/gvt/opregion.c
View 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) void intel_gvt_clean_opregion(struct intel_gvt *gvt)
{ {
iounmap(gvt->opregion.opregion_va); memunmap(gvt->opregion.opregion_va);
gvt->opregion.opregion_va = NULL; 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, pci_read_config_dword(gvt->dev_priv->drm.pdev, INTEL_GVT_PCI_OPREGION,
&gvt->opregion.opregion_pa); &gvt->opregion.opregion_pa);
gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa, gvt->opregion.opregion_va = memremap(gvt->opregion.opregion_pa,
INTEL_GVT_OPREGION_SIZE); INTEL_GVT_OPREGION_SIZE, MEMREMAP_WB);
if (!gvt->opregion.opregion_va) { if (!gvt->opregion.opregion_va) {
gvt_err("fail to map host opregion\n"); gvt_err("fail to map host opregion\n");
return -EFAULT; return -EFAULT;