drm/i915/fb: replace GEM_WARN_ON() with drm_WARN_ON()

Avoid using GEM_WARN_ON() in display code.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/593285450602c259b6985972d68511190c754bf5.1694684044.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index fffd568070d4141c5c3f7b7f0e1d220f1e0481c7..7b42aef37d2f72275603e9f80950ae1edd55d203 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -35,7 +35,8 @@ intel_pin_fb_obj_dpt(struct drm_framebuffer *fb,
         * We are not syncing against the binding (and potential migrations)
         * below, so this vm must never be async.
         */
-       GEM_WARN_ON(vm->bind_async_flags);
+       if (drm_WARN_ON(&dev_priv->drm, vm->bind_async_flags))
+               return ERR_PTR(-EINVAL);
 
        if (WARN_ON(!i915_gem_object_is_framebuffer(obj)))
                return ERR_PTR(-EINVAL);