Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
Revert "drm/nvc0: recognise 0xdX chipsets as NV_C0"
drm/radeon/kms: fix typo in cayman reg offset
drm/radeon/kms: use correct reg on fusion when reading back mem config
+5
-4
-2
drivers/gpu/drm/nouveau/nouveau_state.c
-2
drivers/gpu/drm/nouveau/nouveau_state.c
···
371
371
engine->vram.flags_valid = nv50_vram_flags_valid;
372
372
break;
373
373
case 0xC0:
374
-
case 0xD0:
375
374
engine->instmem.init = nvc0_instmem_init;
376
375
engine->instmem.takedown = nvc0_instmem_takedown;
377
376
engine->instmem.suspend = nvc0_instmem_suspend;
···
922
923
dev_priv->card_type = NV_50;
923
924
break;
924
925
case 0xc0:
925
-
case 0xd0:
926
926
dev_priv->card_type = NV_C0;
927
927
break;
928
928
default:
+4
-1
drivers/gpu/drm/radeon/evergreen.c
+4
-1
drivers/gpu/drm/radeon/evergreen.c
···
2248
2248
2249
2249
/* Get VRAM informations */
2250
2250
rdev->mc.vram_is_ddr = true;
2251
-
tmp = RREG32(MC_ARB_RAMCFG);
2251
+
if (rdev->flags & RADEON_IS_IGP)
2252
+
tmp = RREG32(FUS_MC_ARB_RAMCFG);
2253
+
else
2254
+
tmp = RREG32(MC_ARB_RAMCFG);
2252
2255
if (tmp & CHANSIZE_OVERRIDE) {
2253
2256
chansize = 16;
2254
2257
} else if (tmp & CHANSIZE_MASK) {
+1
-1
drivers/gpu/drm/radeon/nid.h
+1
-1
drivers/gpu/drm/radeon/nid.h