diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-23 15:06:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-23 15:06:06 +0100 |
| commit | b7f9d04cf684c197ef74ed8a38394d7bf7fda26f (patch) | |
| tree | 5309b3b1fca0d4de1a2600154578d524fa8d88b8 /drivers/gpu/drm/i915 | |
| parent | e6ac02baf8864fad4d1fd52e070d5ebd94296af7 (diff) | |
| parent | beca880f9e2dd9c4072538181633793f1c48a01c (diff) | |
| download | linux-next-b7f9d04cf684c197ef74ed8a38394d7bf7fda26f.tar.gz linux-next-b7f9d04cf684c197ef74ed8a38394d7bf7fda26f.zip | |
Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
# Conflicts:
# arch/x86/mm/pat/set_memory.c
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_domain.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_memcpy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c index df7502391b50..b7297c0a3a48 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c @@ -681,7 +681,7 @@ int i915_gem_object_prepare_read(struct drm_i915_gem_object *obj, return ret; if (obj->cache_coherent & I915_BO_CACHE_COHERENT_FOR_READ || - !static_cpu_has(X86_FEATURE_CLFLUSH)) { + !cpu_feature_enabled(X86_FEATURE_CLFLUSH)) { ret = i915_gem_object_set_to_cpu_domain(obj, false); if (ret) goto err_unpin; @@ -732,7 +732,7 @@ int i915_gem_object_prepare_write(struct drm_i915_gem_object *obj, return ret; if (obj->cache_coherent & I915_BO_CACHE_COHERENT_FOR_WRITE || - !static_cpu_has(X86_FEATURE_CLFLUSH)) { + !cpu_feature_enabled(X86_FEATURE_CLFLUSH)) { ret = i915_gem_object_set_to_cpu_domain(obj, true); if (ret) goto err_unpin; diff --git a/drivers/gpu/drm/i915/i915_memcpy.c b/drivers/gpu/drm/i915/i915_memcpy.c index cc41974cee74..20433621e09a 100644 --- a/drivers/gpu/drm/i915/i915_memcpy.c +++ b/drivers/gpu/drm/i915/i915_memcpy.c @@ -166,7 +166,7 @@ void i915_memcpy_init_early(struct drm_i915_private *dev_priv) * Some hypervisors (e.g. KVM) don't support VEX-prefix instructions * emulation. So don't enable movntdqa in hypervisor guest. */ - if (static_cpu_has(X86_FEATURE_XMM4_1) && + if (cpu_feature_enabled(X86_FEATURE_XMM4_1) && !boot_cpu_has(X86_FEATURE_HYPERVISOR)) static_branch_enable(&has_movntdqa); } |