diff options
author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:43 -0800 |
---|---|---|
committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:43 -0800 |
commit | ae00c6637cfe613a17953beb99c181360ff379d6 (patch) | |
tree | 7729f1e4bb7e49f2752a41ab6dedf8d12ccd16f4 /drivers/gpu/drm/i915/display/intel_opregion.h | |
parent | 2b5f745c18b850734e1bb7b7e86510ea69698c71 (diff) | |
parent | 80dfdeb75028084f42a81a4151a986c56aeec1c1 (diff) |
Merge remote-tracking branch 'drm-intel/drm-intel-next' into drm-tip
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_opregion.h')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_opregion.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h index 4aa68ffbd30e..82cc0ba34af7 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.h +++ b/drivers/gpu/drm/i915/display/intel_opregion.h @@ -29,12 +29,14 @@ #include <linux/pci.h> struct drm_i915_private; +struct intel_connector; struct intel_encoder; struct opregion_header; struct opregion_acpi; struct opregion_swsci; struct opregion_asle; +struct opregion_asle_ext; struct intel_opregion { struct opregion_header *header; @@ -43,6 +45,7 @@ struct intel_opregion { u32 swsci_gbda_sub_functions; u32 swsci_sbcb_sub_functions; struct opregion_asle *asle; + struct opregion_asle_ext *asle_ext; void *rvda; void *vbt_firmware; const void *vbt; @@ -71,6 +74,7 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv, pci_power_t state); int intel_opregion_get_panel_type(struct drm_i915_private *dev_priv); +struct edid *intel_opregion_get_edid(struct intel_connector *connector); #else /* CONFIG_ACPI*/ @@ -117,6 +121,12 @@ static inline int intel_opregion_get_panel_type(struct drm_i915_private *dev) return -ENODEV; } +static inline struct edid * +intel_opregion_get_edid(struct intel_connector *connector) +{ + return NULL; +} + #endif /* CONFIG_ACPI */ #endif |