diff options
| author | Dave Airlie | 2012-08-29 12:05:40 +0200 |
|---|---|---|
| committer | Dave Airlie | 2012-08-29 12:05:40 +0200 |
| commit | f08859a9b08024067e178ad3b158164477140a0a (patch) | |
| tree | a61195e3160127c00057833bd13f0c3329c0a222 | |
| parent | drm: Check for invalid cursor flags (diff) | |
| parent | drm/nvc0/copy: check PUNITS to determine which copy engines are disabled (diff) | |
| download | kernel-qcow2-linux-f08859a9b08024067e178ad3b158164477140a0a.tar.gz kernel-qcow2-linux-f08859a9b08024067e178ad3b158164477140a0a.tar.xz kernel-qcow2-linux-f08859a9b08024067e178ad3b158164477140a0a.zip | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Ben says its just a single fix to avoid the wrong pcopy units being used.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/copy: check PUNITS to determine which copy engines are disabled
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 1866dbb49979..c61014442aa9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -736,9 +736,11 @@ nouveau_card_init(struct drm_device *dev) } break; case NV_C0: - nvc0_copy_create(dev, 1); + if (!(nv_rd32(dev, 0x022500) & 0x00000200)) + nvc0_copy_create(dev, 1); case NV_D0: - nvc0_copy_create(dev, 0); + if (!(nv_rd32(dev, 0x022500) & 0x00000100)) + nvc0_copy_create(dev, 0); break; default: break; |