From: Jani Nikula Date: Thu, 14 Sep 2023 09:34:58 +0000 (+0300) Subject: drm/i915/fb: replace GEM_WARN_ON() with drm_WARN_ON() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=02cc0ebc41790d190186321bedaa0ba820abbe20;p=linux.git drm/i915/fb: replace GEM_WARN_ON() with drm_WARN_ON() Avoid using GEM_WARN_ON() in display code. Signed-off-by: Jani Nikula Reviewed-by: Rodrigo Vivi 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 fffd568070d41..7b42aef37d2f7 100644 --- 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);