diff options
| author |  Jani Nikula <jani.nikula@intel.com>
| 2023-05-31 12:01:51 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com>
| 2023-05-31 12:01:51 +0300 |
| commit | e2a9f0a32464f435dbdb190ff7dbf09745703b60 (patch) | |
| tree | bae874fad606918fdae32a99a2b47a76f3a605b3 /drivers/gpu/drm/i915/intel_device_info.h | |
| parent | drm/i915/hdcp: Rename comp_mutex to hdcp_mutex (diff) | |
| parent | Merge tag 'drm-intel-gt-next-2023-05-24' of git://anongit.freedesktop.org/drm... (diff) | |
| download | linux-e2a9f0a32464f435dbdb190ff7dbf09745703b60.tar.gz linux-e2a9f0a32464f435dbdb190ff7dbf09745703b60.tar.bz2 linux-e2a9f0a32464f435dbdb190ff7dbf09745703b60.zip | |
Merge drm/drm-next into drm-intel-next
Sync the drm-intel-gt-next changes back to drm-intel-next via drm-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_device_info.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_device_info.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index faf6cccdb343..069291b3bd37 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -35,6 +35,8 @@ #include "gt/intel_context_types.h" #include "gt/intel_sseu.h" +#include "gem/i915_gem_object_types.h" + struct drm_printer; struct drm_i915_private; struct intel_gt_definition; @@ -245,6 +247,9 @@ struct intel_device_info { * Initial runtime info. Do not access outside of i915_driver_create(). */ const struct intel_runtime_info __runtime; + + u32 cachelevel_to_pat[I915_MAX_CACHE_LEVEL]; + u32 max_pat_index; }; struct intel_driver_caps { |