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

Commit 905a5035 authored by Changbin Du's avatar Changbin Du Committed by Zhenyu Wang
Browse files

drm/i915/gvt: always use readq and writeq 



The readq and writeq are already offered by drm_os_linux.h. So we can
use them directly whithout dectecting their presence. This patch removed
the duplicated code.

Signed-off-by: default avatarChangbin Du <changbin.du@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 39762ad4

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

+2 −13
Original line number Diff line number Diff line
@@ -240,15 +240,8 @@ static inline int get_pse_type(int type) 
static u64 read_pte64(struct drm_i915_private *dev_priv, unsigned long index)

{

	void __iomem *addr = (gen8_pte_t __iomem *)dev_priv->ggtt.gsm + index;

	u64 pte;



#ifdef readq

	pte = readq(addr);

#else

	pte = ioread32(addr);

	pte |= (u64)ioread32(addr + 4) << 32;

#endif

	return pte;

	return readq(addr);

}



static void write_pte64(struct drm_i915_private *dev_priv,
@@ -256,12 +249,8 @@ static void write_pte64(struct drm_i915_private *dev_priv, 
{

	void __iomem *addr = (gen8_pte_t __iomem *)dev_priv->ggtt.gsm + index;



#ifdef writeq

	writeq(pte, addr);

#else

	iowrite32((u32)pte, addr);

	iowrite32(pte >> 32, addr + 4);

#endif



	I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);

	POSTING_READ(GFX_FLSH_CNTL_GEN6);

}