On Mon, 21 Jan 2019, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> On Mon, Jan 21, 2019 at 04:21:30PM +0200, Jani Nikula wrote:
>> With new platforms not having CRT support and most conditions in
>> intel_crt_present() being specific to DDI, split out the CRT
>> initialization to platform specific blocks in the if ladder. Add new
>> Pineview block for this.
>>
>> This puts intel_crt_init() more in line with the rest of the outputs,
>> and makes it slightly easier for the uninitiated to figure out which
>> platforms actually have what.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/intel_display.c | 37 ++++++++++++++++++----------
>> 1 file changed, 24 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>> index 2fa9f4aec08e..e8bc297c60ab 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -14245,23 +14245,17 @@ static bool has_edp_a(struct drm_i915_private *dev_priv)
>> return true;
>> }
>>
>> -static bool intel_crt_present(struct drm_i915_private *dev_priv)
>> +static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)
>> {
>> - if (INTEL_GEN(dev_priv) >= 9)
>> - return false;
>
> We should probably keep this in case the vbt is bonkers.
Oh, definitely, thanks for spotting!
>
>> -
>> if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
>> return false;
>>
>> - if (IS_CHERRYVIEW(dev_priv))
>> - return false;
>> -
>> if (HAS_PCH_LPT_H(dev_priv) &&
>> I915_READ(SFUSE_STRAP) & SFUSE_STRAP_CRT_DISABLED)
>> return false;
>>
>> /* DDI E can't be used if DDI A requires 4 lanes */
>> - if (HAS_DDI(dev_priv) && I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)
>> + if (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)
>> return false;
>>
>> if (!dev_priv->vbt.int_crt_support)
>> @@ -14323,9 +14317,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>> */
>> intel_lvds_init(dev_priv);
>>
>> - if (intel_crt_present(dev_priv))
>> - intel_crt_init(dev_priv);
>> -
>> if (IS_ICELAKE(dev_priv)) {
>> intel_ddi_init(dev_priv, PORT_A);
>> intel_ddi_init(dev_priv, PORT_B);
>> @@ -14354,6 +14345,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>> } else if (HAS_DDI(dev_priv)) {
>> int found;
>>
>> + if (intel_ddi_crt_present(dev_priv))
>> + intel_crt_init(dev_priv);
>> +
>> /*
>> * Haswell uses DDI functions to detect digital outputs.
>> * On SKL pre-D0 the strap isn't connected, so we assume
>> @@ -14385,6 +14379,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>>
>> } else if (HAS_PCH_SPLIT(dev_priv)) {
>> int found;
>> +
>> + if (dev_priv->vbt.int_crt_support)
>> + intel_crt_init(dev_priv);
>> +
>> dpd_is_edp = intel_dp_is_port_edp(dev_priv, PORT_D);
>>
>> if (has_edp_a(dev_priv))
>> @@ -14413,6 +14411,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>> } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
>> bool has_edp, has_port;
>>
>> + if (IS_VALLEYVIEW(dev_priv) && dev_priv->vbt.int_crt_support)
>> + intel_crt_init(dev_priv);
>> +
>> /*
>> * The DP_DETECTED bit is the latched state of the DDC
>> * SDA pin at boot. However since eDP doesn't require DDC
>> @@ -14455,9 +14456,15 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>> }
>>
>> vlv_dsi_init(dev_priv);
>> - } else if (!IS_GEN(dev_priv, 2) && !IS_PINEVIEW(dev_priv)) {
>> + } else if (IS_PINEVIEW(dev_priv)) {
>> + if (dev_priv->vbt.int_crt_support)
>> + intel_crt_init(dev_priv);
>> + } else if (IS_GEN_RANGE(dev_priv, 3, 4)) {
>> bool found = false;
>>
>> + if (dev_priv->vbt.int_crt_support)
>> + intel_crt_init(dev_priv);
>> +
>> if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
>> DRM_DEBUG_KMS("probing SDVOB\n");
>> found = intel_sdvo_init(dev_priv, GEN3_SDVOB, PORT_B);
>> @@ -14489,8 +14496,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>>
>> if (IS_G4X(dev_priv) && (I915_READ(DP_D) & DP_DETECTED))
>> intel_dp_init(dev_priv, DP_D, PORT_D);
>> - } else if (IS_GEN(dev_priv, 2))
>> + } else if (IS_GEN(dev_priv, 2)) {
>> + if (dev_priv->vbt.int_crt_support)
>> + intel_crt_init(dev_priv);
>
> int_crt_support is always true for pre-vlv/pre-hsw so we could
> skip the check in most of these cases. Either way is fine by me.
I added that change as a separate patch on top.
>
> With the gen9 stuff sorted this is
> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Thanks for the reviews, new series on the list.
BR,
Jani.
>
>> +
>> intel_dvo_init(dev_priv);
>> + }
>>
>> if (SUPPORTS_TV(dev_priv))
>> intel_tv_init(dev_priv);
>> --
>> 2.20.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
