Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfb4f929 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nouveau/nvkm: add/remove 0's to make 7 (or 9)-nibble constants use 8 nibbles 



Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 700c18ca

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) 


	gk104_grctx_generate_rop_active_fbps(gr);



	nvkm_mask(device, 0x5044b0, 0x8000000, 0x8000000);

	nvkm_mask(device, 0x5044b0, 0x08000000, 0x08000000);



	gf100_gr_wait_idle(gr);

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c

+4 −4
Original line number Diff line number Diff line
@@ -216,11 +216,11 @@ r1373f4_fini(struct gk104_ramfuc *fuc) 
	ram_wr32(fuc, 0x1373ec, tmp | (v1 << 16));

	ram_mask(fuc, 0x1373f0, (~ram->mode & 3), 0x00000000);

	if (ram->mode == 2) {

		ram_mask(fuc, 0x1373f4, 0x00000003, 0x000000002);

		ram_mask(fuc, 0x1373f4, 0x00001100, 0x000000000);

		ram_mask(fuc, 0x1373f4, 0x00000003, 0x00000002);

		ram_mask(fuc, 0x1373f4, 0x00001100, 0x00000000);

	} else {

		ram_mask(fuc, 0x1373f4, 0x00000003, 0x000000001);

		ram_mask(fuc, 0x1373f4, 0x00010000, 0x000000000);

		ram_mask(fuc, 0x1373f4, 0x00000003, 0x00000001);

		ram_mask(fuc, 0x1373f4, 0x00010000, 0x00000000);

	}

	ram_mask(fuc, 0x10f800, 0x00000030, (v0 ^ v1) << 4);

}

drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ nv40_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable) 
{

	struct nvkm_subdev *subdev = &therm->subdev;

	struct nvkm_device *device = subdev->device;

	u32 mask = enable ? 0x80000000 : 0x0000000;

	u32 mask = enable ? 0x80000000 : 0x00000000;

	if      (line == 2) nvkm_mask(device, 0x0010f0, 0x80000000, mask);

	else if (line == 9) nvkm_mask(device, 0x0015f4, 0x80000000, mask);

	else {