mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
drm/nv40: initialise 0x17xx on all chipsets that have it
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
c693931d93
commit
1380da4979
1 changed files with 2 additions and 12 deletions
|
@ -6,27 +6,17 @@
|
||||||
int
|
int
|
||||||
nv40_mc_init(struct drm_device *dev)
|
nv40_mc_init(struct drm_device *dev)
|
||||||
{
|
{
|
||||||
struct drm_nouveau_private *dev_priv = dev->dev_private;
|
|
||||||
uint32_t tmp;
|
|
||||||
|
|
||||||
/* Power up everything, resetting each individual unit will
|
/* Power up everything, resetting each individual unit will
|
||||||
* be done later if needed.
|
* be done later if needed.
|
||||||
*/
|
*/
|
||||||
nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
|
nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
|
||||||
|
|
||||||
switch (dev_priv->chipset) {
|
if (nv44_graph_class(dev)) {
|
||||||
case 0x44:
|
u32 tmp = nv_rd32(dev, NV04_PFB_FIFO_DATA);
|
||||||
case 0x46: /* G72 */
|
|
||||||
case 0x4e:
|
|
||||||
case 0x4c: /* C51_G7X */
|
|
||||||
tmp = nv_rd32(dev, NV04_PFB_FIFO_DATA);
|
|
||||||
nv_wr32(dev, NV40_PMC_1700, tmp);
|
nv_wr32(dev, NV40_PMC_1700, tmp);
|
||||||
nv_wr32(dev, NV40_PMC_1704, 0);
|
nv_wr32(dev, NV40_PMC_1704, 0);
|
||||||
nv_wr32(dev, NV40_PMC_1708, 0);
|
nv_wr32(dev, NV40_PMC_1708, 0);
|
||||||
nv_wr32(dev, NV40_PMC_170C, tmp);
|
nv_wr32(dev, NV40_PMC_170C, tmp);
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue