From patchwork Tue May 23 15:31:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 98057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2232787vqo; Tue, 23 May 2023 08:36:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7jgIejxO7MjKD/QwzPD+cAnPuAocbm4ILV5HrIaK8/JQh2vQ+7MwnirQ3ZfAOjyH+1WVVm X-Received: by 2002:a05:6a00:3921:b0:64d:68dc:b942 with SMTP id fh33-20020a056a00392100b0064d68dcb942mr11263631pfb.7.1684856179777; Tue, 23 May 2023 08:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684856179; cv=none; d=google.com; s=arc-20160816; b=I7akYvV3ScW+DEbGJkcR3LG/0onOJxBARwcfBz5Mgiq90gxtaYjDGE9h0MobEOmNWx aCRFsD4eMJN6Hk6AlWKtQx/Z2o463M0/cG6g4V1KF/mgsPRL54Wb2dkKrVkcmC41yrRP 5qIlqNtaWrwRxFZMHovEK5sIYf+xVblg5zf+ZqhfkP6KAG2/AR6R2vp1FP2QbLPSvC8N Kbb6RDsbPU02rgkGnNZaOOQxoCwJ+VI32PZSPX2kboYCxjSM5cmZWmcscLT2nTY+UpfF ip1vjfXTjnpvC0A/PTqFdeJMy0CyNn4kleYb1MW6V3iBLonPnYF4E2QtJtrKS7C1H2T7 1g1A== 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=b4MGL8soVzdUtn25c18eAeH4/XfmEzKR9sMlt6Ncgr8=; b=QvN/1GWDnXyJ8VQmo1s1C/XgMlUBJ98vyCLI6HPqsufQRd5MJBWMFUAKFK9Lh1kvtK 73iAVbZvjkWpWGPGoQ5MIgUu09774jda7VSPCqyuEDgxbqDO6bZYSqbAwveaCwur9bil V1Cc3dqbM5PiDCJaEfHRLXyROOcTiaeFs1EifmJeU5x+CZqwgDp2HeyPlMq/BNKr54Po YA5Rb26f/xgng6TlHHvAcZbPt2IVu8rGTVML0KY7qAvOuJmoWFm9Nx3LaaCyPCTU7uxG ykpvO6FEDQECjdDTNarmjafNz3RG/+/ElrJTp2DpnRdRpTK2jyRyHTuVnb7KEgFpzCFN bedA== 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 k136-20020a636f8e000000b0051a650b8f62si927384pgc.836.2023.05.23.08.36.02; Tue, 23 May 2023 08:36:19 -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 S237559AbjEWPbz (ORCPT + 99 others); Tue, 23 May 2023 11:31:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237547AbjEWPbp (ORCPT ); Tue, 23 May 2023 11:31:45 -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 5A8A218B for ; Tue, 23 May 2023 08:31:43 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:b0ac:7afd:272:4cff]) by albert.telenet-ops.be with bizsmtp id 0FXf2A0030Jkz7G06FXfJW; Tue, 23 May 2023 17:31:41 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1q1Tyu-002t3V-Hy; Tue, 23 May 2023 17:31:39 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q1Tz9-00Ckap-00; 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 , Laurent Pinchart Subject: [PATCH v3 1/5] drm: shmobile: Use %p4cc to print fourcc codes Date: Tue, 23 May 2023 17:31:33 +0200 Message-Id: <1a63e5afc8a85f7ae10f7f4395c2d065ba1aeb59.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=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham 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?1766699753712405374?= X-GMAIL-MSGID: =?utf-8?q?1766699753712405374?= Replace the printing of hexadecimal fourcc format codes by pretty-printed format names, using the "%p4cc" format specifier. Signed-off-by: Geert Uytterhoeven Reviewed-by: Thomas Zimmermann Reviewed-by: Laurent Pinchart --- v3: - Add Reviewed-by, v2: - Add Reviewed-by. --- 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 Tue May 23 15:31:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 98059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2235417vqo; Tue, 23 May 2023 08:40:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7E7BmPLGislVPajJ38chtOMxlV5qFrVe3Lh/3gC7hkc0hCdSOYWlCa8TbuHWStBNdyKxcH X-Received: by 2002:a17:903:41ca:b0:1af:9cec:380b with SMTP id u10-20020a17090341ca00b001af9cec380bmr9526831ple.10.1684856426035; Tue, 23 May 2023 08:40:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684856426; cv=none; d=google.com; s=arc-20160816; b=OSfV3AdDrUePhGfy3SeGWYjW5V6Dir48HNRkYIQUMm0mQGyhs2ckjYnAtcdBZTYrmF iG3crieDBfR5B6evrWFYOxd59/cYmki6hxMSOYZeWqAyE9S6LDHhPReU4pQ6UWGJ+mHe y6dwxQV3q1Zei/1jVwdHNICuFXu/kufHLZfAW21CbjkBh8tcCH0RvdeU9MqeAWvhT4OK M0uh1zytcs37WaJVquc7bBuqL7GK9GVy0l1P7lVlNnY6evDbXjmYLPuqNstD5KjgSnyQ GDKgoBcRCJGUmy4ahJJ7iQAvcaLceYFz/v1davoQUtmEww3OtLDtnPRw/17iGruPBuKH GDzg== 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=2zHZeFbN8WN/FZl1l1J9QQPFcrvcCuNqm14o5uNQdQQ=; b=oTZpBCwu/f3jl/wBtHo1406DIgf0xW4Tki33lPscvFVuu4bRSNQHB9UjK1Fj3vN6PY z+QlKV+bRofKdyMaOrq8AJBmx8qoeYxnk92DuAcvlHMGuWfGITU9p1xH2JzRDarl+QRy gGkemw/KG5zXombFn8gxSxnabui5DI4HlJKDrq/RyuOes1htehKd+kLtbCIx+aWDJ0gX xEhibhe5rts5Z3Zck/3xeWh5EIs2+sHw1zGIFqhEHBGHIhOoldHD9kEcdg5kXu+GWsah chVphP0SbaLhCRbVpDwrC+k0pZMBGQgVqF8Q97lC1e6YQvxXmPhda8hdMDdtTkDs7jFo 8p6g== 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 r12-20020a170902be0c00b0019f2cd99ddfsi6393371pls.380.2023.05.23.08.40.10; Tue, 23 May 2023 08:40:26 -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 S237544AbjEWPbu (ORCPT + 99 others); Tue, 23 May 2023 11:31:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237530AbjEWPbn (ORCPT ); Tue, 23 May 2023 11:31:43 -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 58C61132 for ; Tue, 23 May 2023 08:31:42 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:b0ac:7afd:272:4cff]) by albert.telenet-ops.be with bizsmtp id 0FXf2A0050Jkz7G06FXfJX; 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-002t3Z-Ii; Tue, 23 May 2023 17:31:39 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q1Tz9-00Ckas-0y; 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 2/5] drm: shmobile: Add support for DRM_FORMAT_XRGB8888 Date: Tue, 23 May 2023 17:31:34 +0200 Message-Id: <888cde6d1f70f1610931c4a89801060bb6765ff2.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=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham 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?1766700012030419915?= X-GMAIL-MSGID: =?utf-8?q?1766700012030419915?= 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: Thomas Zimmermann Reviewed-by: Laurent Pinchart --- v3: - No changes, v2: - Add Reviewed-by. --- 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 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); From patchwork Tue May 23 15:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 98064 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2239765vqo; Tue, 23 May 2023 08:47:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7oDfd5jYGfOZfyMJoP9mvXjcXL1SSuIsFi+mS72twVmx9Qe3PqcUuwmXL3OwXlilCdtWzo X-Received: by 2002:a17:903:22c2:b0:1ae:ce9:f391 with SMTP id y2-20020a17090322c200b001ae0ce9f391mr19601606plg.4.1684856845188; Tue, 23 May 2023 08:47:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684856845; cv=none; d=google.com; s=arc-20160816; b=fbjxwLuS3Q1wH8bLsEoy3EGRcuqK4enzogswMBlt2hqFq/MTiqqoxuTs8qG6yRn6SM EOi+0fpoFtYIdbX+AM5OxjNn1xcmJ+x0dML0azBEHEQuCUuJWrXAHN6356uEEVur8Grm rVwlM0o7FSlC2KnwWl/GmklgSdm/g/DRp0kialw37l+jYi2YX2edmHAXR818fph5va2w dqkUOP7YeJMiTK2bCifCU9qjffc7xI4A7gBcyTG5nu0yjbCDTIi/LnRpKtp4RT4sXQhg IvXW8KOWxPX2awXJ6HI8X1O+jfqKv5IXpLZzADnyMOjtJ45ubEV0ATffAo6sKBeoDNl6 OVfQ== 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=fPL6S3pYMmIVTkkKvu6YJ0/ZZdwG40IOehBmfSuyMmc=; b=mdNuWy/hZtAEVvOFqdPfrpRsLsXKSOVVpcDWVASuUgCOnVfxK3oB4X22d4XrBR/upD 7fcoumM5Akcblp/iZGgM9s7Tm4JWBQO12/Bu7qBKGAy9oSYQbVVjbaBM/uZ6Zxcf7+Xb VitvyJQ4KHuzThaf7EcbzH9VjTA0n0FICHzl3cc0q0xeCRivZbsNwpaKi8brTyYkQh9A w3uppLta8eXqRer4LMI2B/j8s2/o8rBR2GbDLRGkxVJiOBOtJJo8Wau3tQG0rzIjZTLj ITUBIpx/zkvxDL7jMlDEoyuq0zdVJSQRcOwbfnAuAGbKER5I6PKIr7/bfd796dj+XSmb V91w== 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 jb1-20020a170903258100b001aaf7a9d7aasi4711416plb.126.2023.05.23.08.47.12; Tue, 23 May 2023 08:47:25 -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 S237037AbjEWPdp (ORCPT + 99 others); Tue, 23 May 2023 11:33:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236956AbjEWPdc (ORCPT ); Tue, 23 May 2023 11:33:32 -0400 Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [195.130.132.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B006718D for ; Tue, 23 May 2023 08:33:13 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4QQdcB00bMz4wxC0 for ; Tue, 23 May 2023 17:32:42 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:b0ac:7afd:272:4cff]) by xavier.telenet-ops.be with bizsmtp id 0FXf2A00g0Jkz7G01FXfao; Tue, 23 May 2023 17:31:41 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1q1Tyu-002t3i-L4; Tue, 23 May 2023 17:31:39 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q1Tz9-00Ckb1-2w; 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 , Laurent Pinchart Subject: [PATCH v3 4/5] drm: shmobile: Add missing call to drm_fbdev_generic_setup() Date: Tue, 23 May 2023 17:31:36 +0200 Message-Id: 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?1766700451240167041?= X-GMAIL-MSGID: =?utf-8?q?1766700451240167041?= 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: Thomas Zimmermann Reviewed-by: Laurent Pinchart --- v3: - No changes, v2: - Add Reviewed-by. --- 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 Tue May 23 15:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 98056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2232350vqo; Tue, 23 May 2023 08:35:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5qiLd1GjWJ4VO3Y8EYrz80aPxvNDFeZ0ue/WPG0tgApEPV/gj/rOcNPnYvQ3VyQO1Ionm2 X-Received: by 2002:a05:6a21:33a4:b0:10c:7c72:bdd6 with SMTP id yy36-20020a056a2133a400b0010c7c72bdd6mr2950638pzb.59.1684856139534; Tue, 23 May 2023 08:35:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684856139; cv=none; d=google.com; s=arc-20160816; b=BAM6S7Z7E57V/w2YO4G5v5MMryB86DzAVaXi1AJZObosgpLK5nAV99d1VdyzLd6kuC noTdBw4KyYbdbAUAoeAHawtF6ESyxQ/uN5kiMamwOQDT50ysycCkV9AFEj/L7ohP/p/x bGU2pMXHmwZ4QTHuPIvkM+82Mk55JjlDg3MmPlVI6Z/epWWLwFPMOuwO6C22UA1lgcAD W6UuUOHNY5RrpAbgWn2MSWRHRw3iM0xNffVGY5gIdpiuSaI2uXAjswtPZx8HTltjtinU Rw3ZhNnCwBJiBM8M6wcUq3BeBVrJQ5zUgWqCPSzS8HUNvXzw9NRBawmBDiLU4NtEQPxA bo/A== 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=vT+S9s6JMB76cY1JJFwk2696mpQSRawNZRUEev8MMd8=; b=SgQAqBmY8lRGC4VT4SDxg34pRAR4jRE1jW8Dp6n11olBcfP07iVqonIHgpMSmPOCYY Ft4xr2x9qtHxS/EZSmpuQaawvBeSQv4tD/FDrnfCwpaSZNTId3B3S7zaN5d0JUif30em MCaKMYydGKY5VjnElSoi7snlEh64txOBU4LP5Mmcq2uLiyZxFAAURIpBYaxi198miDS8 uk0XLVuL1d2GzLaBIoQBDUwB0ZKY0utWpysaBxOpAjVJ2dms++l693oQtDDOmEVvPEp3 W9hax/3nWmnAF9oOsfRjgeZgzE0ba/X21pRuzQZjshvaXW89N4zdn175hOyi7eA67p4r 9rIw== 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 i188-20020a639dc5000000b0053efcd2001dsi441685pgd.422.2023.05.23.08.35.22; Tue, 23 May 2023 08:35: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 S237571AbjEWPb7 (ORCPT + 99 others); Tue, 23 May 2023 11:31:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237553AbjEWPbs (ORCPT ); Tue, 23 May 2023 11:31:48 -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 D5E16196 for ; Tue, 23 May 2023 08:31:43 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:b0ac:7afd:272:4cff]) by michel.telenet-ops.be with bizsmtp id 0FXf2A0030Jkz7G06FXfv6; 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-002t3m-Lw; Tue, 23 May 2023 17:31:39 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q1Tz9-00Ckb5-3w; 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 5/5] drm: shmobile: Make DRM_SHMOBILE visible on Renesas SoC platforms Date: Tue, 23 May 2023 17:31:37 +0200 Message-Id: <40ac67e0887d833ab4a3f1ec24828dedf0d8e108.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=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham 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?1766699711578448668?= X-GMAIL-MSGID: =?utf-8?q?1766699711578448668?= The LCD Controller supported by the drm-shmob driver is present on SuperH SH-Mobile SoCs, and on Renesas ARM SH/R-Mobile SoCs. Unfortunately its config option is not visible on either, so the user can never enable the support. Fix this by dropping the dependency on ARM (for SuperH), and by widening the dependency range to ARCH_RENESAS (for ARM). Signed-off-by: Geert Uytterhoeven Reviewed-by: Thomas Zimmermann Reviewed-by: Laurent Pinchart --- v3: - No changes, v2: - Add Reviewed-by, - Drop dependency on ARM, reword. The driver was disabled on SuperH in commit c66de8cc2ea62941 ("drm/shmobile: Add run-time dependencies") in v3.16 because of build issues. I couldn't find further details, but currently it builds fine on (at least) arm, arm64, sh, riscv, and m68k. --- drivers/gpu/drm/shmobile/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/shmobile/Kconfig b/drivers/gpu/drm/shmobile/Kconfig index 4ec5dc74a6b0b880..ad14112999ad8aba 100644 --- a/drivers/gpu/drm/shmobile/Kconfig +++ b/drivers/gpu/drm/shmobile/Kconfig @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 config DRM_SHMOBILE tristate "DRM Support for SH Mobile" - depends on DRM && ARM - depends on ARCH_SHMOBILE || COMPILE_TEST + depends on DRM + depends on ARCH_RENESAS || ARCH_SHMOBILE || COMPILE_TEST select BACKLIGHT_CLASS_DEVICE select DRM_KMS_HELPER select DRM_GEM_DMA_HELPER