Roy Spliet
2014-Aug-02 15:15 UTC
[Nouveau] pwr/macros: Stop playing Russian roulette on data memory
This patch fixes the pwr firmware to play nicely at least on NVA3. Because Martin might send more patches soon, I didn't include a regenerated nvXX.fuc.h. To me it makes more sense if all patches are merged then, and a final patch regenerates the headers in one go. Of course, I did test this patch and found it to work as intended, so feel free to pick up as you please.
Roy Spliet
2014-Aug-02 15:15 UTC
[Nouveau] [PATCH] pwr/macros: Stop playing Russian roulette on data memory
Signed-off-by: Roy Spliet <rspliet at eclipso.eu> --- drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc index e2a63ac..5668e04 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc +++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc @@ -242,7 +242,7 @@ */ push reg /* */ pop $r13 /* */ pop $r14 /* -*/ call(wr32) /* +*/ call(wr32) #else #define nv_wr32(addr,reg) /* */ sethi $r0 0x14000000 /* -- 1.9.3
Ben Skeggs
2014-Aug-04 23:26 UTC
[Nouveau] pwr/macros: Stop playing Russian roulette on data memory
On Sun, Aug 3, 2014 at 1:15 AM, Roy Spliet <rspliet at eclipso.eu> wrote:> This patch fixes the pwr firmware to play nicely at least on NVA3. Because Martin might send more patches soon, I didn't include a regenerated nvXX.fuc.h. To me it makes more sense if all patches are merged then, and a final patch regenerates the headers in one go. Of course, I did test this patch and found it to work as intended, so feel free to pick up as you please.Nice catch :) Thanks for pointing out that the ucode changes weren't included too, I amended the commit when I merged it to include them. One small note: If patches are against the kernel rather than the nouveau tree, can you include the "drm/nouveau" prefix too? :) Thanks, Ben.> > >
Martin Peres
2014-Aug-04 23:32 UTC
[Nouveau] pwr/macros: Stop playing Russian roulette on data memory
On 05/08/2014 01:26, Ben Skeggs wrote:> On Sun, Aug 3, 2014 at 1:15 AM, Roy Spliet <rspliet at eclipso.eu> wrote: >> This patch fixes the pwr firmware to play nicely at least on NVA3. Because Martin might send more patches soon, I didn't include a regenerated nvXX.fuc.h. To me it makes more sense if all patches are merged then, and a final patch regenerates the headers in one go. Of course, I did test this patch and found it to work as intended, so feel free to pick up as you please.Roy is right, I should take the time and send you my ppwr patches. If anything, I would like this patch to be merged: http://cgit.freedesktop.org/~mperes/nouveau/commit/?h=ppwr_rework&id=b0bbe7dc6aefb68c7e305ca160f452db053633e7> Nice catch :) > > Thanks for pointing out that the ucode changes weren't included too, I > amended the commit when I merged it to include them. > > One small note: If patches are against the kernel rather than the > nouveau tree, can you include the "drm/nouveau" prefix too? :)Good to know!> > Thanks, > Ben. > >