Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 763b2573 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-next' of... 

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
parents 4b660a7f 0f1d360b

drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

		}