Skip to content

Commit f5a9c2b

Browse files
committed
Merge tag 'drm-misc-fixes-2025-09-18' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
One fix for a documentation warning, a null pointer dereference fix for anx7625, and a mutex unlock fix for cdns-mhdp8546 Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <mripard@redhat.com> Link: https://lore.kernel.org/r/20250918-orthodox-pretty-puma-1ddeea@houat
2 parents 5349f29 + 288dac9 commit f5a9c2b

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

drivers/gpu/drm/bridge/analogix/anx7625.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2677,7 +2677,7 @@ static int anx7625_i2c_probe(struct i2c_client *client)
26772677
ret = devm_request_threaded_irq(dev, platform->pdata.intp_irq,
26782678
NULL, anx7625_intr_hpd_isr,
26792679
IRQF_TRIGGER_FALLING |
2680-
IRQF_ONESHOT,
2680+
IRQF_ONESHOT | IRQF_NO_AUTOEN,
26812681
"anx7625-intp", platform);
26822682
if (ret) {
26832683
DRM_DEV_ERROR(dev, "fail to request irq\n");
@@ -2746,8 +2746,10 @@ static int anx7625_i2c_probe(struct i2c_client *client)
27462746
}
27472747

27482748
/* Add work function */
2749-
if (platform->pdata.intp_irq)
2749+
if (platform->pdata.intp_irq) {
2750+
enable_irq(platform->pdata.intp_irq);
27502751
queue_work(platform->workqueue, &platform->work);
2752+
}
27512753

27522754
if (platform->pdata.audio_en)
27532755
anx7625_register_audio(dev, platform);

drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,8 +1984,10 @@ static void cdns_mhdp_atomic_enable(struct drm_bridge *bridge,
19841984
mhdp_state = to_cdns_mhdp_bridge_state(new_state);
19851985

19861986
mhdp_state->current_mode = drm_mode_duplicate(bridge->dev, mode);
1987-
if (!mhdp_state->current_mode)
1988-
return;
1987+
if (!mhdp_state->current_mode) {
1988+
ret = -EINVAL;
1989+
goto out;
1990+
}
19891991

19901992
drm_mode_set_name(mhdp_state->current_mode);
19911993

drivers/gpu/drm/drm_gpuvm.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,8 +2432,6 @@ static const struct drm_gpuvm_ops lock_ops = {
24322432
*
24332433
* The expected usage is::
24342434
*
2435-
* .. code-block:: c
2436-
*
24372435
* vm_bind {
24382436
* struct drm_exec exec;
24392437
*

0 commit comments

Comments
 (0)