Skip to content

Commit bdd8b6c

Browse files
committed
drm/i915: replace X86_FEATURE_PAT with pat_enabled()
PAT can be disabled on boot with "nopat" in the command line. Replace one x86-ism with another, which is slightly more correct to prepare for supporting other architectures. Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211202003048.1015511-1-lucas.demarchi@intel.com
1 parent 1b9e8b1 commit bdd8b6c

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

drivers/gpu/drm/i915/gem/i915_gem_mman.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
7272
if (args->flags & ~(I915_MMAP_WC))
7373
return -EINVAL;
7474

75-
if (args->flags & I915_MMAP_WC && !boot_cpu_has(X86_FEATURE_PAT))
75+
if (args->flags & I915_MMAP_WC && !pat_enabled())
7676
return -ENODEV;
7777

7878
obj = i915_gem_object_lookup(file, args->handle);
@@ -736,7 +736,7 @@ i915_gem_dumb_mmap_offset(struct drm_file *file,
736736

737737
if (HAS_LMEM(to_i915(dev)))
738738
mmap_type = I915_MMAP_TYPE_FIXED;
739-
else if (boot_cpu_has(X86_FEATURE_PAT))
739+
else if (pat_enabled())
740740
mmap_type = I915_MMAP_TYPE_WC;
741741
else if (!i915_ggtt_has_aperture(&to_i915(dev)->ggtt))
742742
return -ENODEV;
@@ -792,7 +792,7 @@ i915_gem_mmap_offset_ioctl(struct drm_device *dev, void *data,
792792
break;
793793

794794
case I915_MMAP_OFFSET_WC:
795-
if (!boot_cpu_has(X86_FEATURE_PAT))
795+
if (!pat_enabled())
796796
return -ENODEV;
797797
type = I915_MMAP_TYPE_WC;
798798
break;
@@ -802,7 +802,7 @@ i915_gem_mmap_offset_ioctl(struct drm_device *dev, void *data,
802802
break;
803803

804804
case I915_MMAP_OFFSET_UC:
805-
if (!boot_cpu_has(X86_FEATURE_PAT))
805+
if (!pat_enabled())
806806
return -ENODEV;
807807
type = I915_MMAP_TYPE_UC;
808808
break;

drivers/gpu/drm/i915/gem/i915_gem_pages.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,7 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj,
424424
goto err_unpin;
425425
}
426426

427-
if (GEM_WARN_ON(type == I915_MAP_WC &&
428-
!static_cpu_has(X86_FEATURE_PAT)))
427+
if (GEM_WARN_ON(type == I915_MAP_WC && !pat_enabled()))
429428
ptr = ERR_PTR(-ENODEV);
430429
else if (i915_gem_object_has_struct_page(obj))
431430
ptr = i915_gem_object_map_page(obj, type);

0 commit comments

Comments
 (0)