Re: [Intel-gfx] [PATCH 2/3] drm/i915/fb: replace GEM_WARN_ON() with drm_WARN_ON()

[Rodrigo Vivi]

On Thu, Sep 14, 2023 at 12:34:58PM +0300, Jani Nikula wrote:
> Avoid using GEM_WARN_ON() in display code.
> 
> Signed-off-by: Jani Nikula 

Reviewed-by: Rodrigo Vivi 

> ---
>  drivers/gpu/drm/i915/display/intel_fb_pin.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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);
> -- 
> 2.39.2
> 

[Intel-gfx] [PATCH 2/3] drm/i915/fb: replace GEM_WARN_ON() with drm_WARN_ON()

[Jani Nikula]

Avoid using GEM_WARN_ON() in display code.

Signed-off-by: Jani Nikula 
---
 drivers/gpu/drm/i915/display/intel_fb_pin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
-- 
2.39.2