From patchwork Thu Feb 1 13:04:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10195485 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 C116060247 for ; Thu, 1 Feb 2018 13:04:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB39828861 for ; Thu, 1 Feb 2018 13:04:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F6FC28A33; Thu, 1 Feb 2018 13:04:57 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 377A028861 for ; Thu, 1 Feb 2018 13:04:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752515AbeBANEz (ORCPT ); Thu, 1 Feb 2018 08:04:55 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:37151 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752030AbeBANEw (ORCPT ); Thu, 1 Feb 2018 08:04:52 -0500 Received: by mail-lf0-f65.google.com with SMTP id 63so26083904lfv.4 for ; Thu, 01 Feb 2018 05:04:51 -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; bh=SyU2DJ8k0aXvMOkPUQk8UMuQzTG3ImM42sd/hSwdfFU=; b=H/jICvLb5N4+yaxIG1xeTADHAget7+P12+uAApsiNLBsASv4cw5QqYMSgWpxXujwnC WsTwd/cITLUwA0vRR6X0xZGnRXZ4O2OSj3aSmTw6/oPQErQP5iPGNMNwzp+E030Bb6Nh UpM8xgtk0uX/WoVsUTQWpwmo1MgdmQk3dQfwQ= 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; bh=SyU2DJ8k0aXvMOkPUQk8UMuQzTG3ImM42sd/hSwdfFU=; b=HDEFFJNt3yGrEpBFAT/hP+KCNnYpHvio39FUWYNvYvYkadtNpRDUdd9j39IVTpEVP/ rZdfgIoBqPv6jpiUUEiAVX4x0+V8YbRR/h8A8up2sZQ+qAWdmwdMj2qLtMSpHV9JDO+6 tjb5gpbasfptFpjZaNiMqsb7PlzJ/6tIumt6X7S2pyhFHpLXPvwzgkIXsh/2hpZ9r4TZ Ktbh6Le2NkNox7I3UaWzSsKu9a8mV0oTUM324CRqABksGzUm3utkWPysE9i7OR/4I1tM VTSgf0neKx6Hxq6NAlue/cQRqRe8k5WRFoBbyFoZ/yarWeY3lrJRo6I8CApCGsti0aTs 3eMQ== X-Gm-Message-State: AKwxytdq/+PH5Gm6Hr4ArIJ2ibx7DaBfykyRQ30DYpbe9T9YbSsQzCEj UWd7PthKsLk4tRfJYA3OKZfz5w== X-Google-Smtp-Source: AH8x225NiYopLsuY019q3edB0vr6jYCefa+weEiAstJAnBJwe6tz8v1CvD9kLjxzXXj+M0JqmuyQ0g== X-Received: by 10.46.48.1 with SMTP id w1mr7476731ljw.69.1517490290947; Thu, 01 Feb 2018 05:04:50 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id f126sm2645337lff.49.2018.02.01.05.04.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Feb 2018 05:04:50 -0800 (PST) From: Linus Walleij To: Bartlomiej Zolnierkiewicz , Eric Anholt , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Dave Airlie , David Lechner Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, Linus Walleij Subject: [PATCH] drm/fb-helper: Scale back depth to supported maximum Date: Thu, 1 Feb 2018 14:04:46 +0100 Message-Id: <20180201130446.6165-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The following happened when migrating an old fbdev driver to DRM: The Integrator/CP PL111 supports 16BPP but only ARGB1555/ABGR1555 or XRGB1555/XBGR1555 i.e. the maximum depth is 15. This makes the initialization of the framebuffer fail since the code in drm_fb_helper_single_fb_probe() assigns the same value to sizes.surface_bpp and sizes.surface_depth. I.e. it simply assumes a 1-to-1 mapping between BPP and depth, which is true in most cases but typically not for this hardware. To support the odd case of a driver supporting 16BPP with only 15 bits of depth, this patch will make the code loop over the formats supported on the primary plane and cap the depth to the maximum supported. On the PL110 Integrator, this makes drm_mode_legacy_fb_format() select DRM_FORMAT_XRGB1555 which is acceptable for this driver, and thus we get framebuffer, penguin and console on the Integrator/CP. Signed-off-by: Linus Walleij --- drivers/gpu/drm/drm_fb_helper.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index e56166334455..5076f9103740 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1720,6 +1720,8 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, int i; struct drm_fb_helper_surface_size sizes; int gamma_size = 0; + struct drm_plane *plane; + int best_depth = 0; memset(&sizes, 0, sizeof(struct drm_fb_helper_surface_size)); sizes.surface_depth = 24; @@ -1727,7 +1729,10 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, sizes.fb_width = (u32)-1; sizes.fb_height = (u32)-1; - /* if driver picks 8 or 16 by default use that for both depth/bpp */ + /* + * If driver picks 8 or 16 by default use that for both depth/bpp + * to begin with + */ if (preferred_bpp != sizes.surface_bpp) sizes.surface_depth = sizes.surface_bpp = preferred_bpp; @@ -1762,6 +1767,39 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, } } + /* + * If we run into a situation where, for example, the primary plane + * supports RGBA5551 (16 bpp, depth 15) but not RGB565 (16 bpp, depth + * 16) we need to scale down the depth of the sizes we request. + */ + drm_for_each_plane(plane, fb_helper->dev) { + /* Only check the primary plane */ + if (plane->type != DRM_PLANE_TYPE_PRIMARY) + continue; + + for (i = 0; i < plane->format_count; i++) { + const struct drm_format_info *fmt; + + fmt = drm_format_info(plane->format_types[i]); + /* We found a perfect fit, great */ + if (fmt->depth == sizes.surface_depth) + break; + + /* Skip depths above what we're looking for */ + if (fmt->depth > sizes.surface_depth) + continue; + + /* Best depth found so far */ + if (fmt->depth > best_depth) + best_depth = fmt->depth; + } + } + if (sizes.surface_depth != best_depth) { + DRM_DEBUG("requested bpp %d, scaled depth down to %d", + sizes.surface_bpp, best_depth); + sizes.surface_depth = best_depth; + } + crtc_count = 0; for (i = 0; i < fb_helper->crtc_count; i++) { struct drm_display_mode *desired_mode;