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: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 41899eccf57043683ab196d7f145a644f9e8c181..89747bebbfc7f613df53262fdeca0f830b0d36d8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -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 },

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index a1e31ea2ecbf25131332ba7799c01aa920ea46ad..dff121d8896f56c8e624d2a92d360d647b1760bc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -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,

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index ea620d8de007e462782a24d311bde6828c729599..9177358616b09dd37523297bf79829877a74ad38 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -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;
        }