tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/nv40: initialise 0x17xx on all chipsets that have it
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+2
-12
+2
-12
drivers/gpu/drm/nouveau/nv40_mc.c
+2
-12
drivers/gpu/drm/nouveau/nv40_mc.c
···
6
6
int
7
7
nv40_mc_init(struct drm_device *dev)
8
8
{
9
-
struct drm_nouveau_private *dev_priv = dev->dev_private;
10
-
uint32_t tmp;
11
-
12
9
/* Power up everything, resetting each individual unit will
13
10
* be done later if needed.
14
11
*/
15
12
nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
16
13
17
-
switch (dev_priv->chipset) {
18
-
case 0x44:
19
-
case 0x46: /* G72 */
20
-
case 0x4e:
21
-
case 0x4c: /* C51_G7X */
22
-
tmp = nv_rd32(dev, NV04_PFB_FIFO_DATA);
14
+
if (nv44_graph_class(dev)) {
15
+
u32 tmp = nv_rd32(dev, NV04_PFB_FIFO_DATA);
23
16
nv_wr32(dev, NV40_PMC_1700, tmp);
24
17
nv_wr32(dev, NV40_PMC_1704, 0);
25
18
nv_wr32(dev, NV40_PMC_1708, 0);
26
19
nv_wr32(dev, NV40_PMC_170C, tmp);
27
-
break;
28
-
default:
29
-
break;
30
20
}
31
21
32
22
return 0;