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: 872038 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1236::1; helo=casper.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="KHmgwFfw"; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="elDC4vlJ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="KRRjIBAB"; dkim-atps=neutral Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zg55K6W8Bz9s82 for ; Mon, 12 Feb 2018 23:46:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=qO/5xSw82VJsIqRGLxKRTpYO288wcUKqKOs2L7Gt2h4=; b=KHmgwFfwqyd8h75QuDO8uRMmjb oAL4mckTnl/JWTYkYvz/GfSUm+cbcBqM3ARsaPdAuNSs9rqRqgU6CpoWHQVLoihb1QwgrqRPCuh/h kfAhIId0q/PIKw9Sv/U7BtJyrVR6NiEUmXci5wNm6r7S9t5jDzicbtPtXXhlmYSn5pO3dncw+O4RZ fxfZtRKODJu2V/fizHNhjQ8QaLW8SpBSJ92Sv5rhU2r4bYf3joT9whlSJPqumrgvWEsDqUgYB345W SzntfST3b1UU2upTTkrZqa3Qsnlpvy/KAbO3wi1Lgw1yIzhUL+d8+Vz5EIvspdT6SeYrycx51zV/q NERgeDfg==; Received: from [198.137.202.133] (helo=bombadil.infradead.org) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elDUw-00052U-Nv for incoming-imx@patchwork.ozlabs.org; Mon, 12 Feb 2018 12:46:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qO/5xSw82VJsIqRGLxKRTpYO288wcUKqKOs2L7Gt2h4=; b=elDC4vlJByYIs3 zOB2NSRKv4lDf/NolOGvMoT+g/bl0Gcv6/u1AoUM7grCgoj0jeP4Hr3V+qEDqCHy8aZsUXnX531pZ aCaQOjayH2c9y1Lf0QhCSJ6IN5SAm82eeI8QfK4Dx4oRLcHUkyHV+4bjhwDVIBSHtIotJQlzPVBOd PaK0b91U+NsZtQk9N5xI9EeWdGGtForEAJj6YVOAz7FYR8EgXWW05WcijBk32d7Ft0Fw5eRWckvfl ilbc5DkEcZYnm4bwJTFpl/XhCNd/7jXTQa3j4iX/UGlzDi0fyFF6M/Xj970jWazTNj2Hfl6ZkRzuR 51eX+AGGg9WwOAbAzjQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1elDUd-0004ie-Gt; Mon, 12 Feb 2018 12:45:59 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elDUZ-0004YD-Me for linux-arm-kernel@lists.infradead.org; Mon, 12 Feb 2018 12:45:57 +0000 Received: by mail-lf0-x243.google.com with SMTP id k19so20276938lfj.1 for ; Mon, 12 Feb 2018 04:45:43 -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=XYy1cSapH0NqGIqGaUGLgho7YyggBiyZi+UChjI20J8HzH+3zk5kAqSj/u+nBnMPKT kONb9hFFBNYDbzM78XZ6JEyFNAm/mXu2VZD2zArIVaTZv/iVM1tjW41lHVOV7Mn8L94M CuQe39TWjeLg8ZFGGZWS8pHJ4GemqfXRmL2hQqA2UToXbnOZZa7ouFsxh0TltXaFTfoz tjgamwRiSMQuKmeE9gSayY2QRrxSMZsKIA+xb0wXwpYZvpf9OB13MTAzjjhoCZwCOuKu zytXUf5Eu61Rm9Qt87vjrNAw+4ec9yNZddGs7WpwmadUiMRq8EA4q7DYnvf4Wfhmw+BT w76g== X-Gm-Message-State: APf1xPB+aepFw6oqrzVhI1DgBO+DrATLO13JswcVbnDSrTzih8FNGTVt hLZm2/05J2/oHvqQ5IzW+EaZeQ== X-Google-Smtp-Source: AH8x227ea5+UGVmAUVm41HXUuER/qJabEmdOrXm0OBIJLhNHmspJMY69BZg3mmupst3ZIy874wmrFg== 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-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4010:c07:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , =?utf-8?q?Noralf_Tr=C3=B8nne?= =?utf-8?q?s?= , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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);