]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: remove writeq ifdeffery
authorMatthew Auld <matthew.auld@intel.com>
Fri, 9 Sep 2016 20:02:53 +0000 (21:02 +0100)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 12 Sep 2016 08:33:56 +0000 (11:33 +0300)
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>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1473451373-9852-1-git-send-email-matthew.auld@intel.com
drivers/gpu/drm/i915/i915_gem_gtt.c

index 61ab65b01cc401d5af0d6332221784b714b7d618..0bb4232f66bcac1ad9653c073c1cbe7cb7375c16 100644 (file)
@@ -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,