Commit 062ff85b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2023-08-03' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes 



A NULL pointer dereference fix for TTM, a timings fix for imx/ipuv3 and
the addition of a MODULE_DEVICE_TABLE for the samsung-s6d7aa0 panel.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ztfogof2dhtlvjwe73mvd2jp5kbldhkkav7k5culuseqblwpti@qfobohwx3c3j
parents 5d0c230f c71b7aa8

drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void ipu_crtc_mode_set_nofb(struct drm_crtc *crtc) 
		dev_warn(ipu_crtc->dev, "8-pixel align hactive %d -> %d\n",

			 sig_cfg.mode.hactive, new_hactive);



		sig_cfg.mode.hfront_porch = new_hactive - sig_cfg.mode.hactive;

		sig_cfg.mode.hfront_porch -= new_hactive - sig_cfg.mode.hactive;

		sig_cfg.mode.hactive = new_hactive;

	}

drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static const struct of_device_id s6d7aa0_of_match[] = { 
	},

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, s6d7aa0_of_match);



static struct mipi_dsi_driver s6d7aa0_driver = {

	.probe = s6d7aa0_probe,

drivers/gpu/drm/ttm/ttm_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ static bool ttm_bo_evict_swapout_allowable(struct ttm_buffer_object *bo, 


	if (bo->pin_count) {

		*locked = false;

		if (busy)

			*busy = false;

		return false;

	}