Disable connector polling for a headless sku
Subsystems (3)
v2 cover Disable connector polling for a headless sku
This patch set disables connector polling when entering runtime suspend for headless sku to prevent waking it up again when poll is performed.
v2:
- integrate headless check into INTEL_DISPLAY_ENABLED
Jouni Högander (3):
drm/i915/opregion: add function to check if headless sku drm/i915: Do not start connector polling if display is disabled drm/i915: Do not start connector polling on headless sku
drivers/gpu/drm/i915/display/intel_hotplug.c | 3 ++- drivers/gpu/drm/i915/display/intel_opregion.c | 14 ++++++++++++++ drivers/gpu/drm/i915/display/intel_opregion.h | 7 +++++++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- 4 files changed, 26 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 drm/i915/opregion: add function to check if headless sku
Export headless sku bit (bit 13) from opregion->header->pcon as an interface to check if our device is headless configuration.
This is mainly targeted for hybrid gfx systems. E.g. when display is not supposed to be connected discrete graphics card it's opregion can inform this is headless graphics card.
v2: Check also opregion version
Bspec: 53441
--- drivers/gpu/drm/i915/display/intel_opregion.c | 14 ++++++++++++++ drivers/gpu/drm/i915/display/intel_opregion.h | 7 +++++++ 2 files changed, 21 insertions(+)
drivers/gpu/drm/i915/display/intel_opregion.c +14 -0
@@ -53,6 +53,8 @@#define MBOX_ASLE_EXT BIT(4)/* Mailbox #5 */ #define MBOX_BACKLIGHT BIT(5)/* Mailbox #2 (valid from v3.x) */ +#define PCON_HEADLESS_SKU BIT(13) +struct opregion_header {u8 signature[16 ];u32 size;
@@ -1135,6 +1137,18 @@ struct edid *intel_opregion_get_edid(struct intel_connector *intel_connector)return new_edid; } +bool intel_opregion_headless_sku (struct drm_i915_private *i915) +{ +struct intel_opregion *opregion = &i915->opregion; +struct opregion_header *header = opregion->header; + +if (!header || header->over.major <2 || + (header->over.major ==2 && header->over.minor <3 )) +return false; + +return opregion->header->pcon &PCON_HEADLESS_SKU ; +} +void intel_opregion_register (struct drm_i915_private *i915) {struct intel_opregion *opregion = &i915->opregion;
drivers/gpu/drm/i915/display/intel_opregion.h +7 -0
@@ -76,6 +76,8 @@ int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,int intel_opregion_get_panel_type (struct drm_i915_private *dev_priv);struct edid *intel_opregion_get_edid (struct intel_connector *connector); +bool intel_opregion_headless_sku (struct drm_i915_private *i915); +#else /* CONFIG_ACPI*/ static inline int intel_opregion_setup (struct drm_i915_private *dev_priv)
@@ -127,6 +129,11 @@ intel_opregion_get_edid(struct intel_connector *connector)return NULL ; } +bool intel_opregion_headless_sku (struct drm_i915_private *i915) +{ +return false; +} +#endif /* CONFIG_ACPI */ #endif
Signature · 1 line
2.25.1
Re: [Intel-gfx] [PATCH v2 1/3] drm/i915/opregion: add function to check if headless sku
Quoted 62 lines · Jouni Högander
Export headless sku bit (bit 13) from
opregion->header->pconas an interface to check if our device is headless configuration.This is mainly targeted for hybrid gfx systems. E.g. when display is not supposed to be connected discrete graphics card it's opregion can inform this is headless graphics card.
v2: Check also opregion version
Bspec: 53441
Signed-off-by Jouni Högander <[email protected]>--- drivers/gpu/drm/i915/display/intel_opregion.c | 14 ++++++++++++++ drivers/gpu/drm/i915/display/intel_opregion.h | 7 +++++++ 2 files changed, 21 insertions(+)drivers/gpu/drm/i915/display/intel_opregion.c +14
-0@@ -53,6 +53,8 @@#define MBOX_ASLE_EXT BIT(4)/* Mailbox #5 */ #define MBOX_BACKLIGHT BIT(5)/* Mailbox #2 (valid from v3.x) */ +#define PCON_HEADLESS_SKU BIT(13) +struct opregion_header {u8 signature[16 ];u32 size;@@ -1135,6 +1137,18 @@ struct edid *intel_opregion_get_edid(struct intel_connector *intel_connector)return new_edid; } +bool intel_opregion_headless_sku (struct drm_i915_private *i915) +{ +struct intel_opregion *opregion = &i915->opregion; +struct opregion_header *header = opregion->header; + +if (!header || header->over.major <2 || + (header->over.major ==2 && header->over.minor <3 )) +return false; + +return opregion->header->pcon &PCON_HEADLESS_SKU ; +} +void intel_opregion_register (struct drm_i915_private *i915) {struct intel_opregion *opregion = &i915->opregion;drivers/gpu/drm/i915/display/intel_opregion.h +2
-0@@ -76,6 +76,8 @@ int intel_opregion_notify_adapter(struct drm_i915_private *dev_priv,int intel_opregion_get_panel_type (struct drm_i915_private *dev_priv);struct edid *intel_opregion_get_edid (struct intel_connector *connector); +bool intel_opregion_headless_sku (struct drm_i915_private *i915); +#else /* CONFIG_ACPI*/ static inline int intel_opregion_setup (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/display/intel_opregion.h intel_opregion_get_edid(struct intel_connector *connector) · line 132
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_opregion.h +1
-0@@ -127,6 +129,11 @@ intel_opregion_get_edid(struct intel_connector *connector)return NULL ; } +bool intel_opregion_headless_sku (struct drm_i915_private *i915)
This needs to be static inline.
With that fixed, the series is
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_opregion.h +4
-0+{ +return false; +} +#endif /* CONFIG_ACPI */ #endif
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
PATCH v2 2/3 drm/i915: Do not start connector polling if display is disabled
In reply to Jouni HöganderCurrently we are starting connector polling if display is disabled using disable_display module parameter. Polling is just returning always "not connected" state. This can be optimized by not starting polling at all.
--- drivers/gpu/drm/i915/display/intel_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_hotplug.c +2 -1
@@ -668,7 +668,8 @@ static void i915_hpd_poll_init_work(struct work_struct *work)*/ void intel_hpd_poll_enable (struct drm_i915_private *dev_priv) { -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || + !INTEL_DISPLAY_ENABLED (dev_priv))return ;WRITE_ONCE (dev_priv->hotplug.poll_enabled, true);
Signature · 1 line
2.25.1
PATCH v2 3/3 drm/i915: Do not start connector polling on headless sku
In reply to Jouni HöganderConnector polling is waking up the polled device. Polling is unnecessary if our device is known to not have display.
Fix this and save some power by disabling starting connector polling when we are having headless sku. Use information from opregion.
v2: Move headless sku check into INTEL_DISPLAY_ENABLED macro
--- drivers/gpu/drm/i915/i915_drv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -1343,7 +1343,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,/* Only valid when HAS_DISPLAY() is true */ #define INTEL_DISPLAY_ENABLED (dev_priv) \ - (drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)), !(dev_priv)->params.disable_display) + (drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)), \ + !(dev_priv)->params.disable_display && \ + !intel_opregion_headless_sku(dev_priv))#define HAS_GUC_DEPRIVILEGE (dev_priv) \ (INTEL_INFO(dev_priv)->has_guc_deprivilege)
Signature · 1 line
2.25.1