diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-09-14 12:34:58 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-09-15 16:36:54 +0300 |
| commit | 02cc0ebc41790d190186321bedaa0ba820abbe20 (patch) | |
| tree | 058538360a04ace6291622033090560b0b8b511b | |
| parent | e7b392824223a08440cb0258a4e65d70af2a5c6e (diff) | |
| download | linux-02cc0ebc41790d190186321bedaa0ba820abbe20.tar.xz | |
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
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fb_pin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c index fffd568070d4..7b42aef37d2f 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); |