Acknowledged, but knowing Ben might have some work on Kepler reclocking up his sleeve I wanted to ease the git merging process a little. Feel free to fold together (or tell me I should really really do that).
Roy --- Ursprüngliche Nachricht --- Von: Ilia Mirkin <[email protected]> Datum: 17:08:28 04-09-2014 An: Roy Spliet <[email protected]> Betreff: Re: [Nouveau] [PATCH 4/8] fb/ramnve0: Disable FB before reclocking > This should probably be folded into the previous patch to avoid > breaking bisectability on nve0 > > On Thu, Sep 4, 2014 at 10:58 AM, Roy Spliet <[email protected]> wrote: > > > This used to be done implicitly > > > > Signed-off-by: Roy Spliet <[email protected]> > > --- > > drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c > > b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c > > > index c5b46e3..9764792 100644 > > --- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c > > +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c > > @@ -998,6 +998,8 @@ nve0_ram_calc_xits(struct nouveau_fb *pfb, struct > nouveau_ram_data *next) > > if (ret) > > return ret; > > > > + ram_fb_disable(fuc); > > + > > ram->mode = (next->freq > fuc->refpll.vco1.max_freq) > ? 2 : 1; > > ram->from = ram_rd32(fuc, 0x1373f4) & 0x0000000f; > > > > @@ -1061,6 +1063,9 @@ nve0_ram_calc_xits(struct nouveau_fb *pfb, struct > nouveau_ram_data *next) > > break; > > } > > > > + if (!ret) > > + ram_fb_enable(fuc); > > + > > return ret; > > } > > > > -- > > 1.9.3 > > > > > > > > _______________________________________________ > > Nouveau mailing list > > [email protected] > > http://lists.freedesktop.org/mailman/listinfo/nouveau > _______________________________________________ Nouveau mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/nouveau
