From patchwork Mon Feb 12 12:40:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 128010 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3170007ljc; Mon, 12 Feb 2018 04:41:01 -0800 (PST) X-Google-Smtp-Source: AH8x226Pvo8Rru1dXCpITIrM7gVMWAeZnKhs5v93to0JJZDj4fXjt61oAL+umdeT+gDC7+wjobHh X-Received: by 10.101.67.202 with SMTP id n10mr9246805pgp.116.1518439261546; Mon, 12 Feb 2018 04:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518439261; cv=none; d=google.com; s=arc-20160816; b=l8LAH4rX+GUVLqVRcTfWyXFFmaI+XzBkDDM12/E+JDiNrK1RHQOd7eydxr88OvgURb jlMoZM9DhIk5pUoinkLnnn2Hyzvh3IsxDFnmJAnSD3w9ozY4cbSh1jEeRN9t9uZl1KBS GrSKIkPXSAmKCcY7AppGKs+inh6WzsDV4Sz4mWj4aIcNbzoLK/7W00M3y1cLnTVKzRcj ZvNyhmoAyWvAcUU5LRoapv3fOU8iYeNJ3lmHmLyK5tmKQo3H/ystZGD1nfZ0ntJ0i0z6 LbPKvo+orMUWPm9fm/kENkihjDmQFMDQ9+xuPPxqd4mFuOfd+XK/CwmhDIFsuK8EdFtO wplQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=nMsJA+V/Xwf3SciyHlUeM/3IaezAoneJiSvxq5tgmUQ=; b=duQt28xw1HsxNA1scmkDDyv2/NH8gIdYjmRUhHx06VQxzgirGRFaStzML0RyIEDPf3 spcmWRiawtZ4KfhpOTBppkQ3OherMIBNgJe549sXLdSwLyYD0PXFiUwcrh2ePkn3jIMs Kut20Z0i+4oDnM559wW7mMU83VURrk7hl65hRn0B3vGMOn59y7ro8toGxqLNKc0Y8qnI QPikpU05BK/iQAWnOS6qhxYS+0uVPMCgwVJXbNwZdidoVkz7MRhhfBuCwkxPBCQeqxh+ d9b8QUOKUdF1AIFcdrrVloHaF7qchRyeMC057wcbZXiniNZ0jJhEAC1LkQw/HQfrc+uW 0Z+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KRRjIBAB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id 31-v6si5732828pli.832.2018.02.12.04.41.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 04:41:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KRRjIBAB; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61E02892B7; Mon, 12 Feb 2018 12:40:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C0EDC892B7 for ; Mon, 12 Feb 2018 12:40:28 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id 37so1370720lfs.7 for ; Mon, 12 Feb 2018 04:40:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eedh+Ictgy0/k52BNBurZKdeNa9DMI+wTISmbIQ7+E8=; b=KRRjIBABX/FI8O2pb9ShNfBB+GrmBCKZ5CIVMlOBkinp0Ev+uh0MylW+WbOxi9vy0L tnQuXR4RkYJjF0kRR2LT+dpjMzGvh4JfEceZFlwidyUdbgRPu7HK60J2fkuCkgMv6kec zqSu/d0fsJY48Yk1JQfcs+D0GcxbZekDNw7es= 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:mime-version :content-transfer-encoding; bh=eedh+Ictgy0/k52BNBurZKdeNa9DMI+wTISmbIQ7+E8=; b=BnIcMkE5SyIUtP4JyUtk+LyL2moD2z4ixWifaPAt5HVSfCbdO+Ftumt7i1cpOZvX3J LrMvw1+bjI/wkgCAUADK7NLFHfnoFo/dS4LKqqn27fZWPWjnK1RqjgsYSc6QBdadQUIc 3PmxulbDSyOU0qCGTmmAb+/zvsReGqi0wnpsMjDJbpKMigHFrqSGsEOHKqwkac7JDEsl 2SBl3Tq15yhLsrEtR5mMl2RXkMNdkRMOYZCBz2WkHGdbKe5WhwLNwRbHZbfBDgSiVHDE OQmeJS2UVjd5NJlfLuK5ImTT6WY4RDxecKmQATG8USimC0bTZJis+Za5eqMzH4Pbp2VX /rGA== X-Gm-Message-State: APf1xPCR5BYKUSQVGXgxz4j6YWnkc187oy64+Z3AKRYbIs15uUl5ZlMD 672iQtUxizxAqFjTepUjFe/8NA== X-Received: by 10.25.162.72 with SMTP id l69mr7756578lfe.38.1518439226953; Mon, 12 Feb 2018 04:40:26 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id p14sm220535lje.56.2018.02.12.04.40.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 04:40:26 -0800 (PST) From: Linus Walleij To: Daniel Vetter , Jani Nikula , Sean Paul , Eric Anholt Subject: [PATCH] drm/pl111: Fix regression from fbdev CMA helper Date: Mon, 12 Feb 2018 13:40:19 +0100 Message-Id: <20180212124019.25268-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Commit d18df744de1a ("drm/pl111: Use drm_fb_cma_fbdev_init/fini()") refactored the driver to use fbdev handling in the core, but mistakedly limited the number of maximum connections to 0. Predictably, zero possible connections also gives zero framebuffers when using the system. So let's bump it to 1 so we get our framebuffer back. Cc: Noralf Trønnes Cc: Eric Anholt Fixes: d18df744de1a ("drm/pl111: Use drm_fb_cma_fbdev_init/fini()") Signed-off-by: Linus Walleij Acked-by: Noralf Trønnes --- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index acb738c69873..306ac7cabd90 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -138,7 +138,7 @@ static int pl111_modeset_init(struct drm_device *dev) drm_mode_config_reset(dev); - drm_fb_cma_fbdev_init(dev, 32, 0); + drm_fb_cma_fbdev_init(dev, 32, 1); drm_kms_helper_poll_init(dev);