Commit 02b8f0b7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-fixes-for-v6.4-rc6' of... 

Merge tag 'exynos-drm-fixes-for-v6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-fixes

Two fixups
- Fix wrong return in Exynos vidi driver.
- Fix use-after-free issue to Exynos g2d driver.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230607043148.43303-1-inki.dae@samsung.com
parents d6d4f0a1 48bfd025

drivers/gpu/drm/exynos/exynos_drm_g2d.c

+1 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,7 @@ int exynos_g2d_exec_ioctl(struct drm_device *drm_dev, void *data, 
	/* Let the runqueue know that there is work to do. */

	queue_work(g2d->g2d_workq, &g2d->runqueue_work);



	if (runqueue_node->async)

	if (req->async)

		goto out;



	wait_for_completion(&runqueue_node->complete);

drivers/gpu/drm/exynos/exynos_drm_vidi.c

+0 −2
Original line number Diff line number Diff line
@@ -469,8 +469,6 @@ static int vidi_remove(struct platform_device *pdev) 
	if (ctx->raw_edid != (struct edid *)fake_edid_info) {

		kfree(ctx->raw_edid);

		ctx->raw_edid = NULL;



		return -EINVAL;

	}



	component_del(&pdev->dev, &vidi_component_ops);