From patchwork Tue Feb 6 12:18:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 126994 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2864488ljc; Tue, 6 Feb 2018 04:19:44 -0800 (PST) X-Google-Smtp-Source: AH8x227iA9GHcNfVZIs2iEczFq9Vf1Hq4PSTdEW9FtGOevuNm5qcEDyxjmTlrrmZ/1Si7DVtsHNS X-Received: by 2002:a17:902:b496:: with SMTP id y22-v6mr2211880plr.206.1517919584400; Tue, 06 Feb 2018 04:19:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517919584; cv=none; d=google.com; s=arc-20160816; b=AQSlOTWe3oI51HfRpaF0aqEjMO1Oe2/DUqby7IOKu78XzoMxzaeBK1xNgYnrC6NAOZ M5Jt36PFB2QL/WJzgFDrRS48vx2YgrB93+os2pdz7AWz0cvVUUJU0DQFMQ1p2rcMXDpH B5kJWRvlEopLzPtq1ho7pq/7cSE/BMJN6w4wOPGIJUMVKxRPP8fXowbiWaKwqceh8uXC JjAOlr6k1LHwYzMSIiieJBY4XUMYtDdtOLuZw4zJVIZWPZ56ppUtDsLqrycp3Qsl48OJ A/4UdvbTAejMBzQ1bXlvtjgdIzEzqvvKjTYtNyy95NhD8NB2BQqQ9WUoeiAkoPeTduxI 0+/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=2Q0TBUnnnWOR/dmfkG0MGc5XYSAS+rc+383Ol+HRqXk=; b=EThRw5K1r1WT8zPRBEEaPwFC0Ne0NwAiGFsDs5M5+hgn57oajLJHHAmzUdR8HsU1Se TAZnTNLXZ+55m6nPYhkVizTDVE23H/Yir8RtuxnpznZEFgat5FbUxvAcW+lYhMyu3jxo JpSbDI5lQw/BGBGDgSmQ30CaAGnJqnUQNuvcrrtrtzDoqkKsaDV+oMLxp+DI09ZSfFZL 8CzETypVWG7PTRLIcGppDM9TgdMONCcCTyZCygwbH4LNz4Q7l/27pslhRgdZIhqTMStb zcUywbvTyX3ASTNfBz/enU2Amr7mRLF9/f8QXw56uDxL2rLWL/EAQvn60Hyw0gV/f4aF ic2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HAafFOoi; 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 g16si2777053pfh.248.2018.02.06.04.19.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Feb 2018 04:19:44 -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=HAafFOoi; 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 C36ED6E3C7; Tue, 6 Feb 2018 12:19:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 603A46E3C7 for ; Tue, 6 Feb 2018 12:19:10 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id t139so2450796lff.0 for ; Tue, 06 Feb 2018 04:19:10 -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:in-reply-to:references; bh=f7JnaHsjAjqOXqK52gFDjiX1ejLP7oS1DOQ3Qkp2poU=; b=HAafFOoif1iXLzWwQpe16ypliwomRIkwq49ktjDvN7599fvCE/IR+UfN06iTwgOUL7 ualVklQEVwxVN8Q5rvOym7lbb7JXiNKM9BYyWL//RdWJJ6qX7yPskE7hPiO7PkixR+w6 qGtvfnVI45viCTHQJD3tBuSnjYADWLKhQV5g0= 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=f7JnaHsjAjqOXqK52gFDjiX1ejLP7oS1DOQ3Qkp2poU=; b=tH1U7aHStbUz2sCaWIy+YraI+qNXdm0ioezDvpagZ4162syiK+Pd6E03TKyEPb2XhV uBp9zTOrmsUusVL8NYhKf/Oqf5Ptx0/bQNEn6mMgrJiz2jImbEc3EhgQodjOQ8/thJeT yDaqoOWgFwXNY4yRV34XTmqlh7wa2Cf8E/QiiWimZ/zfZn01ltf/kRgBv1z1LO8cE6xW PwWNxGAdVvDpPJMkg+dFYrO2kNLsm8Hulz9D8Bv25CD3tzMUAVq4F/NvhUFudluah9u3 RF8RU5pZiM32Iryd4AaGA0Z1zvYWCURfDbzU5756JnPyamVNTYZcAPUA8y30+BOxNX2D e0EA== X-Gm-Message-State: APf1xPCEZGW/gWNV49HXde4xmjTuZU7fZAylG8GNUhi30bRc38VuTrcT M1mqZ2xlUYeQjOs/x3pS71WXng== X-Received: by 10.46.36.21 with SMTP id k21mr1549325ljk.14.1517919548758; Tue, 06 Feb 2018 04:19:08 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id f11sm598631lja.63.2018.02.06.04.19.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Feb 2018 04:19:08 -0800 (PST) From: Linus Walleij To: Daniel Vetter , Jani Nikula , Sean Paul , Eric Anholt , Peter Ujfalusi , Tomi Valkeinen Subject: [PATCH 2/3] drm/pl111: Make the default BPP a per-variant variable Date: Tue, 6 Feb 2018 13:18:53 +0100 Message-Id: <20180206121854.4407-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180206121854.4407-1-linus.walleij@linaro.org> References: <20180206121854.4407-1-linus.walleij@linaro.org> 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 MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The PL110, Integrator and Versatile boards strongly prefer to use 16 BPP even if other modes are supported, both to keep down memory consumption and also to easier find a good match to supported resolutions with consideration taken to the memory bandwidth of the platforms. Signed-off-by: Linus Walleij Reviewed-by: Eric Anholt --- drivers/gpu/drm/pl111/pl111_drm.h | 2 ++ drivers/gpu/drm/pl111/pl111_drv.c | 4 +++- drivers/gpu/drm/pl111/pl111_versatile.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h index d74076c6b7ef..9f2d30b52e7a 100644 --- a/drivers/gpu/drm/pl111/pl111_drm.h +++ b/drivers/gpu/drm/pl111/pl111_drm.h @@ -43,6 +43,7 @@ struct drm_minor; * @broken_vblank: the vblank IRQ is broken on this variant * @formats: array of supported pixel formats on this variant * @nformats: the length of the array of supported pixel formats + * @fb_bpp: desired bits per pixel on the default framebuffer */ struct pl111_variant_data { const char *name; @@ -52,6 +53,7 @@ struct pl111_variant_data { bool broken_vblank; const u32 *formats; unsigned int nformats; + unsigned int fb_bpp; }; struct pl111_drm_dev_private { diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 221f3af02fb4..f5d5aa464ae2 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -191,7 +191,7 @@ static int pl111_modeset_init(struct drm_device *dev) drm_mode_config_reset(dev); - priv->fbdev = drm_fbdev_cma_init(dev, 32, + priv->fbdev = drm_fbdev_cma_init(dev, priv->variant->fb_bpp, dev->mode_config.num_connector); if (IS_ERR(priv->fbdev)) { dev_err(dev->dev, "Failed to initialize CMA framebuffer\n"); @@ -354,6 +354,7 @@ static const struct pl111_variant_data pl110_variant = { .is_pl110 = true, .formats = pl110_pixel_formats, .nformats = ARRAY_SIZE(pl110_pixel_formats), + .fb_bpp = 16, }; /* RealView, Versatile Express etc use this modern variant */ @@ -378,6 +379,7 @@ static const struct pl111_variant_data pl111_variant = { .name = "PL111", .formats = pl111_pixel_formats, .nformats = ARRAY_SIZE(pl111_pixel_formats), + .fb_bpp = 32, }; static const struct amba_id pl111_id_table[] = { diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c index 11024ad64181..9825f6d52788 100644 --- a/drivers/gpu/drm/pl111/pl111_versatile.c +++ b/drivers/gpu/drm/pl111/pl111_versatile.c @@ -241,6 +241,7 @@ static const struct pl111_variant_data pl110_integrator = { .broken_vblank = true, .formats = pl110_integrator_pixel_formats, .nformats = ARRAY_SIZE(pl110_integrator_pixel_formats), + .fb_bpp = 16, }; /* @@ -253,6 +254,7 @@ static const struct pl111_variant_data pl110_versatile = { .external_bgr = true, .formats = pl110_versatile_pixel_formats, .nformats = ARRAY_SIZE(pl110_versatile_pixel_formats), + .fb_bpp = 16, }; int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)