From patchwork Wed Dec 7 11:53:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 30810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp137686wrr; Wed, 7 Dec 2022 04:04:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf7l0O4DL/7yceVuIUofreOGt5euXX/hXzWECd0iCkD/L7BGO6TWwHTASG2jjSNS25M/Cjqu X-Received: by 2002:a05:6a00:1941:b0:572:6e9b:9fa2 with SMTP id s1-20020a056a00194100b005726e9b9fa2mr74058583pfk.8.1670414642852; Wed, 07 Dec 2022 04:04:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670414642; cv=none; d=google.com; s=arc-20160816; b=RTcYF4zHgyXtCMy8r0bZ00I6rknZ8DgGZBEwvLEcCvL5K8EPDW6DzowNF7SXBJEE0S JgVpXHjL7m8IyWFw2euNAvPiJu7ZhnaCe86qlE/LvevXnG/nNb+fyymZ5jTDVMZuJG6V OP5S9TpTm6DPzjgK3bwm/tHh1frakEMrFj3SLRLDcEtWRl8t/+hRtz8TB7GTLOmSz14W LmBKDdc0jLzSEnLeoFBViASUuNYCrVm/k0im/vo45NzLKBOfhj3nfnVCWwyDg8SLVObU 8XV2he4p8+zijcfJwxQWd0CbQ1+24L7hFR07Gb9Y8rYXD9C8YfrFxGJg/FtxTX8Ne8Ix LZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :feedback-id:dkim-signature:dkim-signature; bh=X2hQ875cJr6jux9kv8eLCChlul/kVrxgraf+5nmcpRo=; b=tuJsMakQtvmdCKLGQgeHo/cJAalPKLkCZlNMSnOP8dTdmZQiwCF8O2OeOq8koakcFP ZROzeiN2Hd2VADWCcOPZ7uNwWkdOq/CvHu/C8u7k/MJBe9QnFTm0AL87TkLuINyq03c4 cab2yNz+4A7Fs38nnrOjzcCJ/DGF6e717J4JJKFKFjYZtF1bW19M+lKAthy61+W5XjiE DCy9IDn7Vt0Itqu8qgoJhjpg+Hzs94Ccoi1XEFqfDeAzv3rVFXg8o+FFZEmyE/16LNnA p3eI9yMlWYzvZQ7ed7CAjFoVxApTMkgJe39EZn6WDLRvuyKbj8+Hh33ETULroVjo+BUg lGmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cerno.tech header.s=fm2 header.b=gkmn3P6s; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=QngTnO4h; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cerno.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u189-20020a6279c6000000b0057629288720si17012280pfc.176.2022.12.07.04.03.24; Wed, 07 Dec 2022 04:04:02 -0800 (PST) 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; dkim=pass header.i=@cerno.tech header.s=fm2 header.b=gkmn3P6s; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=QngTnO4h; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cerno.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230155AbiLGL4Q (ORCPT + 99 others); Wed, 7 Dec 2022 06:56:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbiLGLzZ (ORCPT ); Wed, 7 Dec 2022 06:55:25 -0500 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B979109D for ; Wed, 7 Dec 2022 03:55:24 -0800 (PST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 8C2215C01BF; Wed, 7 Dec 2022 06:55:23 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 07 Dec 2022 06:55:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1670414123; x= 1670500523; bh=X2hQ875cJr6jux9kv8eLCChlul/kVrxgraf+5nmcpRo=; b=g kmn3P6sMXGAM+BdypeUKpEWc7LSr6tnHstqZkIccBqrb0h3X/Nq38zP0OAtNAESG 9bmDvsRanMehMqZ9zX45WJouzGOJBjGlhDE19G4W2t5+qS0KUPBM9jHzOMpopfpB XxE9OQSvHO4sjm6QsHfYUJwEmHiEIMQkZi2Zr+TU9Km1thRw2rAHRMBgv4g0Rir+ lmvgck5aVC0MPXzHz9f4TGUafPAUqpz50Iz0rY5sq6SACeVFctNpcaWa+9wtv+hj c6EA0WBCqT+CFTcFY9pDJcDa7VQBDuHc0falWpsp8yOSDKIW7ioLHxmIeaQ8Jmmz K/nF6OThRF/jiFr5EZQwQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1670414123; x= 1670500523; bh=X2hQ875cJr6jux9kv8eLCChlul/kVrxgraf+5nmcpRo=; b=Q ngTnO4hnt4/eNHLcVPmYfcOrM/pY7tgK9ddH70o+9JiAPQdPWtVVV73HGzAIQm/b SjzEuJhwaxPYoJYjmhbNQQg5lD3bL1OULQv91v7yTUN61D8tdX+J4H0csv5ZyLzC cYBbX7eKQyTlvKvMT/YXqGPg/Kv5+D5UAD8Kcxd3HtDmx0nR4TxdTpn3rTVB0WRV N0NRnjTR01TGPoskcxNcUaELLU3MppMjLw6uRHLbJq7zqNT5GMjyEzwT48hc+qns z2ToX4aNV2fZW7LooUhb5JiETiwi0Ab3MknkRlRBJyx73QX8emeVVxvlDiqK0b3D wTZr5OkznjxIiiGJOxCKA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudekgdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpeevvdelieejgedvkeffheekheeilefhgefgffehteekueelvddtueffheet ledtffenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 Dec 2022 06:55:22 -0500 (EST) From: Maxime Ripard Date: Wed, 07 Dec 2022 12:53:17 +0100 Subject: [PATCH 06/15] drm/vc4: hvs: Fix colour order for xRGB1555 on HVS5 MIME-Version: 1.0 Message-Id: <20221207-rpi-hvs-crtc-misc-v1-6-1f8e0770798b@cerno.tech> References: <20221207-rpi-hvs-crtc-misc-v1-0-1f8e0770798b@cerno.tech> In-Reply-To: <20221207-rpi-hvs-crtc-misc-v1-0-1f8e0770798b@cerno.tech> To: Emma Anholt , Maxime Ripard , David Airlie , Daniel Vetter , Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dave Stevenson , Mateusz Kwiatkowski , Maxime Ripard X-Mailer: b4 0.11.0-dev-8c583 X-Developer-Signature: v=1; a=openpgp-sha256; l=1057; i=maxime@cerno.tech; h=from:subject:message-id; bh=/1kOYXeyAfVkMPpUTJD425tdluFPJeVWER3c4oJ8z4s=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMkT6la+mS9b5L5S1UQ8/WPN4b9b92xpYW1mff4x60HbsWL/ jROXdZSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAifuYM/8sDM3Y4RVX6cl2oXuE151 /fzuNNr/8tjNebavm1oWHR8pUM/wO2Byx7tVR/VXKIjKyCY5ZhxBZj1QXq3HoutWs6xb5kMAIA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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?1751556704582835665?= X-GMAIL-MSGID: =?utf-8?q?1751556704582835665?= From: Dave Stevenson Same as the xRGB8888 formats, HVS5 has managed to swap the colour channels for the xRGB1555 formats as well. Add the relevant config for pixel_order_hvs5. Fixes: c54619b0bfb3 ("drm/vc4: Add support for the BCM2711 HVS5") Signed-off-by: Dave Stevenson Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_plane.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index c212f8c10388..e60d6f1a7de1 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -75,11 +75,13 @@ static const struct hvs_format { .drm = DRM_FORMAT_ARGB1555, .hvs = HVS_PIXEL_FORMAT_RGBA5551, .pixel_order = HVS_PIXEL_ORDER_ABGR, + .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB, }, { .drm = DRM_FORMAT_XRGB1555, .hvs = HVS_PIXEL_FORMAT_RGBA5551, .pixel_order = HVS_PIXEL_ORDER_ABGR, + .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB, }, { .drm = DRM_FORMAT_RGB888,