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,