diff mbox

drm/i915: remove writeq ifdeffery

Message ID 1473451373-9852-1-git-send-email-matthew.auld@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Matthew Auld Sept. 9, 2016, 8:02 p.m. UTC
drm already provides fallback versions of readq and writeq.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Joonas Lahtinen Sept. 12, 2016, 8:32 a.m. UTC | #1
On pe, 2016-09-09 at 21:02 +0100, Matthew Auld wrote:
> drm already provides fallback versions of readq and writeq.
> 
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Thanks for the patch, merging it in.

Regards, Joonas

> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index f3c6876..ceb8d88 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2304,12 +2304,7 @@ int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj)
>  
>  static void gen8_set_pte(void __iomem *addr, gen8_pte_t pte)
>  {
> -#ifdef writeq
>  	writeq(pte, addr);
> -#else
> -	iowrite32((u32)pte, addr);
> -	iowrite32(pte >> 32, addr + 4);
> -#endif
>  }
>  
>  static void gen8_ggtt_insert_page(struct i915_address_space *vm,
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index f3c6876..ceb8d88 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2304,12 +2304,7 @@  int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj)
 
 static void gen8_set_pte(void __iomem *addr, gen8_pte_t pte)
 {
-#ifdef writeq
 	writeq(pte, addr);
-#else
-	iowrite32((u32)pte, addr);
-	iowrite32(pte >> 32, addr + 4);
-#endif
 }
 
 static void gen8_ggtt_insert_page(struct i915_address_space *vm,