diff options
| author | Neil Armstrong <neil.armstrong@linaro.org> | 2024-06-06 11:19:47 +0200 |
|---|---|---|
| committer | Neil Armstrong <neil.armstrong@linaro.org> | 2024-06-06 11:19:47 +0200 |
| commit | 4c607a73300b756ad1c8001abcfe37bf53b5a5f1 (patch) | |
| tree | 81b36e4b324925478fe58ddd3cebfd78e1428d11 /drivers/gpu/drm/lima | |
| parent | 1d1239a1b0e502faffe43b97d530232285b9f061 (diff) | |
| parent | 5bbe5872fed4497a192556426d75fd9223c5bfeb (diff) | |
Merge branch 'dt' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm into v6.11/arm64-dt
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Diffstat (limited to 'drivers/gpu/drm/lima')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c index 7ea244d876ca..9bb997dbb4b9 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -185,7 +185,7 @@ static int lima_gem_pin(struct drm_gem_object *obj) if (bo->heap_size) return -EINVAL; - return drm_gem_shmem_pin(&bo->base); + return drm_gem_shmem_pin_locked(&bo->base); } static int lima_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) |