[PATCH 11/13] drm/i915: Protect against deferred fbdev setup
Maarten Lankhorst
maarten.lankhorst at linux.intel.com
Wed Jul 5 10:08:15 UTC 2017
Op 04-07-17 om 17:18 schreef Daniel Vetter:
> We could probably hit this already with our current async fbdev init,
> but it's much easier to hit this with the new deferred fbdev setup
> that I'm working on polishing.
>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Reported-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 580bd4f4a49e..a4224566ebca 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1931,7 +1931,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
> return ret;
>
> #ifdef CONFIG_DRM_FBDEV_EMULATION
> - if (dev_priv->fbdev) {
> + if (dev_priv->fbdev && dev_priv->fbdev->helper.fb) {
> fbdev_fb = to_intel_framebuffer(dev_priv->fbdev->helper.fb);
>
> seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ",
Since patch 10/13 makes it way more likely we don't allocate a FB, this patch should be commited before it?
More information about the dri-devel
mailing list