[PATCH] drm/i915: remove writeq ifdeffery

[PATCH] drm/i915: remove writeq ifdeffery

[Matthew Auld]

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(-)

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,
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: remove writeq ifdeffery

[Patchwork]

== Series Details ==

Series: drm/i915: remove writeq ifdeffery
URL   : https://patchwork.freedesktop.org/series/12263/
State : success

== Summary ==

Series 12263v1 drm/i915: remove writeq ifdeffery
http://patchwork.freedesktop.org/api/1.0/series/12263/revisions/1/mbox/


fi-bdw-5557u     total:254  pass:239  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:254  pass:208  dwarn:0   dfail:0   fail:0   skip:46 
fi-hsw-4770k     total:254  pass:232  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:254  pass:228  dwarn:0   dfail:0   fail:0   skip:26 
fi-ilk-650       total:254  pass:185  dwarn:0   dfail:0   fail:1   skip:68 
fi-ivb-3520m     total:254  pass:223  dwarn:0   dfail:0   fail:0   skip:31 
fi-ivb-3770      total:254  pass:223  dwarn:0   dfail:0   fail:0   skip:31 
fi-skl-6260u     total:254  pass:240  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700k     total:254  pass:225  dwarn:1   dfail:0   fail:0   skip:28 
fi-snb-2520m     total:254  pass:209  dwarn:0   dfail:0   fail:0   skip:45 
fi-snb-2600      total:254  pass:209  dwarn:0   dfail:0   fail:0   skip:45 
fi-skl-6700hq failed to collect. IGT log at Patchwork_2506/fi-skl-6700hq/igt.log

Results at /archive/results/CI_IGT_test/Patchwork_2506/

efd441a0ed02552e2acbc93f0f43954b7fe4d793 drm-intel-nightly: 2016y-09m-09d-20h-32m-38s UTC integration manifest
00b90f6 drm/i915: remove writeq ifdeffery

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: remove writeq ifdeffery

[Joonas Lahtinen]

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,
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx