diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2020-05-11 11:35:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2020-06-03 14:48:26 +0200 |
| commit | e0b3d2140ec6f04335eb20f4651ca2b705084268 (patch) | |
| tree | deabac7adc2d53d2a3d8be808c11c5ae78815e09 /drivers/gpu/drm/drm_gem.c | |
| parent | 8b6b7d84bfce9a2a29e66147d7acafd0be9bb211 (diff) | |
| download | linux-stable-e0b3d2140ec6f04335eb20f4651ca2b705084268.tar.gz linux-stable-e0b3d2140ec6f04335eb20f4651ca2b705084268.tar.bz2 linux-stable-e0b3d2140ec6f04335eb20f4651ca2b705084268.zip | |
drm/gem: WARN if drm_gem_get_pages is called on a private obj
No real functional change, since this just converts an annoying Oops
into a more harmless WARNING backtrace. It's still a driver bug.
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200511093554.211493-3-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index efc0367841e2..94dd94230fd1 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -548,6 +548,10 @@ static void drm_gem_check_release_pagevec(struct pagevec *pvec) * set during initialization. If you have special zone constraints, set them * after drm_gem_object_init() via mapping_set_gfp_mask(). shmem-core takes care * to keep pages in the required zone during swap-in. + * + * This function is only valid on objects initialized with + * drm_gem_object_init(), but not for those initialized with + * drm_gem_private_object_init() only. */ struct page **drm_gem_get_pages(struct drm_gem_object *obj) { @@ -556,6 +560,10 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj) struct pagevec pvec; int i, npages; + + if (WARN_ON(!obj->filp)) + return ERR_PTR(-EINVAL); + /* This is the shared memory object that backs the GEM resource */ mapping = obj->filp->f_mapping; |