Skip to content

Commit

Permalink
Merge tag 'drm-misc-next-2024-04-10' of https://gitlab.freedesktop.or…
Browse files Browse the repository at this point in the history
…g/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 <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/dc690de5-17da-4af6-93a9-8078c99245fd@linux.intel.com
  • Loading branch information
Dave Airlie committed Apr 11, 2024
2 parents 1f91373 + 29b3967 commit 6e1f415
Show file tree
Hide file tree
Showing 18 changed files with 450 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ title: ITE it6505
maintainers:
- Allen Chen <allen.chen@ite.com.tw>

allOf:
- $ref: /schemas/sound/dai-common.yaml#

description: |
The IT6505 is a high-performance DisplayPort 1.1a transmitter,
fully compliant with DisplayPort 1.1a, HDCP 1.3 specifications.
Expand Down Expand Up @@ -52,6 +55,9 @@ properties:
maxItems: 1
description: extcon specifier for the Power Delivery

"#sound-dai-cells":
const: 0

ports:
$ref: /schemas/graph.yaml#/properties/ports

Expand Down Expand Up @@ -105,7 +111,7 @@ required:
- extcon
- ports

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -7380,6 +7380,7 @@ F: drivers/gpu/drm/xen/

DRM DRIVERS FOR XILINX
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
M: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
L: dri-devel@lists.freedesktop.org
S: Maintained
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
Expand Down
2 changes: 2 additions & 0 deletions drivers/accel/qaic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ qaic-y := \
qaic_data.o \
qaic_drv.o \
qaic_timesync.o

qaic-$(CONFIG_DEBUG_FS) += qaic_debugfs.o
9 changes: 9 additions & 0 deletions drivers/accel/qaic/qaic.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,14 @@ struct qaic_device {
struct mhi_device *qts_ch;
/* Work queue for tasks related to MHI "QAIC_TIMESYNC" channel */
struct workqueue_struct *qts_wq;
/* Head of list of page allocated by MHI bootlog device */
struct list_head bootlog;
/* MHI bootlog channel device */
struct mhi_device *bootlog_ch;
/* Work queue for tasks related to MHI bootlog device */
struct workqueue_struct *bootlog_wq;
/* Synchronizes access of pages in MHI bootlog device */
struct mutex bootlog_mutex;
};

struct qaic_drm_device {
Expand Down Expand Up @@ -280,6 +288,7 @@ int disable_dbc(struct qaic_device *qdev, u32 dbc_id, struct qaic_user *usr);
void enable_dbc(struct qaic_device *qdev, u32 dbc_id, struct qaic_user *usr);
void wakeup_dbc(struct qaic_device *qdev, u32 dbc_id);
void release_dbc(struct qaic_device *qdev, u32 dbc_id);
void qaic_data_get_fifo_info(struct dma_bridge_chan *dbc, u32 *head, u32 *tail);

void wake_all_cntl(struct qaic_device *qdev);
void qaic_dev_reset_clean_local_state(struct qaic_device *qdev);
Expand Down
9 changes: 9 additions & 0 deletions drivers/accel/qaic/qaic_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -1981,3 +1981,12 @@ void release_dbc(struct qaic_device *qdev, u32 dbc_id)
dbc->in_use = false;
wake_up(&dbc->dbc_release);
}

void qaic_data_get_fifo_info(struct dma_bridge_chan *dbc, u32 *head, u32 *tail)
{
if (!dbc || !head || !tail)
return;

*head = readl(dbc->dbc_base + REQHP_OFF);
*tail = readl(dbc->dbc_base + REQTP_OFF);
}
Loading

0 comments on commit 6e1f415

Please sign in to comment.