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

Merge tag 'drm-misc-fixes-2021-05-27' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes 



A fix in meson for a crash at shutdown and one for TTM to prevent
irrelevant swapout

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210527120828.3w7f53krzkslc4ii@gilmour
parents ac6e9e3d 35f819d2

drivers/gpu/drm/meson/meson_drv.c

+5 −4
Original line number Diff line number Diff line
@@ -485,11 +485,12 @@ static int meson_probe_remote(struct platform_device *pdev, 
static void meson_drv_shutdown(struct platform_device *pdev)

{

	struct meson_drm *priv = dev_get_drvdata(&pdev->dev);

	struct drm_device *drm = priv->drm;



	DRM_DEBUG_DRIVER("\n");

	drm_kms_helper_poll_fini(drm);

	drm_atomic_helper_shutdown(drm);

	if (!priv)

		return;



	drm_kms_helper_poll_fini(priv->drm);

	drm_atomic_helper_shutdown(priv->drm);

}



static int meson_drv_probe(struct platform_device *pdev)

drivers/gpu/drm/ttm/ttm_device.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int ttm_device_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *ctx, 
			list_for_each_entry(bo, &man->lru[j], lru) {

				uint32_t num_pages;



				if (!bo->ttm ||

				if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) ||

				    bo->ttm->page_flags & TTM_PAGE_FLAG_SG ||

				    bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)

					continue;