Commit f5a9c2b4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2025-09-18' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://lore.kernel.org/r/20250918-orthodox-pretty-puma-1ddeea@houat
parents 5349f295 288dac9f

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

+4 −2
Original line number Diff line number Diff line
@@ -2677,7 +2677,7 @@ static int anx7625_i2c_probe(struct i2c_client *client) 
		ret = devm_request_threaded_irq(dev, platform->pdata.intp_irq,

						NULL, anx7625_intr_hpd_isr,

						IRQF_TRIGGER_FALLING |

						IRQF_ONESHOT,

						IRQF_ONESHOT | IRQF_NO_AUTOEN,

						"anx7625-intp", platform);

		if (ret) {

			DRM_DEV_ERROR(dev, "fail to request irq\n");
@@ -2746,8 +2746,10 @@ static int anx7625_i2c_probe(struct i2c_client *client) 
	}



	/* Add work function */

	if (platform->pdata.intp_irq)

	if (platform->pdata.intp_irq) {

		enable_irq(platform->pdata.intp_irq);

		queue_work(platform->workqueue, &platform->work);

	}



	if (platform->pdata.audio_en)

		anx7625_register_audio(dev, platform);

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

+4 −2
Original line number Diff line number Diff line
@@ -1984,8 +1984,10 @@ static void cdns_mhdp_atomic_enable(struct drm_bridge *bridge, 
	mhdp_state = to_cdns_mhdp_bridge_state(new_state);



	mhdp_state->current_mode = drm_mode_duplicate(bridge->dev, mode);

	if (!mhdp_state->current_mode)

		return;

	if (!mhdp_state->current_mode) {

		ret = -EINVAL;

		goto out;

	}



	drm_mode_set_name(mhdp_state->current_mode);

drivers/gpu/drm/drm_gpuvm.c

+0 −2
Original line number Diff line number Diff line
@@ -2432,8 +2432,6 @@ static const struct drm_gpuvm_ops lock_ops = { 
 *

 * The expected usage is::

 *

 * .. code-block:: c

 *

 *    vm_bind {

 *        struct drm_exec exec;

 *