diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-05-22 09:14:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-05-22 09:14:50 +1000 |
| commit | 763b2573cf59da8f906b9f2c8a2d437482761005 (patch) | |
| tree | ed144dcdc58ef14de401e8322bf6ca0bd5b93424 | |
| parent | Linux 3.15-rc6 (diff) | |
| parent | drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup (diff) | |
| download | linux-dev-763b2573cf59da8f906b9f2c8a2d437482761005.tar.xz linux-dev-763b2573cf59da8f906b9f2c8a2d437482761005.zip | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
fixes nasty panel bleeding bug.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
drm/nvd9/therm: handle another kind of PWM fan
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c index 7762665ad8fd..876de9ac3793 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c @@ -1009,7 +1009,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, } if (outp == 8) - return false; + return conf; data = exec_lookup(priv, head, outp, ctrl, dcb, &ver, &hdr, &cnt, &len, &info1); if (data == 0x0000) diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c b/drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c index 43fec17ea540..bbf117be572f 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c @@ -40,6 +40,7 @@ pwm_info(struct nouveau_therm *therm, int line) case 0x00: return 2; case 0x19: return 1; case 0x1c: return 0; + case 0x1e: return 2; default: break; } |