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

Commit 25dd1aa3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes 

single nouveau regression fix.

* 'linux-4.14' of git://github.com/skeggsb/linux:
  drm/nouveau/kms/nv50: use the correct state for base channel notifier setup
parents 0b07194b d324c5bc

drivers/gpu/drm/nouveau/nv50_display.c

+3 −3
Original line number Diff line number Diff line
@@ -4099,7 +4099,7 @@ nv50_disp_atomic_commit(struct drm_device *dev, 
{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nv50_disp *disp = nv50_disp(dev);

	struct drm_plane_state *old_plane_state;

	struct drm_plane_state *new_plane_state;

	struct drm_plane *plane;

	struct drm_crtc *crtc;

	bool active = false;
@@ -4129,8 +4129,8 @@ nv50_disp_atomic_commit(struct drm_device *dev, 
	if (ret)

		goto err_cleanup;



	for_each_old_plane_in_state(state, plane, old_plane_state, i) {

		struct nv50_wndw_atom *asyw = nv50_wndw_atom(old_plane_state);

	for_each_new_plane_in_state(state, plane, new_plane_state, i) {

		struct nv50_wndw_atom *asyw = nv50_wndw_atom(new_plane_state);

		struct nv50_wndw *wndw = nv50_wndw(plane);



		if (asyw->set.image) {