History

Merge tag 'drm-misc-next-2023-12-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for $kernel-version: UAPI Changes: Cross-subsystem Changes: - A few fixes for usb/typec Core Changes: - ci: Updates to the defconfig, igt version, etc. - writeback: Move the atomic_check helper from the encoder to connector Driver Changes: - rockchip: Add support for rk3588 - xe: Update the TODO list - panel: - nv3052c: Register documentation, init sequence improvements and support for the Fascontek FS035VG158 - st7701: Add support for the Anbernic RG-ARC - new driver: Synaptics R63353 panel controller, Ilitek ILI9805 panel controller - new panel: AUO G156HAN04.0 Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 2 years ago

Commit 48b27282 parents a0a2895 b1a2aa956 files · +2568 −386Browse files

Showing the changes to include/uapi (2 of 56 files). Show all

Unified · Split

2 files
  1. include/uapi/drm/drm_fourcc.h +5 −5
  2. include/uapi/drm/drm_mode.h +9 −9
include/uapi/drm/drm_fourcc.h+5−5
@@ -54,7 +54,7 @@ extern "C" { · 53 unmodified lines
5454 * Format modifiers may change any property of the buffer, including the number
5555 * of planes and/or the required allocation size. Format modifiers are
5656 * vendor-namespaced, and as such the relationship between a fourcc code and a
57− * modifier is specific to the modifer being used. For example, some modifiers
57+ * modifier is specific to the modifier being used. For example, some modifiers
5858 * may preserve meaning - such as number of planes - from the fourcc code,
5959 * whereas others may not.
6060 *
@@ -79,7 +79,7 @@ extern "C" { · 18 unmodified lines
7979 * format.
8080 * - Higher-level programs interfacing with KMS/GBM/EGL/Vulkan/etc: these users
8181 * see modifiers as opaque tokens they can check for equality and intersect.
82− * These users musn't need to know to reason about the modifier value
82+ * These users mustn't need to know to reason about the modifier value
8383 * (i.e. they are not expected to extract information out of the modifier).
8484 *
8585 * Vendors should document their modifier usage in as much detail as
@@ -540,7 +540,7 @@ extern "C" { · 454 unmodified lines
540540 * This is a tiled layout using 4Kb tiles in row-major layout.
541541 * Within the tile pixels are laid out in 16 256 byte units / sub-tiles which
542542 * are arranged in four groups (two wide, two high) with column-major layout.
543− * Each group therefore consits out of four 256 byte units, which are also laid
543+ * Each group therefore consists out of four 256 byte units, which are also laid
544544 * out as 2x2 column-major.
545545 * 256 byte units are made out of four 64 byte blocks of pixels, producing
546546 * either a square block or a 2:1 unit.
@@ -1103,7 +1103,7 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · 556 unmodified lines
11031103 */
11041104
11051105 /*
1106− * The top 4 bits (out of the 56 bits alloted for specifying vendor specific
1106+ * The top 4 bits (out of the 56 bits allotted for specifying vendor specific
11071107 * modifiers) denote the category for modifiers. Currently we have three
11081108 * categories of modifiers ie AFBC, MISC and AFRC. We can have a maximum of
11091109 * sixteen different categories.
@@ -1419,7 +1419,7 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · 309 unmodified lines
14191419 * Amlogic FBC Memory Saving mode
14201420 *
14211421 * Indicates the storage is packed when pixel size is multiple of word
1422− * boudaries, i.e. 8bit should be stored in this mode to save allocation
1422+ * boundaries, i.e. 8bit should be stored in this mode to save allocation
14231423 * memory.
14241424 *
14251425 * This mode reduces body layout to 3072 bytes per 64x32 superblock with
include/uapi/drm/drm_mode.h+9−9
@@ -36,10 +36,10 @@ extern "C" { · 35 unmodified lines
3636 /**
3737 * DOC: overview
3838 *
39− * DRM exposes many UAPI and structure definition to have a consistent
40− * and standardized interface with user.
39+ * DRM exposes many UAPI and structure definitions to have a consistent
40+ * and standardized interface with users.
4141 * Userspace can refer to these structure definitions and UAPI formats
42− * to communicate to driver
42+ * to communicate to drivers.
4343 */
4444
4545 #define DRM_CONNECTOR_NAME_LEN 32
@@ -540,7 +540,7 @@ struct drm_mode_get_connector { · 494 unmodified lines
540540 /* the PROP_ATOMIC flag is used to hide properties from userspace that
541541 * is not aware of atomic properties. This is mostly to work around
542542 * older userspace (DDX drivers) that read/write each prop they find,
543− * witout being aware that this could be triggering a lengthy modeset.
543+ * without being aware that this could be triggering a lengthy modeset.
544544 */
545545 #define DRM_MODE_PROP_ATOMIC 0x80000000
546546
@@ -664,7 +664,7 @@ struct drm_mode_fb_cmd { · 117 unmodified lines
664664 };
665665
666666 #define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */
667−#define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifer[] */
667+#define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifier[] */
668668
669669 /**
670670 * struct drm_mode_fb_cmd2 - Frame-buffer metadata.
@@ -881,8 +881,8 @@ struct hdr_metadata_infoframe { · 210 unmodified lines
881881 * These are coded as unsigned 16-bit values in units of
882882 * 0.00002, where 0x0000 represents zero and 0xC350
883883 * represents 1.0000.
884− * @display_primaries.x: X cordinate of color primary.
885− * @display_primaries.y: Y cordinate of color primary.
884+ * @display_primaries.x: X coordinate of color primary.
885+ * @display_primaries.y: Y coordinate of color primary.
886886 */
887887 struct {
888888 __u16 x, y;
@@ -892,8 +892,8 @@ struct hdr_metadata_infoframe { · 3 unmodified lines
892892 * These are coded as unsigned 16-bit values in units of
893893 * 0.00002, where 0x0000 represents zero and 0xC350
894894 * represents 1.0000.
895− * @white_point.x: X cordinate of whitepoint of color primary.
896− * @white_point.y: Y cordinate of whitepoint of color primary.
895+ * @white_point.x: X coordinate of whitepoint of color primary.
896+ * @white_point.y: Y coordinate of whitepoint of color primary.
897897 */
898898 struct {
899899 __u16 x, y;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t