From: Keith Zhao <keith.zhao@starfivetech.com>
To: <dri-devel@lists.freedesktop.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-riscv@lists.infradead.org>,
<linux-media@vger.kernel.org>, <linaro-mm-sig@lists.linaro.org>
Cc: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
"Rob Herring" <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
"Emil Renner Berthing" <kernel@esmil.dk>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Philipp Zabel <p.zabel@pengutronix.de>,
Sumit Semwal <sumit.semwal@linaro.org>,
<christian.koenig@amd.com>,
Bjorn Andersson <andersson@kernel.org>,
"Heiko Stuebner" <heiko@sntech.de>,
Shawn Guo <shawnguo@kernel.org>, Jagan Teki <jagan@edgeble.ai>,
Chris Morgan <macromorgan@hotmail.com>,
Keith Zhao <keith.zhao@starfivetech.com>,
Jack Zhu <jack.zhu@starfivetech.com>,
Shengyang Chen <shengyang.chen@starfivetech.com>,
Changhuang Liang <changhuang.liang@starfivetech.com>
Subject: [PATCH v1 v1 4/7] drm/fourcc: Add drm/vs tiled modifiers
Date: Tue, 1 Aug 2023 18:10:27 +0800 [thread overview]
Message-ID: <20230801101030.2040-5-keith.zhao@starfivetech.com> (raw)
In-Reply-To: <20230801101030.2040-1-keith.zhao@starfivetech.com>
These are mainly used internally in vs-drm,
I'm not sure if the new modifiers can be used with the existing ones.
If there is a problem, I will improve it further.
Signed-off-by: Keith Zhao <keith.zhao@starfivetech.com>
---
include/uapi/drm/drm_fourcc.h | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
index 8db7fd3f7..0b884cf50 100644
--- a/include/uapi/drm/drm_fourcc.h
+++ b/include/uapi/drm/drm_fourcc.h
@@ -419,6 +419,7 @@ extern "C" {
#define DRM_FORMAT_MOD_VENDOR_ARM 0x08
#define DRM_FORMAT_MOD_VENDOR_ALLWINNER 0x09
#define DRM_FORMAT_MOD_VENDOR_AMLOGIC 0x0a
+#define DRM_FORMAT_MOD_VENDOR_VS 0x0b
/* add more to the end as needed */
@@ -1562,6 +1563,32 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
#define AMD_FMT_MOD_CLEAR(field) \
(~((__u64)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT))
+#define DRM_FORMAT_MOD_VS_TYPE_NORMAL 0x00
+#define DRM_FORMAT_MOD_VS_TYPE_COMPRESSED 0x01
+#define DRM_FORMAT_MOD_VS_TYPE_CUSTOM_10BIT 0x02
+#define DRM_FORMAT_MOD_VS_TYPE_MASK ((__u64)0x3 << 54)
+
+#define fourcc_mod_vs_code(type, val) \
+ fourcc_mod_code(VS, ((((__u64)type) << 54) | (val)))
+
+#define DRM_FORMAT_MOD_VS_NORM_MODE_MASK 0x1F
+#define DRM_FORMAT_MOD_VS_LINEAR 0x00
+#define DRM_FORMAT_MOD_VS_SUPER_TILED_XMAJOR 0x02
+#define DRM_FORMAT_MOD_VS_SUPER_TILED_YMAJOR 0x03
+#define DRM_FORMAT_MOD_VS_TILE_8X8 0x04
+#define DRM_FORMAT_MOD_VS_TILE_8X4 0x07
+#define DRM_FORMAT_MOD_VS_SUPER_TILED_XMAJOR_8X4 0x0B
+#define DRM_FORMAT_MOD_VS_SUPER_TILED_YMAJOR_4X8 0x0C
+#define DRM_FORMAT_MOD_VS_TILE_MODE4X4 0x15
+
+#define fourcc_mod_vs_norm_code(tile) \
+ fourcc_mod_vs_code(DRM_FORMAT_MOD_VS_TYPE_NORMAL, \
+ (tile))
+
+#define fourcc_mod_vs_custom_code(tile) \
+ fourcc_mod_vs_code(DRM_FORMAT_MOD_VS_TYPE_CUSTOM_10BIT, \
+ (tile))
+
#if defined(__cplusplus)
}
#endif
--
2.34.1
next prev parent reply other threads:[~2023-08-01 10:10 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 10:10 [PATCH v1 v1 0/7] DRM driver for verisilicon Keith Zhao
2023-08-01 10:10 ` [PATCH v1 v1 1/7] MAINTAINERS: Update starfive maintainers Keith Zhao
2023-08-01 13:48 ` Conor Dooley
2023-08-01 18:55 ` Randy Dunlap
2023-08-01 10:10 ` [PATCH v1 v1 2/7] dt-bindings: display: Add yamls for JH7110 display system Keith Zhao
2023-08-01 11:44 ` Maxime Ripard
2023-08-01 14:03 ` Conor Dooley
2023-08-01 10:10 ` [PATCH v1 v1 3/7] riscv: dts: starfive: jh7110: add dc controller and hdmi node Keith Zhao
2023-08-01 11:45 ` Maxime Ripard
2023-08-01 10:10 ` Keith Zhao [this message]
2023-08-01 11:45 ` [PATCH v1 v1 4/7] drm/fourcc: Add drm/vs tiled modifiers Maxime Ripard
2023-09-06 11:50 ` Thomas Zimmermann
2023-08-01 10:10 ` [PATCH v1 v1 5/7] drm/vs: Register DRM device Keith Zhao
2023-08-01 11:56 ` Maxime Ripard
2023-08-01 13:40 ` [v1,v1,5/7] " suijingfeng
2023-08-01 13:46 ` suijingfeng
2023-08-01 13:53 ` suijingfeng
2023-08-01 14:33 ` suijingfeng
2023-08-01 18:55 ` [PATCH v1 v1 5/7] " Randy Dunlap
2023-09-06 13:56 ` Thomas Zimmermann
2023-08-01 10:10 ` [PATCH v1 v1 6/7] drm/vs: Add KMS crtc&plane Keith Zhao
2023-08-01 12:06 ` Maxime Ripard
2023-09-06 14:32 ` Thomas Zimmermann
2023-08-01 10:10 ` [PATCH v1 v1 7/7] drm/vs: Add hdmi Keith Zhao
2023-08-01 11:59 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230801101030.2040-5-keith.zhao@starfivetech.com \
--to=keith.zhao@starfivetech.com \
--cc=airlied@gmail.com \
--cc=andersson@kernel.org \
--cc=aou@eecs.berkeley.edu \
--cc=changhuang.liang@starfivetech.com \
--cc=christian.koenig@amd.com \
--cc=conor+dt@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=jack.zhu@starfivetech.com \
--cc=jagan@edgeble.ai \
--cc=kernel@esmil.dk \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=macromorgan@hotmail.com \
--cc=mripard@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=shengyang.chen@starfivetech.com \
--cc=sumit.semwal@linaro.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).