You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
Add upstream changes to drm
This commit is contained in:
Aditya Garg
@@ -0,0 +1,156 @@
|
||||
From 4870ca09f6de64bb971ba649fc5b65b116b1d851 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Martin <marcan@marcan.st>
|
||||
Date: Tue, 8 Apr 2025 12:17:57 +0530
|
||||
Subject: [PATCH 1/2] lib/vsprintf: Add support for generic FourCCs by
|
||||
extending %p4cc
|
||||
|
||||
%p4cc is designed for DRM/V4L2 FourCCs with their specific quirks, but
|
||||
it's useful to be able to print generic 4-character codes formatted as
|
||||
an integer. Extend it to add format specifiers for printing generic
|
||||
32-bit FourCCs with various endian semantics:
|
||||
|
||||
%p4ch Host byte order
|
||||
%p4cn Network byte order
|
||||
%p4cl Little-endian
|
||||
%p4cb Big-endian
|
||||
|
||||
The endianness determines how bytes are interpreted as a u32, and the
|
||||
FourCC is then always printed MSByte-first (this is the opposite of
|
||||
V4L/DRM FourCCs). This covers most practical cases, e.g. %p4cn would
|
||||
allow printing LSByte-first FourCCs stored in host endian order
|
||||
(other than the hex form being in character order, not the integer
|
||||
value).
|
||||
|
||||
Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
|
||||
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
||||
Reviewed-by: Petr Mladek <pmladek@suse.com>
|
||||
Tested-by: Petr Mladek <pmladek@suse.com>
|
||||
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||||
Signed-off-by: Aditya Garg <gargaditya08@live.com>
|
||||
Reviewed-by: Kees Cook <kees@kernel.org>
|
||||
---
|
||||
Documentation/core-api/printk-formats.rst | 32 +++++++++++++++++++++
|
||||
lib/vsprintf.c | 35 +++++++++++++++++++----
|
||||
scripts/checkpatch.pl | 2 +-
|
||||
3 files changed, 62 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst
|
||||
index ecccc0473..bd420e8aa 100644
|
||||
--- a/Documentation/core-api/printk-formats.rst
|
||||
+++ b/Documentation/core-api/printk-formats.rst
|
||||
@@ -648,6 +648,38 @@ Examples::
|
||||
%p4cc Y10 little-endian (0x20303159)
|
||||
%p4cc NV12 big-endian (0xb231564e)
|
||||
|
||||
+Generic FourCC code
|
||||
+-------------------
|
||||
+
|
||||
+::
|
||||
+ %p4c[hnlb] gP00 (0x67503030)
|
||||
+
|
||||
+Print a generic FourCC code, as both ASCII characters and its numerical
|
||||
+value as hexadecimal.
|
||||
+
|
||||
+The generic FourCC code is always printed in the big-endian format,
|
||||
+the most significant byte first. This is the opposite of V4L/DRM FourCCs.
|
||||
+
|
||||
+The additional ``h``, ``n``, ``l``, and ``b`` specifiers define what
|
||||
+endianness is used to load the stored bytes. The data might be interpreted
|
||||
+using the host byte order, network byte order, little-endian, or big-endian.
|
||||
+
|
||||
+Passed by reference.
|
||||
+
|
||||
+Examples for a little-endian machine, given &(u32)0x67503030::
|
||||
+
|
||||
+ %p4ch gP00 (0x67503030)
|
||||
+ %p4cn 00Pg (0x30305067)
|
||||
+ %p4cl gP00 (0x67503030)
|
||||
+ %p4cb 00Pg (0x30305067)
|
||||
+
|
||||
+Examples for a big-endian machine, given &(u32)0x67503030::
|
||||
+
|
||||
+ %p4ch gP00 (0x67503030)
|
||||
+ %p4cn 00Pg (0x30305067)
|
||||
+ %p4cl 00Pg (0x30305067)
|
||||
+ %p4cb gP00 (0x67503030)
|
||||
+
|
||||
Rust
|
||||
----
|
||||
|
||||
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
|
||||
index a8ac4c4ff..a434b58e8 100644
|
||||
--- a/lib/vsprintf.c
|
||||
+++ b/lib/vsprintf.c
|
||||
@@ -1781,27 +1781,50 @@ char *fourcc_string(char *buf, char *end, const u32 *fourcc,
|
||||
char output[sizeof("0123 little-endian (0x01234567)")];
|
||||
char *p = output;
|
||||
unsigned int i;
|
||||
+ bool pixel_fmt = false;
|
||||
u32 orig, val;
|
||||
|
||||
- if (fmt[1] != 'c' || fmt[2] != 'c')
|
||||
+ if (fmt[1] != 'c')
|
||||
return error_string(buf, end, "(%p4?)", spec);
|
||||
|
||||
if (check_pointer(&buf, end, fourcc, spec))
|
||||
return buf;
|
||||
|
||||
orig = get_unaligned(fourcc);
|
||||
- val = orig & ~BIT(31);
|
||||
+ switch (fmt[2]) {
|
||||
+ case 'h':
|
||||
+ break;
|
||||
+ case 'n':
|
||||
+ orig = swab32(orig);
|
||||
+ break;
|
||||
+ case 'l':
|
||||
+ orig = (__force u32)cpu_to_le32(orig);
|
||||
+ break;
|
||||
+ case 'b':
|
||||
+ orig = (__force u32)cpu_to_be32(orig);
|
||||
+ break;
|
||||
+ case 'c':
|
||||
+ /* Pixel formats are printed LSB-first */
|
||||
+ pixel_fmt = true;
|
||||
+ break;
|
||||
+ default:
|
||||
+ return error_string(buf, end, "(%p4?)", spec);
|
||||
+ }
|
||||
+
|
||||
+ val = pixel_fmt ? swab32(orig & ~BIT(31)) : orig;
|
||||
|
||||
for (i = 0; i < sizeof(u32); i++) {
|
||||
- unsigned char c = val >> (i * 8);
|
||||
+ unsigned char c = val >> ((3 - i) * 8);
|
||||
|
||||
/* Print non-control ASCII characters as-is, dot otherwise */
|
||||
*p++ = isascii(c) && isprint(c) ? c : '.';
|
||||
}
|
||||
|
||||
- *p++ = ' ';
|
||||
- strcpy(p, orig & BIT(31) ? "big-endian" : "little-endian");
|
||||
- p += strlen(p);
|
||||
+ if (pixel_fmt) {
|
||||
+ *p++ = ' ';
|
||||
+ strcpy(p, orig & BIT(31) ? "big-endian" : "little-endian");
|
||||
+ p += strlen(p);
|
||||
+ }
|
||||
|
||||
*p++ = ' ';
|
||||
*p++ = '(';
|
||||
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
|
||||
index 7b28ad331..5595a0898 100755
|
||||
--- a/scripts/checkpatch.pl
|
||||
+++ b/scripts/checkpatch.pl
|
||||
@@ -6904,7 +6904,7 @@ sub process {
|
||||
($extension eq "f" &&
|
||||
defined $qualifier && $qualifier !~ /^w/) ||
|
||||
($extension eq "4" &&
|
||||
- defined $qualifier && $qualifier !~ /^cc/)) {
|
||||
+ defined $qualifier && $qualifier !~ /^c[hnlbc]/)) {
|
||||
$bad_specifier = $specifier;
|
||||
last;
|
||||
}
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0773051dff8f9bb8ef4c21a017a907f078cba80a Mon Sep 17 00:00:00 2001
|
||||
From 08dec01da405ecf1c24d1d3c38b19b7654580b26 Mon Sep 17 00:00:00 2001
|
||||
From: Kerem Karabay <kekrby@gmail.com>
|
||||
Date: Wed, 26 Feb 2025 16:04:36 +0000
|
||||
Subject: [PATCH 2/2] drm/tiny: add driver for Apple Touch Bars in x86 Macs
|
||||
@@ -53,10 +53,10 @@ Link: https://patchwork.freedesktop.org/patch/msgid/FCAC702C-F84A-47F9-8C78-BBBB
|
||||
create mode 100644 drivers/gpu/drm/tiny/appletbdrm.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 0fa7c5728..bce57e844 100644
|
||||
index 00e94bec4..2c70390fc 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -7066,6 +7066,14 @@ S: Supported
|
||||
@@ -7163,6 +7163,14 @@ S: Supported
|
||||
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
|
||||
F: drivers/gpu/drm/sun4i/sun8i*
|
||||
|
||||
@@ -94,7 +94,7 @@ index 94cbdb133..54c84c980 100644
|
||||
tristate "ARC PGU"
|
||||
depends on DRM && OF
|
||||
diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile
|
||||
index 4aaf56f87..d9add9c3e 100644
|
||||
index 60816d2eb..0a3a7837a 100644
|
||||
--- a/drivers/gpu/drm/tiny/Makefile
|
||||
+++ b/drivers/gpu/drm/tiny/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
@@ -106,7 +106,7 @@ index 4aaf56f87..d9add9c3e 100644
|
||||
obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus-qemu.o
|
||||
diff --git a/drivers/gpu/drm/tiny/appletbdrm.c b/drivers/gpu/drm/tiny/appletbdrm.c
|
||||
new file mode 100644
|
||||
index 000000000..4370ba22d
|
||||
index 000000000..8643216ba
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/tiny/appletbdrm.c
|
||||
@@ -0,0 +1,840 @@
|
||||
@@ -326,7 +326,7 @@ index 000000000..4370ba22d
|
||||
+ }
|
||||
+
|
||||
+ if (response->msg != expected_response) {
|
||||
+ drm_err(drm, "Unexpected response from device (expected %p4cc found %p4cc)\n",
|
||||
+ drm_err(drm, "Unexpected response from device (expected %p4cl found %p4cl)\n",
|
||||
+ &expected_response, &response->msg);
|
||||
+ return -EIO;
|
||||
+ }
|
||||
@@ -400,7 +400,7 @@ index 000000000..4370ba22d
|
||||
+ }
|
||||
+
|
||||
+ if (pixel_format != APPLETBDRM_PIXEL_FORMAT) {
|
||||
+ drm_err(drm, "Encountered unknown pixel format (%p4cc)\n", &pixel_format);
|
||||
+ drm_err(drm, "Encountered unknown pixel format (%p4cl)\n", &pixel_format);
|
||||
+ ret = -EINVAL;
|
||||
+ goto free_info;
|
||||
+ }
|
||||
@@ -951,5 +951,5 @@ index 000000000..4370ba22d
|
||||
+MODULE_DESCRIPTION("Apple Touch Bar DRM Driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.47.1
|
||||
2.49.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user