From patchwork Fri Mar 31 14:48:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 77803 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp622352vqo; Fri, 31 Mar 2023 07:55:40 -0700 (PDT) X-Google-Smtp-Source: AKy350YNfjH5+0hjxdPcI9DupAVy2P0Vua7zjc+reVJJMq9O4QFCl5MDKijYtMlGcgV2kbJi8YQJ X-Received: by 2002:aa7:d313:0:b0:4f9:e6f1:5c7c with SMTP id p19-20020aa7d313000000b004f9e6f15c7cmr27670584edq.32.1680274539985; Fri, 31 Mar 2023 07:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680274539; cv=none; d=google.com; s=arc-20160816; b=y++Uwyy7ndiqwj5tFyWUWq4fiHohYPFHuDVukxqUGQELcwGWM0urBGKn8ODt2v6mJq oG13EJV9Xpt9iCZYkaLGY1RR0kyigdetXR69yYObGiWgM+ez5adXZi5l1rN6m/A6puAP aFYOEZPimm2JO3J4l0gepSWlKtb3mLfOgtG5wn2RpzpjsDI8u9l7en/sjr5MCy11Feht BkdOCFkTHk3GMHyQGsnLbM4lCoV+avZ2QPxB+g0ws/wx4MUpNGS7WoZDqpH3yKbN8jRm 8GJ89qIrroey+dGcmXwglYjzdOcWLTCowT3/XaxBwqSSnGUe+F6HVum3O1XDHc7BrVFc iZTg== 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=vf8a1fUeXIEzr6cEn1Poic/QMLRN0fhcoOVIF8rJgzo=; b=cycvbw+zNrx9kauQTYB368t9o91DW8fURQoUlAyaKixW4Fq4fKC8VWimsQNSKnW3jR 3AfarrNjHQkJy0kBe9YylmZs6yebZhVnhxNdt6izUAJpaDR7TIfVsegCWRrFA0OHusQm sHzdV/1aRGXI9FTmYrqfcBm98S+4vAgziD+jAuFmi0SYr2hkJzfrL/NL49xjNTTS3cAt Ra6ChjyILj5k7nz/Om+yjcLoqeofj4nmsbDHU3oJgeiwoW2Nc5FCBBI+WaOEAGf/eSei gLIsD/UY275hevWhn8n6nQdqyfakG/EfUoeWpnHVshRHZO/mNgl5Qapk/TAEVC4QIVXa 8n7A== 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 c9-20020aa7d609000000b004fc24481138si2111918edr.340.2023.03.31.07.55.14; Fri, 31 Mar 2023 07:55:39 -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 S233086AbjCaOxX (ORCPT + 99 others); Fri, 31 Mar 2023 10:53:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233003AbjCaOxG (ORCPT ); Fri, 31 Mar 2023 10:53:06 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF86E20C20 for ; Fri, 31 Mar 2023 07:52:41 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by michel.telenet-ops.be with bizsmtp id f2se2900l1C8whw062seLb; Fri, 31 Mar 2023 16:52:39 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1piG2N-00FUgb-4H; Fri, 31 Mar 2023 16:48:16 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1piG36-008fIS-Hl; Fri, 31 Mar 2023 16:48:16 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 1/5] drm: shmobile: Use %p4cc to print fourcc codes Date: Fri, 31 Mar 2023 16:48:07 +0200 Message-Id: <1912536b0972568efc3d4f96c89de96b2abd7510.1680273039.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=-0.4 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761895555957477122?= X-GMAIL-MSGID: =?utf-8?q?1761895555957477122?= Replace the printing of hexadecimal fourcc format codes by pretty-printed format names, using the "%p4cc" format specifier. Signed-off-by: Geert Uytterhoeven --- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 ++-- drivers/gpu/drm/shmobile/shmob_drm_kms.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index d354ab3077cecf94..713a7612244c647a 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c @@ -355,8 +355,8 @@ static int shmob_drm_crtc_mode_set(struct drm_crtc *crtc, format = shmob_drm_format_info(crtc->primary->fb->format->format); if (format == NULL) { - dev_dbg(sdev->dev, "mode_set: unsupported format %08x\n", - crtc->primary->fb->format->format); + dev_dbg(sdev->dev, "mode_set: unsupported format %p4cc\n", + &crtc->primary->fb->format->format); return -EINVAL; } diff --git a/drivers/gpu/drm/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/shmobile/shmob_drm_kms.c index 60a2c8d8a0d947d2..3c5fe3bc183c7c13 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_kms.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_kms.c @@ -96,8 +96,8 @@ shmob_drm_fb_create(struct drm_device *dev, struct drm_file *file_priv, format = shmob_drm_format_info(mode_cmd->pixel_format); if (format == NULL) { - dev_dbg(dev->dev, "unsupported pixel format %08x\n", - mode_cmd->pixel_format); + dev_dbg(dev->dev, "unsupported pixel format %p4cc\n", + &mode_cmd->pixel_format); return ERR_PTR(-EINVAL); } From patchwork Fri Mar 31 14:48:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 77804 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp624682vqo; Fri, 31 Mar 2023 07:59:52 -0700 (PDT) X-Google-Smtp-Source: AKy350bLezNAJkJWSulwaunAQSk+876XIg1d8TC8sYhU4n3drliJiGUQOTvSKK5Fg3hqZKER80sU X-Received: by 2002:a62:1807:0:b0:625:a34a:89fd with SMTP id 7-20020a621807000000b00625a34a89fdmr22335260pfy.16.1680274792616; Fri, 31 Mar 2023 07:59:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680274792; cv=none; d=google.com; s=arc-20160816; b=CnyMnWEyq++X7ey9xCBONvK0K/i+qOotjlDWu/xFzADbh7ldDwVOdGiZWFHPQl8rut PNQMl1L6FY7YYwOrD0SV047PJaBTmFP9tprOXcAVdMo2n5LAZpl45mRPmZaah9jQ/4mI DeQG4RJwM7bi18a7iKyPu2zAWqLZkUXll836KLarh7OJbSfMPXD5YWNZmmxDzA5s1TwK LV4Vy59GiyTz1qI6R6p8osP494LAOgeRH+svQQDeDRIt/MH90m961zA8316cUMI6bOcj A/o19R2YbBXtlyR/iVT5/QSQTBzDwksINHHIhcmXj0FZigjTUG/SR2KAI6yRH1fzWt5Z 6rcw== 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=5fivgZpUxcWROmOBG2hJl6/AojmI3NLgVt9Z5Xb8yRs=; b=H90h/EzaKHVys1XYgw+eYU6B3hFHJ5KaxiRSIERDis5tR/JEoh17LQDwhG0KDVojsq Y4RVgUG9cGdRFGkGmBsuKwREXW1U40oxfLlkjLof206uUu6zM1SkCaSp4e6rUBXNxCvK E+RGU230h/g0s7CgYjmUtWDzGaBBiaMB+NKorRl7lPWC2oKtjPhFIrfjcG5xs+wDWs7u 3EcevBmtf3xMoHmM6H3v+h/ADWetBRBtEkrxaQag9zwnjKtucjL8iq+v3SGozsQH7Dd8 SWA+A74eDX1RKj3OXFHpFKnNTribo9lrUTd/ssvwKi1/Twfzz7N+8eFNyL3CYTNQSjB4 sUCg== 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 v7-20020aa799c7000000b0059d96ba730dsi2712143pfi.110.2023.03.31.07.59.40; Fri, 31 Mar 2023 07:59:52 -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 S233117AbjCaOx3 (ORCPT + 99 others); Fri, 31 Mar 2023 10:53:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232920AbjCaOxG (ORCPT ); Fri, 31 Mar 2023 10:53:06 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC0832060A for ; Fri, 31 Mar 2023 07:52:41 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by albert.telenet-ops.be with bizsmtp id f2se2900Q1C8whw062sej3; Fri, 31 Mar 2023 16:52:39 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1piG2N-00FUgc-4c; Fri, 31 Mar 2023 16:48:16 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1piG36-008fIV-IQ; Fri, 31 Mar 2023 16:48:16 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/5] drm: shmobile: Add support for DRM_FORMAT_XRGB8888 Date: Fri, 31 Mar 2023 16:48:08 +0200 Message-Id: <34ad1c1798b37a68ce08cffa8402be497ac2162e.1680273039.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=-0.4 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761895820960947999?= X-GMAIL-MSGID: =?utf-8?q?1761895820960947999?= DRM_FORMAT_XRGB8888 aka XR24 is the modus francus of DRM, and should be supported by all drivers. The handling for DRM_FORMAT_XRGB8888 is similar to DRM_FORMAT_ARGB8888, just ignore the alpha channel. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 1 + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 5 +++++ drivers/gpu/drm/shmobile/shmob_drm_plane.c | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index 713a7612244c647a..08dc1428aa16caf0 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c @@ -232,6 +232,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) value = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS; break; case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_XRGB8888: default: value = LDDDSR_LS; break; diff --git a/drivers/gpu/drm/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/shmobile/shmob_drm_kms.c index 3c5fe3bc183c7c13..99381cc0abf3ae1f 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_kms.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_kms.c @@ -39,6 +39,11 @@ static const struct shmob_drm_format_info shmob_drm_format_infos[] = { .bpp = 32, .yuv = false, .lddfr = LDDFR_PKF_ARGB32, + }, { + .fourcc = DRM_FORMAT_XRGB8888, + .bpp = 32, + .yuv = false, + .lddfr = LDDFR_PKF_ARGB32, }, { .fourcc = DRM_FORMAT_NV12, .bpp = 12, diff --git a/drivers/gpu/drm/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/shmobile/shmob_drm_plane.c index 604ae23825daaafd..850986cee848226a 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_plane.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_plane.c @@ -80,6 +80,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, format |= LDBBSIFR_SWPL | LDBBSIFR_SWPW | LDBBSIFR_SWPB; break; case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_XRGB8888: default: format |= LDBBSIFR_SWPL; break; @@ -95,6 +96,9 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, case DRM_FORMAT_ARGB8888: format |= LDBBSIFR_AL_PK | LDBBSIFR_RY | LDDFR_PKF_ARGB32; break; + case DRM_FORMAT_XRGB8888: + format |= LDBBSIFR_AL_1 | LDBBSIFR_RY | LDDFR_PKF_ARGB32; + break; case DRM_FORMAT_NV12: case DRM_FORMAT_NV21: format |= LDBBSIFR_AL_1 | LDBBSIFR_CHRR_420; @@ -231,6 +235,7 @@ static const uint32_t formats[] = { DRM_FORMAT_RGB565, DRM_FORMAT_RGB888, DRM_FORMAT_ARGB8888, + DRM_FORMAT_XRGB8888, DRM_FORMAT_NV12, DRM_FORMAT_NV21, DRM_FORMAT_NV16, From patchwork Fri Mar 31 14:48:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 77809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp630916vqo; Fri, 31 Mar 2023 08:06:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Y9RfQYCndprFFBFznkp6KPnUGKE00YMSIiv9e8bkLvsnU+o9aT7B6BUKig1IavQzef4MnP X-Received: by 2002:a17:907:7784:b0:930:e2c:ddc3 with SMTP id ky4-20020a170907778400b009300e2cddc3mr26733918ejc.72.1680275180037; Fri, 31 Mar 2023 08:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680275180; cv=none; d=google.com; s=arc-20160816; b=Wr7eJoLc54vsyEZjjbKYmn7I24vTOgKaMOppsgEkj+3HdSafwWh0uxA2ToU0h+Usjl +Suy2CtGGu/AZ0JpF7/Zo7LtGKRasV8EabtXboVW12Gjy1tUrDImis4jzVIqyTz+nwA/ /leXPxtajS4JGR4HozlJ65fNRoQaz1HbmtOWvioNxl+iM7tniIqIlVD3F9U4U9zWhvre uvsax8bxMUgel5g16FGjaV5t/esX2pZtTr65j8lXq5sL3RVnIhBYzYQR9c5dQORDAu0J nweMM0xllhLQXLrJQA76zSncACtP0+HJUgXoYFgGRdI8n1usgHidOazmj0JLgg/955WG B5ig== 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=+8SOPXPUwkhPiNRO52O13EH03/wXsQzRe14BeVil9p4=; b=SL9gKgIb7OWRt07reUum0chm/YEqPbqxVz9pEav+kugPqiKnYkF4kjgUi1GzVOFz/9 M/xMR8H10hidsx6Yp8JV6G6AsnqTqMA/FUx/yTCT9Q6lYlS7wkjySgTHzLyJIJOqRmp2 c2D3TSdvecNIEYuUJ0p1YIL9j3r9JH1gw51DMAra6wH9Y1PIq4oyrZd0E17FWn5rgBwq RKf46NG/YJxVM0hH/322IwSXmALKDNf6VjNjqVf6blU42hHay58m7qdPn8tzHJ5IK/q/ +Fo7SI1rhvCDhMJubMel0iNHKnf8tjj+QFZ1mkPkkGSxvdqwo/u2YhsXIHknV2uDfjKK vTSQ== 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 m8-20020a1709062b8800b0093defbd6270si2000442ejg.1015.2023.03.31.08.05.56; Fri, 31 Mar 2023 08:06:20 -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 S233069AbjCaOxU (ORCPT + 99 others); Fri, 31 Mar 2023 10:53:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232997AbjCaOxG (ORCPT ); Fri, 31 Mar 2023 10:53:06 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE4A02063B for ; Fri, 31 Mar 2023 07:52:41 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by albert.telenet-ops.be with bizsmtp id f2se2900R1C8whw062sej5; Fri, 31 Mar 2023 16:52:39 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1piG2N-00FUgh-5E; Fri, 31 Mar 2023 16:48:16 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1piG36-008fIa-J5; Fri, 31 Mar 2023 16:48:16 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 3/5] drm: shmobile: Switch to drm_crtc_init_with_planes() Date: Fri, 31 Mar 2023 16:48:09 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.4 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761896226715949249?= X-GMAIL-MSGID: =?utf-8?q?1761896226715949249?= 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: Laurent Pinchart --- 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); From patchwork Fri Mar 31 14:48:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 77811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp631952vqo; Fri, 31 Mar 2023 08:07:30 -0700 (PDT) X-Google-Smtp-Source: AKy350bFfFa+MfnQJ4YPDFiOKUfS44CJs4GUlbvkFKyF6EfzQ288wULQEcmh5lnknbLGkdDkMsFn X-Received: by 2002:a17:906:5d0b:b0:930:2e3c:c6aa with SMTP id g11-20020a1709065d0b00b009302e3cc6aamr5693152ejt.49.1680275250218; Fri, 31 Mar 2023 08:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680275250; cv=none; d=google.com; s=arc-20160816; b=F4yJ59R/J7jUupxZ7sI2lTowy4XXhUKOZN6z/JuthDUzbVj49f4RAAccKKx519l7za 09jNospQpxMqBRMWa0AkFvWQV41DG9kOtLHHVAInyiFmJCoFAzB5fImhYw+eCyaCAD5V E4P6MwRqgBa7bWbKXugDSq46HfHwfJVXlrcvJ6Ek20j2zbeyMTZzE/XVSR7ocMxlp3Wm akQWo99CowwWD1NOM6vuU8LV/NLH8QSi2bvk4g1cstCTiHWRMo67d5raPdTIQ6UjzX0m jyeqwcd3az6+2r/bg8IxwFKMukp76Le9ffyMcV4p3GI5su+ZkCiZZJJInbwwsGpoI7o5 XXGQ== 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=hcldYcPvb5eICcimV07zzAuH999B6OHbZRHEfjdu/CY=; b=BjGuqXxCbMCgg9tHvbJCKB2+kmXIr5Hib8CICq4aZFWf4I+vHd1ZleP4AayUXTlnWV tuQFceM/b7lzdL9qxCSIP7i+H7C5xTkoS0mTmsZKStAKJxoW76+n9JKl2icZE4xkNsaP zvKgP7B/rjwxyjIgW2BP25zB0oMWWivbg7XvJHgAdEE6PXGQ5LZmPDEyvxH6QN166dpa mGs5SwRoWqCH07rpGeUuW+eDJOXUcEC9ZEYItWNYjinv70cXdxXjc4x1F/ux0xyhreLo Sj1IbWwrQ0eOVRgPdN//2nKzfkXb1STLpRWWwaSBD+Oor/ZAuT0ivCoF6PRVLyZ9XrXa ZBtQ== 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 f23-20020a1709062c5700b009474ed68236si1570563ejh.687.2023.03.31.08.07.06; Fri, 31 Mar 2023 08:07:30 -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 S233103AbjCaOx0 (ORCPT + 99 others); Fri, 31 Mar 2023 10:53:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233002AbjCaOxG (ORCPT ); Fri, 31 Mar 2023 10:53:06 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DED4620C12 for ; Fri, 31 Mar 2023 07:52:41 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by michel.telenet-ops.be with bizsmtp id f2se2900k1C8whw062seLc; Fri, 31 Mar 2023 16:52:39 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1piG2N-00FUgj-5w; Fri, 31 Mar 2023 16:48:16 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1piG36-008fIe-Jm; Fri, 31 Mar 2023 16:48:16 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH 4/5] drm: shmobile: Add missing call to drm_fbdev_generic_setup() Date: Fri, 31 Mar 2023 16:48:10 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.4 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761896300735799222?= X-GMAIL-MSGID: =?utf-8?q?1761896300735799222?= Set up generic fbdev emulation, to enable support for the Linux console. Use 16 as the preferred depth, as that is a good compromise between colorfulness and resource utilization, and the default of the fbdev driver. Suggested-by: Laurent Pinchart Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index faacfee24763b1d4..30493ce874192e3e 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -271,6 +272,8 @@ static int shmob_drm_probe(struct platform_device *pdev) if (ret < 0) goto err_irq_uninstall; + drm_fbdev_generic_setup(ddev, 16); + return 0; err_irq_uninstall: From patchwork Fri Mar 31 14:48:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 77810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp631145vqo; Fri, 31 Mar 2023 08:06:35 -0700 (PDT) X-Google-Smtp-Source: AKy350b85RdRX1mA39wkoyU0nDfM0IchyiMtsh8qDObkIbcKgBZXDQabkg+PoJ41D1bmvaNj0TPQ X-Received: by 2002:a17:907:7fa9:b0:947:791b:fdcb with SMTP id qk41-20020a1709077fa900b00947791bfdcbmr5175955ejc.21.1680275195283; Fri, 31 Mar 2023 08:06:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680275195; cv=none; d=google.com; s=arc-20160816; b=fdmQfjT5cqUMbJc+m+z0VFtQjOhyGFVZLQ7BybE69wfqxleh0ORfg9olGzwJVpxuqU kcoNjt7gGq5ECDZeX8uIygUmUVUmf+Si9zH8DIY8srCPXOaLievC/Z5JuKpNTkhsgWRG A8K1pMolHXkDWead3u22VPhmQer2DtT4hTTMk31HqeBLkFpnnYeOGj8Bii287gtFZB1O 1myPR66Pxdpk9wgu/RV96dmT3TX3cmKXOfpN2NhXc2N4qQG8stM37JWfCSItN57KenYG iz4ZipdS4Oq7xy2YiLBynLqnigD7maGI5lt3hWnP3PLZNr317OGgShYynX4K/oKwtP/i BOww== 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=QR00zHL8jXUwF1KFFvQtD6nCURor5Za4lDcDIncSA8Q=; b=wkZSi/NbxSqAoYIS7eZLhS+VwjBhh6KxZcz7TzfCqeeWUg96ua8BuXxFpp131cvBu9 JvSeaQOE615UUcMAl3IZx50SiRg4HsHDLgfiSKCHYEqahRHPpT9OKD9O7JlFya+UaBLL 0quBmMLr3J7R9RL34dDk1h3UTITPG/C4WcGRzCJ0Oianv1WoXnVIyvP6FYrO37zogjj9 7U5pKawS29xa7vpqIBSIZho9UIb2naqXcxClvzKrmvunRS0skNz/yJsg/WQLEfv0Mwc3 Oddyo8lBvraXSIbqhcr5ulD6mcW9MIpTGT05BWaSNiOUgyJleai/Lc/ZC4/KTwrk9QCt 3k5A== 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 gw1-20020a170906f14100b00933c194cd1dsi1810522ejb.804.2023.03.31.08.06.05; Fri, 31 Mar 2023 08:06:35 -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 S233009AbjCaOxS (ORCPT + 99 others); Fri, 31 Mar 2023 10:53:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232995AbjCaOxF (ORCPT ); Fri, 31 Mar 2023 10:53:05 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF4FE20C1A for ; Fri, 31 Mar 2023 07:52:41 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by albert.telenet-ops.be with bizsmtp id f2se2900N1C8whw062sej2; Fri, 31 Mar 2023 16:52:39 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1piG2N-00FUgr-6b; Fri, 31 Mar 2023 16:48:16 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1piG36-008fIi-KO; Fri, 31 Mar 2023 16:48:16 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 5/5] drm: shmobile: Make DRM_SHMOBILE visible on Renesas SoC platforms Date: Fri, 31 Mar 2023 16:48:11 +0200 Message-Id: <972e66cd36e9173ea6817d41565f708cb84bc2f4.1680273039.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=-0.4 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761896243199976233?= X-GMAIL-MSGID: =?utf-8?q?1761896243199976233?= The LCD Controller supported by the drm-shmob driver is not only present on SuperH SH-Mobile SoCs, but also on Renesas ARM SH/R-Mobile SoCs. Make its option visible, so the user can enable support for it. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/shmobile/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/shmobile/Kconfig b/drivers/gpu/drm/shmobile/Kconfig index 4ec5dc74a6b0b880..719d4e7a5cd75aad 100644 --- a/drivers/gpu/drm/shmobile/Kconfig +++ b/drivers/gpu/drm/shmobile/Kconfig @@ -2,7 +2,7 @@ config DRM_SHMOBILE tristate "DRM Support for SH Mobile" depends on DRM && ARM - depends on ARCH_SHMOBILE || COMPILE_TEST + depends on ARCH_RENESAS || ARCH_SHMOBILE || COMPILE_TEST select BACKLIGHT_CLASS_DEVICE select DRM_KMS_HELPER select DRM_GEM_DMA_HELPER