On Wed, 21 Dec 2016, Imre Deak <imre.deak@xxxxxxxxx> wrote:
> On Wed, 2016-12-21 at 13:21 +0200, Jani Nikula wrote:
>> On Wed, 21 Dec 2016, Imre Deak <imre.deak@xxxxxxxxx> wrote:
>> > There is at least one APL based system using port A in DP mode
>> > (connecting to an on-board DP->VGA adaptor). Atm we'll configure port A
>> > unconditionally as eDP which is incorrect in this case. Fix this by
>> > relying on the VBT DDI port 'internal port' flag instead on all ports on
>> > DDI platforms. For now chicken out from using VBT for port A before
>> > GEN9.
>> >
>> > v2:
>> > - Move the DDI port info lookup to intel_bios_is_port_edp() (David, Jani)
>> > - Use the DDI port info on all DDI platforms starting for port B.
>> >
>> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>> > Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
>> > Cc: David Weinehall <david.weinehall@xxxxxxxxxxxxxxx>
>> > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> (v1)
>> > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
>> > ---
>> > drivers/gpu/drm/i915/i915_drv.h | 1 +
>> > drivers/gpu/drm/i915/intel_bios.c | 4 ++++
>> > drivers/gpu/drm/i915/intel_dp.c | 2 +-
>> > 3 files changed, 6 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> > index 77d7a07..1a91409 100644
>> > --- a/drivers/gpu/drm/i915/i915_drv.h
>> > +++ b/drivers/gpu/drm/i915/i915_drv.h
>> > @@ -1669,6 +1669,7 @@ struct ddi_vbt_port_info {
>> > uint8_t supports_dvi:1;
>> > uint8_t supports_hdmi:1;
>> > uint8_t supports_dp:1;
>> > + uint8_t supports_edp:1;
>> >
>> > uint8_t alternate_aux_channel;
>> > uint8_t alternate_ddc_pin;
>> > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> > index 1cf2fa6..a359def 100644
>> > --- a/drivers/gpu/drm/i915/intel_bios.c
>> > +++ b/drivers/gpu/drm/i915/intel_bios.c
>> > @@ -1161,6 +1161,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>> > info->supports_dvi = is_dvi;
>> > info->supports_hdmi = is_hdmi;
>> > info->supports_dp = is_dp;
>> > + info->supports_edp = is_edp;
>> >
>> > DRM_DEBUG_KMS("Port %c VBT info: DP:%d HDMI:%d DVI:%d EDP:%d CRT:%d\n",
>> > port_name(port), is_dp, is_hdmi, is_dvi, is_edp, is_crt);
>> > @@ -1664,6 +1665,9 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port)
>> > };
>> > int i;
>> >
>> > + if (HAS_DDI(dev_priv))
>> > + return dev_priv->vbt.ddi_port_info[port].supports_edp;
>> > +
>> > if (!dev_priv->vbt.child_dev_num)
>> > return false;
>> >
>> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> > index 66b5bc8..746c237 100644
>> > --- a/drivers/gpu/drm/i915/intel_dp.c
>> > +++ b/drivers/gpu/drm/i915/intel_dp.c
>> > @@ -4975,7 +4975,7 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)
>> > if (INTEL_GEN(dev_priv) < 5)
>> > return false;
>> >
>> > - if (port == PORT_A)
>> > + if (INTEL_GEN(dev_priv) < 9 && port == PORT_A)
>> > return true;
>>
>> I like the split between intel_bios.c and intel_dp.c like this.
>>
>> If we wanted to be extra careful with this, we might even consider
>> splitting the patch in two, one changing intel_dp_is_edp and the other
>> intel_bios_is_port_edp... They *are* distinct changes, after all.
>
> The change is to use the DDI port info table on DDI platforms, so
> the split wouldn't help when looking at a bisect result. But if you
> insist I can respin.
Right, never mind.
J.
>
>>
>> BR,
>> Jani.
>>
>>
>> >
>> > return intel_bios_is_port_edp(dev_priv, port);
>>
>>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
