From patchwork Tue May 23 15:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 98070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2243754vqo; Tue, 23 May 2023 08:54:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7FPrJf9EtEqlTe2RvbXhhfZbjIhXnaqU23WqiJc9S+S6zjXP8TC0Adv4OA3bM12nwHmoZ5 X-Received: by 2002:a17:902:c944:b0:1ab:675:3e0c with SMTP id i4-20020a170902c94400b001ab06753e0cmr18074062pla.33.1684857264880; Tue, 23 May 2023 08:54:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684857264; cv=none; d=google.com; s=arc-20160816; b=KePtOhq6pTVWWMTc1BT1ZHqAXWIRp+BgjWLeLEO/f6QMeS4ItM3CN4KC4a2LT6h+UJ HRd5l0j4J2vrhQ7oH6eAGY3IeISwvom2RzVKE15tVbVVdV15DG0KXK+DYki2fGly7xnZ 6xktsMbZa1WZTleWLapVjzWSzzrvdeefGup6Q6lETdooOTtZ2UNUShfYXKrUIlcJVlbr DMQO6P22I+WVAu/JyF4nDocQyFtM4cAJGzzgA9Ef2s4k/daZMttVI7sjWkt/Gyc9ZRBs u8n4Tx8IwLuMcV4lu/C0nlqeVq/31SCp2yyHqmPwtk6v55a1fAmFKDaZSYLm9p77Hlsx aWNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=LtY5sRV2royIvYJmQFhbBTCU0yrwXhWFXqkUzu39IRE=; b=ZtQmlzKZHx3GOPg1I44PDUtJgTgqJ3doaScX9iE1WJG7231m3mR1Qu9Y5zy2mLUzzc D9Iy6+BeY9+3xdNTgMtewgx1kQ9GuE7mj16ZjsR4A3mbApMZs8qSo64onfvcQmfYrqRW 4KYiePxTf2gQfpyavPNAGl7QJMCnny6vyVKKGvoBeBdEbdOqOU9YosSq1yr65ETTPkQl jxVXvS01U0mpADwxrf7ua5jMcWhS9Xr/B5fwK+feEo5oSytwyiTQSLAcQh2cZnUSq3F7 zw3pQ+vIcEDKgQiVHHaVm9gSrJgoiuKQexeJja5B9B4vDjLkXBfYEdjWfO4jwarmjz4f JEOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a170902a3cc00b001aaeda99321si2033590plb.428.2023.05.23.08.54.10; Tue, 23 May 2023 08:54:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237134AbjEWPdP (ORCPT + 99 others); Tue, 23 May 2023 11:33:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236110AbjEWPdN (ORCPT ); Tue, 23 May 2023 11:33:13 -0400 X-Greylist: delayed 1650 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 23 May 2023 08:32:46 PDT Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [195.130.137.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB870E43 for ; Tue, 23 May 2023 08:32:46 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4QQdc902Sjz4x1lW for ; Tue, 23 May 2023 17:32:41 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:b0ac:7afd:272:4cff]) by xavier.telenet-ops.be with bizsmtp id 0FXf2A00f0Jkz7G01FXfas; Tue, 23 May 2023 17:31:40 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1q1Tyu-002t3e-Jd; Tue, 23 May 2023 17:31:39 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q1Tz9-00Ckax-1x; Tue, 23 May 2023 17:31:39 +0200 From: Geert Uytterhoeven To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Laurent Pinchart , Kieran Bingham Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v3 3/5] drm: shmobile: Switch to drm_crtc_init_with_planes() Date: Tue, 23 May 2023 17:31:35 +0200 Message-Id: <2098de3d33bc479a8569da7dcbafdb685ff0a13a.1684854992.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766700891336842127?= X-GMAIL-MSGID: =?utf-8?q?1766700891336842127?= The SH-Mobile DRM driver uses the legacy drm_crtc_init(), which advertizes only the formats in safe_modeset_formats[] (XR24 and AR24) as being supported. Switch to drm_crtc_init_with_planes(), and advertize all supported (A)RGB modes, so we can use RGB565 as the default mode for the console. Signed-off-by: Geert Uytterhoeven Reviewed-by: Thomas Zimmermann Reviewed-by: Laurent Pinchart --- v3: - No changes, v2: - Add Reviewed-by. --- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index 08dc1428aa16caf0..11dd2bc803e7cb62 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -478,16 +479,41 @@ static const struct drm_crtc_funcs crtc_funcs = { .disable_vblank = shmob_drm_disable_vblank, }; +static const uint32_t modeset_formats[] = { + DRM_FORMAT_RGB565, + DRM_FORMAT_RGB888, + DRM_FORMAT_ARGB8888, + DRM_FORMAT_XRGB8888, +}; + +static const struct drm_plane_funcs primary_plane_funcs = { + DRM_PLANE_NON_ATOMIC_FUNCS, +}; + int shmob_drm_crtc_create(struct shmob_drm_device *sdev) { struct drm_crtc *crtc = &sdev->crtc.crtc; + struct drm_plane *primary; int ret; sdev->crtc.dpms = DRM_MODE_DPMS_OFF; - ret = drm_crtc_init(sdev->ddev, crtc, &crtc_funcs); - if (ret < 0) + primary = __drm_universal_plane_alloc(sdev->ddev, sizeof(*primary), 0, + 0, &primary_plane_funcs, + modeset_formats, + ARRAY_SIZE(modeset_formats), + NULL, DRM_PLANE_TYPE_PRIMARY, + NULL); + if (IS_ERR(primary)) + return PTR_ERR(primary); + + ret = drm_crtc_init_with_planes(sdev->ddev, crtc, primary, NULL, + &crtc_funcs, NULL); + if (ret < 0) { + drm_plane_cleanup(primary); + kfree(primary); return ret; + } drm_crtc_helper_add(crtc, &crtc_helper_funcs);