Commit 5aa8a937 authored Jun 16, 2014 by Matt Roper Committed by Daniel Vetter Jun 16, 2014

drm/i915: Handle disabled primary plane in debugfs i915_display_info (v2)



Now that the primary plane can be disabled independently of the CRTC,
the debugfs code needs to be updated to recognize when the primary plane
is disabled and not try to return information about the primary plane's
framebuffer.

This change prevents a NULL dereference when reading i915_display_info
with a disabled primary plane.

v2: Replace a seq_printf() with seq_puts() (suggested by Damien)

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 8c0f92e1

drivers/gpu/drm/i915/i915_debugfs.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -2220,9 +2220,12 @@ static void intel_crtc_info(struct seq_file m, struct intel_crtc intel_crtc)
		struct drm_crtc *crtc = &intel_crtc->base;
		struct intel_encoder *intel_encoder;

		if (crtc->primary->fb)
		seq_printf(m, "\tfb: %d, pos: %dx%d, size: %dx%d\n",
		crtc->primary->fb->base.id, crtc->x, crtc->y,
		crtc->primary->fb->width, crtc->primary->fb->height);
		else
		seq_puts(m, "\tprimary plane disabled\n");
		for_each_encoder_on_crtc(dev, crtc, intel_encoder)
		intel_encoder_info(m, intel_crtc, intel_encoder);
		}