From patchwork Tue Jul 4 15:18:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9825267 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 82FC760237 for ; Tue, 4 Jul 2017 15:20:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7418F24B48 for ; Tue, 4 Jul 2017 15:20:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68A58274B4; Tue, 4 Jul 2017 15:20:17 +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 316C424B48 for ; Tue, 4 Jul 2017 15:20:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F34D6E39A; Tue, 4 Jul 2017 15:18:59 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F30E6E389 for ; Tue, 4 Jul 2017 15:18:57 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id y5so26951315wmh.3 for ; Tue, 04 Jul 2017 08:18:57 -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=0YUrQtArmNkxx8RNIK+iHF6T7lDj1WDUT/eRdeNWBcM=; b=X4eJ7rHo16cWnC1sNd+jm/NfaKtWGfolqABeixC2dbeyoCjx1z6kMy7OOsK08n2//o uwaRImWYMKVnicbmLeDcDIwYqfdG5Sjp/UURgaGUWISjFQZ3CHd/LJLcgfWzib0d4axw dlDahfenfytuXAJOObxfGINrhu1+57tpdNe+8= 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=0YUrQtArmNkxx8RNIK+iHF6T7lDj1WDUT/eRdeNWBcM=; b=roj2dQlV1xPRZJVQS2TbZavhsoR1tiXkjpO8OCyrpq4i6eUdDxinan1uwo+ON/NsD4 rPgYefCvJp/LHidH31b1POw/gSRId8KNP8IYxrA1sdBSYWpitEniwbZTfkuEW0MVQlOF 8CJZuDnJYfM6yuZQ04mwyOxrI2Y3h+jfdNosrswFx4uHzCmtplsIUezhOLvdFNQwEBz+ dB1XpAYPtHf6I732H1u3mo0cfcjhpxfA2LZBUi0DENHD/2r0kzeu/EhdDTwrHH6Sg47o ouhUkxiuSwQ+YVgLoKTdM7TtK+d/rF+SD8FxzOFegdRsXeQduX3p5Vn0OdrUeCh1tu/L HcHA== X-Gm-Message-State: AKS2vOzrGlnvZhOspkM7gCLndTK9VLMT1n6QsZS6da3y8mldSR/yFJB8 IQwwuOr76pNfA9RJ X-Received: by 10.80.137.45 with SMTP id e42mr18853602ede.67.1499181536331; Tue, 04 Jul 2017 08:18:56 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id 2sm23676308edt.36.2017.07.04.08.18.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 08:18:55 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 4 Jul 2017 17:18:31 +0200 Message-Id: <20170704151833.17304-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170704151833.17304-1-daniel.vetter@ffwll.ch> References: <20170704151833.17304-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 11/13] drm/i915: Protect against deferred fbdev setup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 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 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 ",