diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-21 07:13:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-21 07:13:56 +1000 |
| commit | e9f211ad7d65b264998928cea822c11c88e5586b (patch) | |
| tree | 5d24895f6a9bdb7c8438f405867fc1b61b549fd5 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | 2e82b5dd47d826baf0f6e34334fe6b899aa6ad1e (diff) | |
| parent | 33b903e82873ba9233bd89c44d016b87347ed158 (diff) | |
| download | linux-e9f211ad7d65b264998928cea822c11c88e5586b.tar.gz linux-e9f211ad7d65b264998928cea822c11c88e5586b.tar.bz2 linux-e9f211ad7d65b264998928cea822c11c88e5586b.zip | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
restore debugfs vbios, fix multiple actions with supervisor intrs
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: restore debugfs/vbios.rom support
drm/nv50-/kms: remove UPDATE methods after each encoder disconnect
drm/nvd0/disp: handle multiple actions from one set of supervisor intrs
drm/nv50/disp: handle multiple actions from one set of supervisor intrs
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 45624c37e29f..a6237c9cbbc3 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -1519,9 +1519,6 @@ nv50_dac_disconnect(struct drm_encoder *encoder) evo_mthd(push, 0x0180 + (or * 0x020), 1); evo_data(push, 0x00000000); } - - evo_mthd(push, 0x0080, 1); - evo_data(push, 0x00000000); evo_kick(push, mast); } } @@ -1735,9 +1732,6 @@ nv50_sor_disconnect(struct drm_encoder *encoder) evo_mthd(push, 0x0200 + (or * 0x20), 1); evo_data(push, 0x00000000); } - - evo_mthd(push, 0x0080, 1); - evo_data(push, 0x00000000); evo_kick(push, mast); } @@ -2039,9 +2033,6 @@ nv50_pior_disconnect(struct drm_encoder *encoder) evo_mthd(push, 0x0700 + (or * 0x040), 1); evo_data(push, 0x00000000); } - - evo_mthd(push, 0x0080, 1); - evo_data(push, 0x00000000); evo_kick(push, mast); } } |