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

Commit eb94345a authored by Samuel Pitoiset's avatar Samuel Pitoiset Committed by Ben Skeggs
Browse files

drm/nouveau/pm: fix signals/sources for GT200+ 



Signed-off-by: default avatarSamuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 94a2ef69

drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
const struct nvkm_specsrc

gt200_crop_sources[] = {

	{ 0x407008, (const struct nvkm_specmux[]) {

			{ 0x7, 0, "sel0", true },

			{ 0xf, 0, "sel0", true },

			{ 0x1f, 16, "sel1", true },

			{}

		}, "pgraph_rop0_crop_pm_mux" },
@@ -45,7 +45,7 @@ gt200_prop_sources[] = { 
const struct nvkm_specsrc

gt200_tex_sources[] = {

	{ 0x408508, (const struct nvkm_specmux[]) {

			{ 0x3fff, 0, "unk0" },

			{ 0xfffff, 0, "unk0" },

			{}

		}, "pgraph_tpc0_tex_unk08" },

	{}
@@ -105,7 +105,7 @@ gt200_pm[] = { 
			{ 0xec, "pc01_trailer" },

			{}

		}, &nv40_perfctr_func },

	{ 0xe0, (const struct nvkm_specsig[]) {

	{ 0xf0, (const struct nvkm_specsig[]) {

			{ 0x55, "pc02_crop_00", gt200_crop_sources },

			{ 0x56, "pc02_crop_01", gt200_crop_sources },

			{ 0x57, "pc02_crop_02", gt200_crop_sources },

drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c

+1 −2
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ 
 */

#include "nv40.h"



// TODO: check for GT200

static const struct nvkm_specsrc

gt215_zcull_sources[] = {

	{ 0x4002ca4, (const struct nvkm_specmux[]) {

	{ 0x402ca4, (const struct nvkm_specmux[]) {

			{ 0x7fff, 0, "unk0" },

			{ 0xff, 24, "unk24" },

			{}