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

Commit e3641d3f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: move debug output back to the right place 



When adding the pipe config computation step I've accidentally moved
this a bit away. Which momentarily confused me since the pipe config
step rejected some modesetting operations I expected and so left me
looking in vain for that debug output.

v2: Move the debug output into the right function to prevent this from
happening again.

v3: Make it compile (Ville). Also reorder the patch so that the two
bugfixes are first.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e29a18fa

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -7744,6 +7744,9 @@ intel_modeset_affected_pipes(struct drm_crtc *crtc, unsigned *modeset_pipes, 
	 */

	*modeset_pipes &= 1 << intel_crtc->pipe;

	*prepare_pipes &= 1 << intel_crtc->pipe;



	DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n",

		      *modeset_pipes, *prepare_pipes, *disable_pipes);

}



static bool intel_crtc_in_use(struct drm_crtc *crtc)
@@ -7974,9 +7977,6 @@ static int __intel_set_mode(struct drm_crtc *crtc, 
		}

	}



	DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n",

		      modeset_pipes, prepare_pipes, disable_pipes);



	for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc)

		intel_crtc_disable(&intel_crtc->base);