On Tue, 08 May 2018, Ville Syrjala <ville.syrj...@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> Replace dev_priv->vbt.edp.support with
> dev_priv->vbt.int_lvds_support. We'll want to extend its
> use beyond the LVDS vs. eDP case in the future.
>
> v2: Nuke the edp.support from parse_edp() (Jani)
> Only clear int_lvds_support for gen5+ to preserve
> the current behaviour (Jani)
>
> Cc: Jani Nikula <jani.nik...@intel.com>
> Cc: Ondrej Zary <li...@rainbow-software.org>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nik...@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/intel_bios.c | 13 +++++++------
> drivers/gpu/drm/i915/intel_lvds.c | 9 +++++----
> 3 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 04e27806e581..3bdc7cfd4189 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1052,6 +1052,7 @@ struct intel_vbt_data {
> unsigned int lvds_vbt:1;
> unsigned int int_crt_support:1;
> unsigned int lvds_use_ssc:1;
> + unsigned int int_lvds_support:1;
> unsigned int display_clock_mode:1;
> unsigned int fdi_rx_polarity_inverted:1;
> unsigned int panel_type:4;
> @@ -1067,7 +1068,6 @@ struct intel_vbt_data {
> int vswing;
> bool low_vswing;
> bool initialized;
> - bool support;
> int bpp;
> struct edp_power_seq pps;
> } edp;
> diff --git a/drivers/gpu/drm/i915/intel_bios.c
> b/drivers/gpu/drm/i915/intel_bios.c
> index 702d3fab97fc..62cc9d3e20f5 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -518,8 +518,9 @@ parse_driver_features(struct drm_i915_private *dev_priv,
> if (!driver)
> return;
>
> - if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP)
> - dev_priv->vbt.edp.support = 1;
> + if (INTEL_GEN(dev_priv) >= 5 &&
> + driver->lvds_config == BDB_DRIVER_FEATURE_EDP)
> + dev_priv->vbt.int_lvds_support = 0;
>
> DRM_DEBUG_KMS("DRRS State Enabled:%d\n", driver->drrs_enabled);
> /*
> @@ -541,11 +542,8 @@ parse_edp(struct drm_i915_private *dev_priv, const
> struct bdb_header *bdb)
> int panel_type = dev_priv->vbt.panel_type;
>
> edp = find_section(bdb, BDB_EDP);
> - if (!edp) {
> - if (dev_priv->vbt.edp.support)
> - DRM_DEBUG_KMS("No eDP BDB found but eDP panel
> supported.\n");
> + if (!edp)
> return;
> - }
>
> switch ((edp->color_depth >> (panel_type * 2)) & 3) {
> case EDP_18BPP:
> @@ -1512,6 +1510,9 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
> dev_priv->vbt.int_tv_support = 1;
> dev_priv->vbt.int_crt_support = 1;
>
> + /* driver features */
> + dev_priv->vbt.int_lvds_support = 1;
> +
> /* Default to using SSC */
> dev_priv->vbt.lvds_use_ssc = 1;
> /*
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c
> b/drivers/gpu/drm/i915/intel_lvds.c
> index d35d2d50f595..05d012358df8 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -965,6 +965,11 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> if (dmi_check_system(intel_no_lvds))
> return;
>
> + if (!dev_priv->vbt.int_lvds_support) {
> + DRM_DEBUG_KMS("Internal LVDS support disabled by VBT\n");
> + return;
> + }
> +
> if (HAS_PCH_SPLIT(dev_priv))
> lvds_reg = PCH_LVDS;
> else
> @@ -975,10 +980,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> if (HAS_PCH_SPLIT(dev_priv)) {
> if ((lvds & LVDS_DETECTED) == 0)
> return;
> - if (dev_priv->vbt.edp.support) {
> - DRM_DEBUG_KMS("disable LVDS for eDP support\n");
> - return;
> - }
> }
>
> pin = GMBUS_PIN_PANEL;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
