Skip to content

Commit 6e1f415

Browse files
committed
Merge tag 'drm-misc-next-2024-04-10' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.10: Cross-subsystem Changes: - Add Tomi as Xilinx maintainer. - Add sound bindings to DT. Core Changes: - Make DP helper depend on KMS helper. Driver Changes: - Assorted small fixes to bridge/dw-hdmi, bridge/cdns-mhdp8456, xlnx, omap, tilcdc, bridge/imx8mp-hdmi-pvi. - Add debugfs entries to qaic. - Add conservative fallback to panel eDP. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 1f91373 + 29b3967 commit 6e1f415

File tree

18 files changed

+450
-56
lines changed

18 files changed

+450
-56
lines changed

Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: ITE it6505
99
maintainers:
1010
- Allen Chen <[email protected]>
1111

12+
allOf:
13+
- $ref: /schemas/sound/dai-common.yaml#
14+
1215
description: |
1316
The IT6505 is a high-performance DisplayPort 1.1a transmitter,
1417
fully compliant with DisplayPort 1.1a, HDCP 1.3 specifications.
@@ -52,6 +55,9 @@ properties:
5255
maxItems: 1
5356
description: extcon specifier for the Power Delivery
5457

58+
"#sound-dai-cells":
59+
const: 0
60+
5561
ports:
5662
$ref: /schemas/graph.yaml#/properties/ports
5763

@@ -105,7 +111,7 @@ required:
105111
- extcon
106112
- ports
107113

108-
additionalProperties: false
114+
unevaluatedProperties: false
109115

110116
examples:
111117
- |

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7380,6 +7380,7 @@ F: drivers/gpu/drm/xen/
73807380

73817381
DRM DRIVERS FOR XILINX
73827382
M: Laurent Pinchart <[email protected]>
7383+
M: Tomi Valkeinen <[email protected]>
73837384
73847385
S: Maintained
73857386
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git

drivers/accel/qaic/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ qaic-y := \
1111
qaic_data.o \
1212
qaic_drv.o \
1313
qaic_timesync.o
14+
15+
qaic-$(CONFIG_DEBUG_FS) += qaic_debugfs.o

drivers/accel/qaic/qaic.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,14 @@ struct qaic_device {
153153
struct mhi_device *qts_ch;
154154
/* Work queue for tasks related to MHI "QAIC_TIMESYNC" channel */
155155
struct workqueue_struct *qts_wq;
156+
/* Head of list of page allocated by MHI bootlog device */
157+
struct list_head bootlog;
158+
/* MHI bootlog channel device */
159+
struct mhi_device *bootlog_ch;
160+
/* Work queue for tasks related to MHI bootlog device */
161+
struct workqueue_struct *bootlog_wq;
162+
/* Synchronizes access of pages in MHI bootlog device */
163+
struct mutex bootlog_mutex;
156164
};
157165

158166
struct qaic_drm_device {
@@ -280,6 +288,7 @@ int disable_dbc(struct qaic_device *qdev, u32 dbc_id, struct qaic_user *usr);
280288
void enable_dbc(struct qaic_device *qdev, u32 dbc_id, struct qaic_user *usr);
281289
void wakeup_dbc(struct qaic_device *qdev, u32 dbc_id);
282290
void release_dbc(struct qaic_device *qdev, u32 dbc_id);
291+
void qaic_data_get_fifo_info(struct dma_bridge_chan *dbc, u32 *head, u32 *tail);
283292

284293
void wake_all_cntl(struct qaic_device *qdev);
285294
void qaic_dev_reset_clean_local_state(struct qaic_device *qdev);

drivers/accel/qaic/qaic_data.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,3 +1981,12 @@ void release_dbc(struct qaic_device *qdev, u32 dbc_id)
19811981
dbc->in_use = false;
19821982
wake_up(&dbc->dbc_release);
19831983
}
1984+
1985+
void qaic_data_get_fifo_info(struct dma_bridge_chan *dbc, u32 *head, u32 *tail)
1986+
{
1987+
if (!dbc || !head || !tail)
1988+
return;
1989+
1990+
*head = readl(dbc->dbc_base + REQHP_OFF);
1991+
*tail = readl(dbc->dbc_base + REQTP_OFF);
1992+
}

0 commit comments

Comments
 (0)