From: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Date: Thu, 20 Oct 2016 22:05:57 +0000 (-0400)
Subject: drm/i915/gvt: fix bad 32 bit shift in gtt
X-Git-Tag: v4.10-rc1~154^2~37^2~123^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31f09cb79e797797bc745d98f93ac50b2cbda9e6;p=karo-tx-linux.git

drm/i915/gvt: fix bad 32 bit shift in gtt

Since ioread32 returns a 32-bit value, it is impossible to left-shift
this value by 32 bits (it produces a compilation error). Casting the
return value of ioread32 fix this issue.

Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
---

diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 2cc761328569..b35bda0ce46b 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -276,7 +276,7 @@ static u64 read_pte64(struct drm_i915_private *dev_priv, unsigned long index)
 	pte = readq(addr);
 #else
 	pte = ioread32(addr);
-	pte |= ioread32(addr + 4) << 32;
+	pte |= (u64)ioread32(addr + 4) << 32;
 #endif
 	return pte;
 }