Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f655e67a authored by Zhenyu Wang's avatar Zhenyu Wang
Browse files

drm/i915/gvt: Fix check error on opregion.c 



As we switched to memremap for opregion, shouldn't use any __iomem
for that, and move to use memcpy instead.

This fixed static check errors for:

  CHECK   drivers/gpu/drm/i915//gvt/opregion.c
  drivers/gpu/drm/i915//gvt/opregion.c:142:31: warning: incorrect type in argument 1 (different address spaces)
  drivers/gpu/drm/i915//gvt/opregion.c:142:31:    expected void *addr
  drivers/gpu/drm/i915//gvt/opregion.c:142:31:    got void [noderef] <asn:2>*opregion_va
  drivers/gpu/drm/i915//gvt/opregion.c:160:35: warning: incorrect type in assignment (different address spaces)
  drivers/gpu/drm/i915//gvt/opregion.c:160:35:    expected void [noderef] <asn:2>*opregion_va
  drivers/gpu/drm/i915//gvt/opregion.c:160:35:    got void *

Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 4a0b3444

drivers/gpu/drm/i915/gvt/gvt.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct intel_gvt_firmware { 
};



struct intel_gvt_opregion {

	void __iomem *opregion_va;

	void *opregion_va;

	u32 opregion_pa;

};

drivers/gpu/drm/i915/gvt/opregion.c

+2 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


static int init_vgpu_opregion(struct intel_vgpu *vgpu, u32 gpa)

{

	void __iomem *host_va = vgpu->gvt->opregion.opregion_va;

	u8 *buf;

	int i;
@@ -43,7 +42,7 @@ static int init_vgpu_opregion(struct intel_vgpu *vgpu, u32 gpa) 
	if (!vgpu_opregion(vgpu)->va)

		return -ENOMEM;



	memcpy_fromio(vgpu_opregion(vgpu)->va, host_va,

	memcpy(vgpu_opregion(vgpu)->va, vgpu->gvt->opregion.opregion_va,

	       INTEL_GVT_OPREGION_SIZE);



	for (i = 0; i < INTEL_GVT_OPREGION_PAGES; i++)