[PATCH v19 26/30] drm/shmem-helper: Turn warnings about imported GEM into errors

[Dmitry Osipenko]

Turn sanity warnings about DRM-SHMEM API misuse into a error conditions
for cases where imported GEM is used when it shouldn't be used.

Signed-off-by: Dmitry Osipenko <dmitry.osipe...@collabora.com>
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c 
b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 0d95d723b90d..7d2fe12bd793 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -409,7 +409,8 @@ int drm_gem_shmem_pin(struct drm_gem_shmem_object *shmem)
        struct drm_gem_object *obj = &shmem->base;
        int ret;
 
-       drm_WARN_ON(obj->dev, obj->import_attach);
+       if (drm_WARN_ON(obj->dev, obj->import_attach))
+               return -EINVAL;
 
        if (refcount_inc_not_zero(&shmem->pages_pin_count))
                return 0;
@@ -872,7 +873,8 @@ struct sg_table *drm_gem_shmem_get_sg_table(struct 
drm_gem_shmem_object *shmem)
 {
        struct drm_gem_object *obj = &shmem->base;
 
-       drm_WARN_ON(obj->dev, obj->import_attach);
+       if (drm_WARN_ON(obj->dev, obj->import_attach))
+               return ERR_PTR(-EINVAL);
 
        if (drm_WARN_ON(obj->dev, !shmem->pages))
                return ERR_PTR(-ENOMEM);
@@ -909,7 +911,8 @@ struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct 
drm_gem_shmem_object
        if (shmem->sgt)
                return shmem->sgt;
 
-       drm_WARN_ON(obj->dev, obj->import_attach);
+       if (drm_WARN_ON(obj->dev, obj->import_attach))
+               return ERR_PTR(-EINVAL);
 
        sgt = drm_gem_shmem_get_sg_table(shmem);
        if (IS_ERR(sgt))
-- 
2.43.0