Merge tag 'docs-5.5a' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / intel_device_info.h

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 92e0c2e..4bdf8a6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -107,6 +107,7 @@ enum intel_ppgtt_type {
        func(is_mobile); \
        func(is_lp); \
        func(require_force_probe); \
+       func(is_dgfx); \
        /* Keep has_* in alphabetical order */ \
        func(has_64bit_reloc); \
        func(gpu_reset_clobbers_display); \
@@ -135,8 +136,11 @@ enum intel_ppgtt_type {
        func(has_csr); \
        func(has_ddi); \
        func(has_dp_mst); \
+       func(has_dsb); \
+       func(has_dsc); \
        func(has_fbc); \
        func(has_gmch); \
+       func(has_hdcp); \
        func(has_hotplug); \
        func(has_ipc); \
        func(has_modular_fia); \
@@ -159,9 +163,11 @@ struct intel_device_info {
 
        unsigned int page_sizes; /* page sizes supported by the HW */
 
+       u32 memory_regions; /* regions supported by the HW */
+
        u32 display_mmio_offset;
 
-       u8 num_pipes;
+       u8 pipe_mask;
 
 #define DEFINE_FLAG(name) u8 name:1
        DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG);