On Mon, May 26, 2014 at 06:19:07PM +0300, Mika Kuoppala wrote: > deepak.s@xxxxxxxxxxxxxxx writes: > > > From: Deepak S <deepak.s@xxxxxxxxxxxxxxx> > > > > Signed-off-by: Deepak S <deepak.s@xxxxxxxxxxxxxxx> > > [vsyrjala: Fix merge fubmle where the code ended up in > > g4x_disable_trickle_feed() instead of cherryview_init_clock_gating()] > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Acked-by: Ben Widawsky <ben@xxxxxxxxxxxx> > > --- > > drivers/gpu/drm/i915/intel_pm.c | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > > index 08dcdc5..0b73a6d 100644 > > --- a/drivers/gpu/drm/i915/intel_pm.c > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > @@ -4026,7 +4026,18 @@ static void cherryview_enable_rps(struct drm_device *dev) > > GEN6_RP_UP_BUSY_AVG | > > GEN6_RP_DOWN_IDLE_AVG); > > > > + /* ToDo: Update the mem freq based on latest spec [CHV]*/ > > Please do and consider fixing the vlv decoding. It seems to be off > too. Poke about this one here. Iirc the situation on vlv is simply terminal confusion, and iirc the current code matches reality of shipping vbiosen, but not any spec. I hope we're bettter for chv. -Daniel > > -Mika > > > val = vlv_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS); > > + switch ((val >> 6) & 3) { > > + case 0: > > + case 1: > > + case 2: > > + dev_priv->mem_freq = 1600; > > + break; > > + case 3: > > + dev_priv->mem_freq = 2000; > > + break; > > + } > > > > DRM_DEBUG_DRIVER("GPLL enabled? %s\n", val & 0x10 ? "yes" : "no"); > > DRM_DEBUG_DRIVER("GPU status: 0x%08x\n", val); > > -- > > 1.9.1 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx