mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-07 18:37:58 -04:00
Merge tag 'drm-misc-next-2024-08-29' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.12: UAPI Changes: devfs: - support device numbers up to MINORBITS limit Core Changes: ci: - increase job timeout devfs: - use XArray for minor ids displayport: - mst: GUID improvements docs: - add fixes and cleanups panic: - optionally display QR code Driver Changes: amdgpu: - faster vblank disabling - GUID improvements gm12u320 - convert to struct drm_edid host1x: - fix syncpoint IRQ during resume - use iommu_paging_domain_alloc() imx: - ipuv3: convert to struct drm_edid omapdrm: - improve error handling panel: - add support for BOE TV101WUM-LL2 plus DT bindings - novatek-nt35950: improve error handling - nv3051d: improve error handling - panel-edp: add support for BOE NE140WUM-N6G; revert support for SDC ATNA45AF01 - visionox-vtdr6130: improve error handling; use devm_regulator_bulk_get_const() renesas: - rz-du: add support for RZ/G2UL plus DT bindings sti: - convert to struct drm_edid tegra: - gr3d: improve PM domain handling - convert to struct drm_edid Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20240829144654.GA145538@linux.fritz.box
This commit is contained in:
@@ -244,18 +244,18 @@ struct drm_dp_mst_branch {
|
||||
bool link_address_sent;
|
||||
|
||||
/* global unique identifier to identify branch devices */
|
||||
u8 guid[16];
|
||||
guid_t guid;
|
||||
};
|
||||
|
||||
|
||||
struct drm_dp_nak_reply {
|
||||
u8 guid[16];
|
||||
guid_t guid;
|
||||
u8 reason;
|
||||
u8 nak_data;
|
||||
};
|
||||
|
||||
struct drm_dp_link_address_ack_reply {
|
||||
u8 guid[16];
|
||||
guid_t guid;
|
||||
u8 nports;
|
||||
struct drm_dp_link_addr_reply_port {
|
||||
bool input_port;
|
||||
@@ -265,7 +265,7 @@ struct drm_dp_link_address_ack_reply {
|
||||
bool ddps;
|
||||
bool legacy_device_plug_status;
|
||||
u8 dpcd_revision;
|
||||
u8 peer_guid[16];
|
||||
guid_t peer_guid;
|
||||
u8 num_sdp_streams;
|
||||
u8 num_sdp_stream_sinks;
|
||||
} ports[16];
|
||||
@@ -348,7 +348,7 @@ struct drm_dp_allocate_payload_ack_reply {
|
||||
};
|
||||
|
||||
struct drm_dp_connection_status_notify {
|
||||
u8 guid[16];
|
||||
guid_t guid;
|
||||
u8 port_number;
|
||||
bool legacy_device_plug_status;
|
||||
bool displayport_device_plug_status;
|
||||
@@ -425,7 +425,7 @@ struct drm_dp_query_payload {
|
||||
|
||||
struct drm_dp_resource_status_notify {
|
||||
u8 port_number;
|
||||
u8 guid[16];
|
||||
guid_t guid;
|
||||
u16 available_pbn;
|
||||
};
|
||||
|
||||
|
||||
@@ -51,11 +51,10 @@
|
||||
|
||||
#if IS_ENABLED(CONFIG_DRM_ACCEL)
|
||||
|
||||
extern struct xarray accel_minors_xa;
|
||||
|
||||
void accel_core_exit(void);
|
||||
int accel_core_init(void);
|
||||
void accel_minor_remove(int index);
|
||||
int accel_minor_alloc(void);
|
||||
void accel_minor_replace(struct drm_minor *minor, int index);
|
||||
void accel_set_device_instance_params(struct device *kdev, int index);
|
||||
int accel_open(struct inode *inode, struct file *filp);
|
||||
void accel_debugfs_init(struct drm_device *dev);
|
||||
@@ -73,19 +72,6 @@ static inline int __init accel_core_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void accel_minor_remove(int index)
|
||||
{
|
||||
}
|
||||
|
||||
static inline int accel_minor_alloc(void)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline void accel_minor_replace(struct drm_minor *minor, int index)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void accel_set_device_instance_params(struct device *kdev, int index)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -460,7 +460,7 @@ struct drm_atomic_state {
|
||||
*
|
||||
* Used for signaling unbound planes/connectors.
|
||||
* When a connector or plane is not bound to any CRTC, it's still important
|
||||
* to preserve linearity to prevent the atomic states from being freed to early.
|
||||
* to preserve linearity to prevent the atomic states from being freed too early.
|
||||
*
|
||||
* This commit (if set) is not bound to any CRTC, but will be completed when
|
||||
* drm_atomic_helper_commit_hw_done() is called.
|
||||
|
||||
@@ -45,6 +45,8 @@ struct drm_printer;
|
||||
struct device;
|
||||
struct file;
|
||||
|
||||
extern struct xarray drm_minors_xa;
|
||||
|
||||
/*
|
||||
* FIXME: Not sure we want to have drm_minor here in the end, but to avoid
|
||||
* header include loops we need it here for now.
|
||||
@@ -434,6 +436,9 @@ static inline bool drm_is_accel_client(const struct drm_file *file_priv)
|
||||
|
||||
void drm_file_update_pid(struct drm_file *);
|
||||
|
||||
struct drm_minor *drm_minor_acquire(struct xarray *minors_xa, unsigned int minor_id);
|
||||
void drm_minor_release(struct drm_minor *minor);
|
||||
|
||||
int drm_open(struct inode *inode, struct file *filp);
|
||||
int drm_open_helper(struct file *filp, struct drm_minor *minor);
|
||||
ssize_t drm_read(struct file *filp, char __user *buffer,
|
||||
|
||||
@@ -238,6 +238,21 @@ static inline void drm_rect_fp_to_int(struct drm_rect *dst,
|
||||
drm_rect_height(src) >> 16);
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_rect_overlap - Check if two rectangles overlap
|
||||
* @a: first rectangle
|
||||
* @b: second rectangle
|
||||
*
|
||||
* RETURNS:
|
||||
* %true if the rectangles overlap, %false otherwise.
|
||||
*/
|
||||
static inline bool drm_rect_overlap(const struct drm_rect *a,
|
||||
const struct drm_rect *b)
|
||||
{
|
||||
return (a->x2 > b->x1 && b->x2 > a->x1 &&
|
||||
a->y2 > b->y1 && b->y2 > a->y1);
|
||||
}
|
||||
|
||||
bool drm_rect_intersect(struct drm_rect *r, const struct drm_rect *clip);
|
||||
bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
|
||||
const struct drm_rect *clip);
|
||||
|
||||
@@ -222,7 +222,7 @@ struct ttm_lru_walk {
|
||||
struct ttm_operation_ctx *ctx;
|
||||
/** @ticket: The struct ww_acquire_ctx if any. */
|
||||
struct ww_acquire_ctx *ticket;
|
||||
/** @tryock_only: Only use trylock for locking. */
|
||||
/** @trylock_only: Only use trylock for locking. */
|
||||
bool trylock_only;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user