From patchwork Thu Jul 6 13:00:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9828249 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CFA7860361 for ; Thu, 6 Jul 2017 13:00:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C152D28621 for ; Thu, 6 Jul 2017 13:00:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B646728628; Thu, 6 Jul 2017 13:00:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 870B728621 for ; Thu, 6 Jul 2017 13:00:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 52D836E5F8; Thu, 6 Jul 2017 13:00:34 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8899B6E5F0 for ; Thu, 6 Jul 2017 13:00:32 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id z78so232214lff.2 for ; Thu, 06 Jul 2017 06:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nKysu1zs++8813w44Jn75eB0DALB4bavSnv+HVRdF9M=; b=Gz44kObrRPc7xRYccoQ/MIluK7P4N80NloUKv3Ws0/21U4bXR3Vu9DuJoJVMmIJLaL u6yuLHXlelq07qeUNzAxdQ/kddG6ZLhHo9YIa1b3jc4KOMlDvTy1aJAAMnUArk/g2hKx qQHNBes5HwWojlRpfPDNS2ZoOGZD/dKr0APMQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nKysu1zs++8813w44Jn75eB0DALB4bavSnv+HVRdF9M=; b=hEwmrvQyB5lUM2/ydJTQaN66xtx1F2HI0kFfduzgCvk8Is3Q5kmRtCvx2KSGHt3QWt 8IuNJJdPFUpiQAgLErmUwN3AbUGXbJjtgHZNGCycvnCXmmqjDekI/RDk1kldztWlJEC+ sXO+6Z7UG3C0vOAdhTWr4y4Y8W48nunhICacoVWcJ2pcCMw13XdiVORNJsMzvFD1kMIj 4TJFkK19SiofHYRhfFk+mdzbjp6tgewwhFqMQRcsdfRxW/j/D+aaHpviX+tDzH5oKvTl MSOpeBKe3aHgNySpxnlF+jkuB8/5nTe5Ac1QzC7DN7jsIewq6uPvJwYRTNGtuFgc0hil /NCg== X-Gm-Message-State: AKS2vOybFbdshzDtAcp19KcSMNhIrYPwWI+c898tgOfvX1DmvdiVGsgY y0NPQh62ZAylvle+mj4= X-Received: by 10.80.159.78 with SMTP id b72mr25534029edf.150.1499346030282; Thu, 06 Jul 2017 06:00:30 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id a20sm132884edd.60.2017.07.06.06.00.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jul 2017 06:00:29 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/5] drm/i915: Protect against deferred fbdev setup Date: Thu, 6 Jul 2017 15:00:20 +0200 Message-Id: <20170706130023.28417-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170706130023.28417-1-daniel.vetter@ffwll.ch> References: <20170706130023.28417-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reported-by: Maarten Lankhorst Reviewed-by: Maarten Lankhorst Signed-off-by: Daniel Vetter --- 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 643f56b8b87c..9f7e7730bb82 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 ",