drm/i915: Handle disabled primary plane in debugfs i915_display_info
Subsystems (2)
PATCH 1/1 drm/i915: Handle disabled primary plane in debugfs i915_display_info
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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -3
@@ -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; -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); +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_printf (m,"\tprimary plane disabled\n" );for_each_encoder_on_crtc (dev, crtc, intel_encoder)intel_encoder_info (m, intel_crtc, intel_encoder); }
Signature · 1 line
1.8.5.1
Quoted 20 lines · Matt Roper
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_infowith a disabled primary plane.Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -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;
drivers/gpu/drm/i915/i915_debugfs.c static void intel_crtc_info(struct seq_file *m, struct intel_crtc *intel_crtc) · line 2228
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-3-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); +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_printf (m,"\tprimary plane disabled\n" );
seq_puts()
Quoted 3 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0for_each_encoder_on_crtc (dev, crtc, intel_encoder)intel_encoder_info (m, intel_crtc, intel_encoder); }
Signature · 1 line
Damien
PATCH 1/1 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)
--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -3
@@ -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; -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); +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); }
Signature · 1 line
1.8.5.1
Daniel Vetter
AppliedRe: [PATCH] drm/i915: Handle disabled primary plane in debugfs i915_display_info (v2)
Quoted 11 lines · Matt Roper
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_infowith a disabled primary plane.v2: Replace a
seq_printf()withseq_puts()(suggested by Damien)Signed-off-by Matt Roper <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 31 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-3@@ -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; -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); +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); }Signature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch