On Mon, Nov 09, 2015 at 12:56:24PM +0100, Jiri Slaby wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > This patch has been added to the 3.12 stable tree. If you have any > objections, please let us know. > > =============== > > commit 8e7a65aa70bcc1235a44e40ae0da5056525fe081 upstream. > > We accidentally lost the initial DPLL register write in > 1c4e02746147 drm/i915: Fix DVO 2x clock enable on 830M > > The "three times for luck" hack probably saved us from a total > disaster. But anyway, bring the initial write back so that the > code actually makes some sense. > > Reported-and-tested-by: Nick Bowler <nbowler@xxxxxxxxxx> > References: http://mid.gmane.org/CAN_QmVyMaArxYgEcVVsGvsMo7-6ohZr8HmF5VhkkL4i9KOmrhw@xxxxxxxxxxxxxx > Cc: Nick Bowler <nbowler@xxxxxxxxxx> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 37a9d3c89feb..8af80f5fe210 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1379,6 +1379,8 @@ static void i9xx_enable_pll(struct intel_crtc *crtc) > > I915_WRITE(reg, dpll); > > + I915_WRITE(reg, dpll); > + I don't think 3.12 actually needs this patch as it does not contain commit 1c4e02746147, which deleted the I915_WRITE(). Cheers, -- Luís > /* Wait for the clocks to stabilize. */ > POSTING_READ(reg); > udelay(150); > -- > 2.6.3 > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html