diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-06-27 18:14:02 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-06-29 16:28:14 +0300 |
| commit | e672f9e9f6a74cc24fa268acc5b5aabec458eb72 (patch) | |
| tree | 1bce20eb8926c76e414acd33c121a543ba845de8 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 5f25966e0fb17d787b2a2f1cf7aec46197b307fe (diff) | |
| download | linux-stable-e672f9e9f6a74cc24fa268acc5b5aabec458eb72.tar.gz linux-stable-e672f9e9f6a74cc24fa268acc5b5aabec458eb72.tar.bz2 linux-stable-e672f9e9f6a74cc24fa268acc5b5aabec458eb72.zip | |
drm/i915: move display device and runtime info to struct intel_display
Continue moving all things display further into display files and
structures.
v2: Sort includes (Matt)
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fc9ad69a0c7fa972380c654c3b80070ce2f4bf0f.1687878757.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 078720a52322..8947d1201298 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -205,7 +205,6 @@ struct drm_i915_private { const struct intel_device_info __info; /* Use INTEL_INFO() to access. */ struct intel_runtime_info __runtime; /* Use RUNTIME_INFO() to access. */ - struct intel_display_runtime_info __display_runtime; /* Access with DISPLAY_RUNTIME_INFO() */ struct intel_driver_caps caps; struct i915_dsm dsm; @@ -417,9 +416,9 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915) (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node))) #define INTEL_INFO(i915) (&(i915)->__info) -#define DISPLAY_INFO(i915) (INTEL_INFO(i915)->display) #define RUNTIME_INFO(i915) (&(i915)->__runtime) -#define DISPLAY_RUNTIME_INFO(i915) (&(i915)->__display_runtime) +#define DISPLAY_INFO(i915) ((i915)->display.info.__device_info) +#define DISPLAY_RUNTIME_INFO(i915) (&(i915)->display.info.__runtime_info) #define DRIVER_CAPS(i915) (&(i915)->caps) #define INTEL_DEVID(i915) (RUNTIME_INFO(i915)->device_id) |