| Message ID | 1479917907-2468-3-git-send-email-animesh.manna@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 23 Nov 2016, Animesh Manna <animesh.manna@intel.com> wrote: > To support hpd during sleep a new feature flag is > added in vbt and also in dev_priv for enabling/disabling > inside driver. By default this feature will be > disabled and based on oem request this feature can > be enabled by changing vbt feature flag. > > v1: Initial version as RFC. > > v2: Based on review comments from Jani, > - Used bool instead of enum for hpd feature flag. > - Updating feature flag at the first place based on vbt > entry. > > Signed-off-by: Animesh Manna <animesh.manna@intel.com> > Signed-off-by: A.Sunil Kamath <sunil.kamath@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > drivers/gpu/drm/i915/intel_bios.c | 6 ++++++ > drivers/gpu/drm/i915/intel_vbt_defs.h | 3 ++- > 3 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 4e7148a..1c3cf31 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1583,6 +1583,9 @@ struct intel_vbt_data { > const u8 *sequence[MIPI_SEQ_MAX]; > } dsi; > > + /* HPD as wakesoure for DC9 BXT */ > + bool hpd_wakeup_enabled; > + > int crt_ddc_pin; > > int child_dev_num; > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > index 7ffab1a..da4a7fd 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -557,6 +557,12 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv, > if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP) > dev_priv->vbt.edp.support = 1; > > + if (driver->hpd_wakeup_source) { > + dev_priv->vbt.hpd_wakeup_enabled = true; > + DRM_DEBUG_KMS("HPD as wakeup feature is enabled\n"); > + } else > + DRM_DEBUG_KMS("HPD wakeup source feature is disabled in VBT\n"); > + How about just dev_priv->vbt.hpd_wakeup_enabled = driver->hpd_wakeup_source; (Which kind of makes you wonder why you use different names for the two.) and then DRM_DEBUG_KMS("HPD as wakeup source: %s", yesno(driver->hpd_wakeup_source)); BR, Jani. > DRM_DEBUG_KMS("DRRS State Enabled:%d\n", driver->drrs_enabled); > /* > * If DRRS is not supported, drrs_type has to be set to 0. > diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h > index 8886cab1..2072134 100644 > --- a/drivers/gpu/drm/i915/intel_vbt_defs.h > +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h > @@ -561,7 +561,8 @@ struct bdb_driver_features { > u16 tbt_enabled:1; > u16 psr_enabled:1; > u16 ips_enabled:1; > - u16 reserved3:4; > + u16 reserved3:3; > + u16 hpd_wakeup_source:1; > u16 pc_feature_valid:1; > } __packed;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 4e7148a..1c3cf31 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1583,6 +1583,9 @@ struct intel_vbt_data { const u8 *sequence[MIPI_SEQ_MAX]; } dsi; + /* HPD as wakesoure for DC9 BXT */ + bool hpd_wakeup_enabled; + int crt_ddc_pin; int child_dev_num; diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 7ffab1a..da4a7fd 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -557,6 +557,12 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv, if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP) dev_priv->vbt.edp.support = 1; + if (driver->hpd_wakeup_source) { + dev_priv->vbt.hpd_wakeup_enabled = true; + DRM_DEBUG_KMS("HPD as wakeup feature is enabled\n"); + } else + DRM_DEBUG_KMS("HPD wakeup source feature is disabled in VBT\n"); + DRM_DEBUG_KMS("DRRS State Enabled:%d\n", driver->drrs_enabled); /* * If DRRS is not supported, drrs_type has to be set to 0. diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h index 8886cab1..2072134 100644 --- a/drivers/gpu/drm/i915/intel_vbt_defs.h +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h @@ -561,7 +561,8 @@ struct bdb_driver_features { u16 tbt_enabled:1; u16 psr_enabled:1; u16 ips_enabled:1; - u16 reserved3:4; + u16 reserved3:3; + u16 hpd_wakeup_source:1; u16 pc_feature_valid:1; } __packed;