On Mon, Dec 23, 2019 at 12:59:55PM -0800, Lucas De Marchi wrote: > On Fri, Dec 20, 2019 at 10:11:15PM +0000, Chris Wilson wrote: > >Quoting Lucas De Marchi (2019-12-20 22:06:50) > >> According to intel_detect_preproduction_hw(), the SKL steeping D0 is > >> still pre-preproduction so we can nuke the additional workaround. > >> > >> While at it, nuke dangling new line. > >> > >> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> > > > >Ville and Jani are more likely to know if the pre-production comment is > >telling porkies. > > Bspec 7534 says "The DDIA port presence strap is not connected on the SKL A-C steppings." > > I would expect to catch a failure in CI if the spec was wrong. I can add > the bspec # to the commit message while fixing up the typos there. IIRC the w/a db has this listed as "forever". So not really sure what the truth is on this one. But easy enough to revert if it doesn't work out I supoose. Maybe toss in a note about the w/a db thing into the commit message? > > > Lucas De Marchi > > >-Chris > > > >> --- > >> drivers/gpu/drm/i915/display/intel_display.c | 9 +-------- > >> 1 file changed, 1 insertion(+), 8 deletions(-) > >> > >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > >> index e6702b9b9117..4aa7dfa88c7c 100644 > >> --- a/drivers/gpu/drm/i915/display/intel_display.c > >> +++ b/drivers/gpu/drm/i915/display/intel_display.c > >> @@ -16018,14 +16018,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) > >> 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 > >> - * it's there. > >> - */ > >> found = I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED; > >> - /* WaIgnoreDDIAStrap: skl */ > >> - if (found || IS_GEN9_BC(dev_priv)) > >> + if (found) > >> intel_ddi_init(dev_priv, PORT_A); > >> > >> /* DDI B, C, D, and F detection is indicated by the SFUSE_STRAP > >> @@ -16046,7 +16040,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) > >> if (IS_GEN9_BC(dev_priv) && > >> intel_bios_is_port_present(dev_priv, PORT_E)) > >> intel_ddi_init(dev_priv, PORT_E); > >> - > >> } else if (HAS_PCH_SPLIT(dev_priv)) { > >> int found; > >> > >> -- > >> 2.24.0 > >> -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx