提交 35bb5089 编写于 作者: B Ben Skeggs

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

Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
上级 1e054157
...@@ -487,7 +487,6 @@ struct nouveau_pm_level { ...@@ -487,7 +487,6 @@ struct nouveau_pm_level {
u32 copy; u32 copy;
u32 daemon; u32 daemon;
u32 vdec; u32 vdec;
u32 unk05; /* nv50:nva3, roughly.. */
u32 unka0; /* nva3:nvc0 */ u32 unka0; /* nva3:nvc0 */
u32 hub01; /* nvc0- */ u32 hub01; /* nvc0- */
u32 hub06; /* nvc0- */ u32 hub06; /* nvc0- */
......
...@@ -301,8 +301,7 @@ nouveau_perf_init(struct drm_device *dev) ...@@ -301,8 +301,7 @@ nouveau_perf_init(struct drm_device *dev)
perflvl->core = ROM16(entry[8]) * 1000; perflvl->core = ROM16(entry[8]) * 1000;
perflvl->shader = ROM16(entry[10]) * 1000; perflvl->shader = ROM16(entry[10]) * 1000;
perflvl->memory = ROM16(entry[12]) * 1000; perflvl->memory = ROM16(entry[12]) * 1000;
/*XXX: confirm on 0x35 */ perflvl->vdec = ROM16(entry[16]) * 1000;
perflvl->unk05 = ROM16(entry[16]) * 1000;
break; break;
case 0x40: case 0x40:
#define subent(n) (ROM16(entry[perf[2] + ((n) * perf[3])]) & 0xfff) * 1000 #define subent(n) (ROM16(entry[perf[2] + ((n) * perf[3])]) & 0xfff) * 1000
......
...@@ -154,7 +154,7 @@ nouveau_pm_perflvl_set(struct drm_device *dev, struct nouveau_pm_level *perflvl) ...@@ -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_CORE, perflvl->core);
nouveau_pm_clock_set(dev, perflvl, PLL_SHADER, perflvl->shader); 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_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; pm->cur = perflvl;
...@@ -222,7 +222,7 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *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); ret = pm->clock_get(dev, PLL_UNK05);
if (ret > 0) if (ret > 0)
perflvl->unk05 = ret; perflvl->vdec = ret;
} }
if (pm->voltage.supported && pm->voltage_get) { if (pm->voltage.supported && pm->voltage_get) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册