diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-05-17 16:30:24 +0300 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-05-17 16:30:24 +0300 |
commit | 9c3a985f88fa4de82bf4bda906095ce6444e9039 (patch) | |
tree | 4b02653fcb1ba1e6b342d98ac58f6206c56be935 /drivers/gpu/drm/i915/intel_device_info.h | |
parent | 86634ba3dfc789497805da3d5774fcc1953cbe41 (diff) | |
parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
download | linux-9c3a985f88fa4de82bf4bda906095ce6444e9039.tar.xz |
Merge drm/drm-next into drm-intel-next
Backmerge to get some hwmon dependencies.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_device_info.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_device_info.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index 30496966be61..f032f2500f50 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -167,6 +167,7 @@ enum intel_ppgtt_type { func(has_mslice_steering); \ func(has_oa_bpc_reporting); \ func(has_oa_slice_contrib_limits); \ + func(has_oam); \ func(has_one_eu_per_fuse_bit); \ func(has_pxp); \ func(has_rc6); \ |