diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-08-24 07:26:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-08-24 07:26:06 +1000 |
| commit | fdebffeba8b877368ddcc139c26278c1c97931a4 (patch) | |
| tree | 5ebf85a3e26d55ea388aa7a8608222205a4d59ba /drivers/gpu/drm/ttm | |
| parent | cacaeb27ade4b793c456179bb6eda4592d206cd8 (diff) | |
| parent | 706a741595047797872e669b3101429ab8d378ef (diff) | |
| download | lwn-fdebffeba8b877368ddcc139c26278c1c97931a4.tar.gz lwn-fdebffeba8b877368ddcc139c26278c1c97931a4.zip | |
BackMerge tag 'v6.5-rc7' into drm-next
Linux 6.5-rc7
This is needed for the CI stuff and the msm pull has fixes in it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index aa8ab1a418af..e58b7e249816 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -520,7 +520,8 @@ static bool ttm_bo_evict_swapout_allowable(struct ttm_buffer_object *bo, if (bo->pin_count) { *locked = false; - *busy = false; + if (busy) + *busy = false; return false; } |