Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e139047 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c66a86d0 60025251

drivers/gpu/drm/nouveau/nouveau_state.c

+0 −2
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) 
		engine->vram.flags_valid	= nv50_vram_flags_valid;

		break;

	case 0xC0:

	case 0xD0:

		engine->instmem.init		= nvc0_instmem_init;

		engine->instmem.takedown	= nvc0_instmem_takedown;

		engine->instmem.suspend		= nvc0_instmem_suspend;
@@ -923,7 +922,6 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) 
		dev_priv->card_type = NV_50;

		break;

	case 0xc0:

	case 0xd0:

		dev_priv->card_type = NV_C0;

		break;

	default:

drivers/gpu/drm/radeon/evergreen.c

+4 −1
Original line number Diff line number Diff line
@@ -2248,6 +2248,9 @@ int evergreen_mc_init(struct radeon_device *rdev) 


	/* Get VRAM informations */

	rdev->mc.vram_is_ddr = true;

	if (rdev->flags & RADEON_IS_IGP)

		tmp = RREG32(FUS_MC_ARB_RAMCFG);

	else

		tmp = RREG32(MC_ARB_RAMCFG);

	if (tmp & CHANSIZE_OVERRIDE) {

		chansize = 16;

drivers/gpu/drm/radeon/nid.h

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ 
#define	CGTS_USER_TCC_DISABLE				0x914C

#define		TCC_DISABLE_MASK				0xFFFF0000

#define		TCC_DISABLE_SHIFT				16

#define	CGTS_SM_CTRL_REG				0x915C

#define	CGTS_SM_CTRL_REG				0x9150

#define		OVERRIDE				(1 << 21)



#define	TA_CNTL_AUX					0x9508