diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-07-10 00:09:33 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-10 00:09:33 (GMT) |
| commit | 093fa5d05332f3e53396ca2dc10a25c50d58b68b (patch) | |
| tree | 2b991520dcc975b441cb95f44ef64c0c9a453d56 /drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c | |
| parent | 4f440cd534359f689cb577c68f8491d1eddf0b76 (diff) | |
| parent | 0b4e8e7fd506d4ddb96f71230252d14066ce1597 (diff) | |
| download | linux-093fa5d05332f3e53396ca2dc10a25c50d58b68b.tar.xz | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
A couple of DP regression fixes, kepler memory reclocking fixes, and a fix for an annoying display issue that can pop up on resume.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/ram: fix test for gpio presence
drm/nouveau/dp: workaround broken display
drm/nouveau/dp: fix required link bandwidth calculations
drm/nouveau/kms: restore fbcon after display has been resumed
drm/nv50-/kms: pass a non-zero value for head to sor dpms methods
drm/nouveau/fb: Prevent inlining of ramfuc_reg
drm/gk104/ram: bash mpll bit 31 on
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c index e183277..7a1ebdf 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c @@ -87,6 +87,7 @@ nv50_sor_mthd(struct nouveau_object *object, u32 mthd, void *args, u32 size) struct nvkm_output_dp *outpdp = (void *)outp; switch (data) { case NV94_DISP_SOR_DP_PWR_STATE_OFF: + nouveau_event_put(outpdp->irq); ((struct nvkm_output_dp_impl *)nv_oclass(outp)) ->lnk_pwr(outpdp, 0); atomic_set(&outpdp->lt.done, 0); |