diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 06:49:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 06:49:24 +0100 |
| commit | c0cba03baa0d285b1a8f9d3481be1868df7af1ad (patch) | |
| tree | 21d424834879b6128ce0c05f467d54dd8da67364 /drivers/gpu/drm/radeon/si.c | |
| parent | cdfe1565c094f60fef00238884aff2c781dd0784 (diff) | |
| parent | 4a48ed2334b7ae61dd11bb114fa35bd4ebdc1ca0 (diff) | |
| download | talos-op-linux-c0cba03baa0d285b1a8f9d3481be1868df7af1ad.tar.gz talos-op-linux-c0cba03baa0d285b1a8f9d3481be1868df7af1ad.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Just radeon and nouveau, mostly regressions fixers, and a couple of
radeon register checker fixes."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau: fix acpi edid retrieval
drm/nvc0/disp: fix regression in vblank semaphore release
drm/nv40/mpeg: fix context handling
drm/nv40/graph: fix typo in type names
drm/nv41/vm: fix typo in type name
drm/radeon/si: add some missing regs to the VM reg checker
drm/radeon/cayman: add some missing regs to the VM reg checker
drm/radeon/dce3: switch back to old pll allocation order for discrete
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index b0db712060fb..4422d630b33b 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -2474,6 +2474,7 @@ static bool si_vm_reg_valid(u32 reg) /* check config regs */ switch (reg) { case GRBM_GFX_INDEX: + case CP_STRMOUT_CNTL: case VGT_VTX_VECT_EJECT_REG: case VGT_CACHE_INVALIDATION: case VGT_ESGS_RING_SIZE: |
