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

Commit d4cca9e1 authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs
Browse files

drm/nv50/pm: s/PLL_UNK05/PLL_VDEC/ 



Following to "drm/nv50/pm: s/unk05/vdec/", let's rename the PLL to PLL_VDEC

PLL names are purely indicative and are based on the most important engine
it clocks.

Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent dd1da8de

drivers/gpu/drm/nouveau/nouveau_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -4719,7 +4719,7 @@ static struct pll_mapping nv84_pll_mapping[] = { 
	{ PLL_CORE  , 0x004028 },

	{ PLL_SHADER, 0x004020 },

	{ PLL_MEMORY, 0x004008 },

	{ PLL_UNK05 , 0x004030 },

	{ PLL_VDEC  , 0x004030 },

	{ PLL_UNK41 , 0x00e818 },

	{ PLL_VPLL0 , 0x614100 },

	{ PLL_VPLL1 , 0x614900 },

drivers/gpu/drm/nouveau/nouveau_bios.h

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ enum pll_types { 
	PLL_SHADER = 0x02,

	PLL_UNK03  = 0x03,

	PLL_MEMORY = 0x04,

	PLL_UNK05  = 0x05,

	PLL_VDEC   = 0x05,

	PLL_UNK40  = 0x40,

	PLL_UNK41  = 0x41,

	PLL_UNK42  = 0x42,

drivers/gpu/drm/nouveau/nouveau_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ nouveau_pm_perflvl_set(struct drm_device *dev, struct nouveau_pm_level *perflvl) 
		nouveau_pm_clock_set(dev, perflvl, PLL_CORE, perflvl->core);

		nouveau_pm_clock_set(dev, perflvl, PLL_SHADER, perflvl->shader);

		nouveau_pm_clock_set(dev, perflvl, PLL_MEMORY, perflvl->memory);

		nouveau_pm_clock_set(dev, perflvl, PLL_UNK05, perflvl->vdec);

		nouveau_pm_clock_set(dev, perflvl, PLL_VDEC, perflvl->vdec);

	}



	pm->cur = perflvl;
@@ -220,7 +220,7 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *perflvl) 
		if (ret > 0)

			perflvl->shader = ret;



		ret = pm->clock_get(dev, PLL_UNK05);

		ret = pm->clock_get(dev, PLL_VDEC);

		if (ret > 0)

			perflvl->vdec = ret;

	}