drm/nv50/pm: s/unk05/vdec/

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 48483504edb44f48e6f74e0de8ae5b0f73152e60..880fdd183bf75a6781bc9bd9d8a2d762b5d6f091 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -487,7 +487,6 @@ struct nouveau_pm_level {
        u32 copy;
        u32 daemon;
        u32 vdec;
-       u32 unk05;      /* nv50:nva3, roughly.. */
        u32 unka0;      /* nva3:nvc0 */
        u32 hub01;      /* nvc0- */
        u32 hub06;      /* nvc0- */

diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
index 6ea57c91162b2808f6891f169980f459a19c390a..da584e3a8f6a86c253036852e6e0b43be619c6a5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -301,8 +301,7 @@ nouveau_perf_init(struct drm_device *dev)
                        perflvl->core = ROM16(entry[8]) * 1000;
                        perflvl->shader = ROM16(entry[10]) * 1000;
                        perflvl->memory = ROM16(entry[12]) * 1000;
-                       /*XXX: confirm on 0x35 */
-                       perflvl->unk05 = ROM16(entry[16]) * 1000;
+                       perflvl->vdec = ROM16(entry[16]) * 1000;
                        break;
                case 0x40:
 #define subent(n) (ROM16(entry[perf[2] + ((n) * perf[3])]) & 0xfff) * 1000

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 3ebc3f575c58636296542964a82a30c0096b14bb..ea620d8de007e462782a24d311bde6828c729599 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->unk05);
+               nouveau_pm_clock_set(dev, perflvl, PLL_UNK05, perflvl->vdec);
        }
 
        pm->cur = perflvl;
@@ -222,7 +222,7 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)
 
                ret = pm->clock_get(dev, PLL_UNK05);
                if (ret > 0)
-                       perflvl->unk05 = ret;
+                       perflvl->vdec = ret;
        }
 
        if (pm->voltage.supported && pm->voltage_get) {