Skip to content

Commit 8192e55

Browse files
committed
drm/i915: remove always-defined CONFIG_AS_MOVNTDQA
CONFIG_AS_MOVNTDQA was introduced by commit 0b1de5d ("drm/i915: Use SSE4.1 movntdqa to accelerate reads from WC memory"). We raise the minimal supported binutils version from time to time. The last bump was commit 1fb12b3 ("kbuild: Raise the minimum required binutils version to 2.21"). I confirmed the code in $(call as-instr,...) can be assembled by the binutils 2.21 assembler and also by LLVM integrated assembler. Remove CONFIG_AS_MOVNTDQA, which is always defined. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Reviewed-by: Jason A. Donenfeld <[email protected]> Acked-by: Ingo Molnar <[email protected]> Acked-by: Jani Nikula <[email protected]>
1 parent 4225157 commit 8192e55

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

drivers/gpu/drm/i915/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror
2828
CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init)
2929
CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init)
3030

31-
subdir-ccflags-y += \
32-
$(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA)
33-
3431
subdir-ccflags-y += -I$(srctree)/$(src)
3532

3633
# Please keep these build lists sorted!

drivers/gpu/drm/i915/i915_memcpy.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
static DEFINE_STATIC_KEY_FALSE(has_movntdqa);
3737

38-
#ifdef CONFIG_AS_MOVNTDQA
3938
static void __memcpy_ntdqa(void *dst, const void *src, unsigned long len)
4039
{
4140
kernel_fpu_begin();
@@ -93,10 +92,6 @@ static void __memcpy_ntdqu(void *dst, const void *src, unsigned long len)
9392

9493
kernel_fpu_end();
9594
}
96-
#else
97-
static void __memcpy_ntdqa(void *dst, const void *src, unsigned long len) {}
98-
static void __memcpy_ntdqu(void *dst, const void *src, unsigned long len) {}
99-
#endif
10095

10196
/**
10297
* i915_memcpy_from_wc: perform an accelerated *aligned* read from WC

0 commit comments

Comments
 (0)