leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
irrelevant swapout
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYK+LpgAKCRDj7w1vZxhR
 xQpPAQDGiLT6DMi3bnnPydqCyZZfkSy4lXNflOeoRe34eAcCSgD+KfQR2gaHJoA0
 T4YbzZB21ZbxZFomjo+WNv0WYtImSgY=
 =24lG
 -----END PGP SIGNATURE-----

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210527120828.3w7f53krzkslc4ii@gilmour
This commit is contained in:
Dave Airlie 2021-05-28 13:24:25 +10:00
commit b26389e854
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/meson/meson_drv.c
View File

@ -485,11 +485,12 @@ static int meson_probe_remote(struct platform_device *pdev,
static void meson_drv_shutdown(struct platform_device *pdev) static void meson_drv_shutdown(struct platform_device *pdev)
{ {
struct meson_drm *priv = dev_get_drvdata(&pdev->dev); struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
struct drm_device *drm = priv->drm;
DRM_DEBUG_DRIVER("\n"); if (!priv)
drm_kms_helper_poll_fini(drm); return;
drm_atomic_helper_shutdown(drm);
drm_kms_helper_poll_fini(priv->drm);
drm_atomic_helper_shutdown(priv->drm);
} }
static int meson_drv_probe(struct platform_device *pdev) static int meson_drv_probe(struct platform_device *pdev)

2
drivers/gpu/drm/ttm/ttm_device.c
View File

@ -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) { list_for_each_entry(bo, &man->lru[j], lru) {
uint32_t num_pages; 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_SG ||
bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED) bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)
continue; continue;