admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm: gud: replace WARN_ON/WARN_ON_ONCE with drm versions

Browse Source 
GUD is a drm driver, and therefore should use the drm versions of
WARN_ON and WARN_ON_ONCE. This patch replaces all instances of WARN_ON
and WARN_ON_ONCE with drm_WARN_ON and drm_WARN_ON_ONCE.

Signed-off-by: Ruben Wauters <rubenru09@aol.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250914155308.2144-1-rubenru09@aol.com
This commit is contained in:
Ruben Wauters
2025-09-14 16:50:52 +01:00
committed by Thomas Zimmermann
parent f7d9c6a7f2
commit 2d2f1dc74c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/gud/gud_connector.c
View File

@@ -561,11 +561,11 @@ static int gud_connector_add_properties(struct gud_device *gdrm, struct gud_conn
continue; /* not a DRM property */ continue; /* not a DRM property */
property = gud_connector_property_lookup(connector, prop); property = gud_connector_property_lookup(connector, prop);
if (WARN_ON(IS_ERR(property))) if (drm_WARN_ON(drm, IS_ERR(property)))
continue; continue;
state_val = gud_connector_tv_state_val(prop, &gconn->initial_tv_state); state_val = gud_connector_tv_state_val(prop, &gconn->initial_tv_state);
if (WARN_ON(IS_ERR(state_val))) if (drm_WARN_ON(drm, IS_ERR(state_val)))
continue; continue;
*state_val = val; *state_val = val;
@@ -593,7 +593,7 @@ int gud_connector_fill_properties(struct drm_connector_state *connector_state,
unsigned int *state_val; unsigned int *state_val;
state_val = gud_connector_tv_state_val(prop, &connector_state->tv); state_val = gud_connector_tv_state_val(prop, &connector_state->tv);
if (WARN_ON_ONCE(IS_ERR(state_val))) if (drm_WARN_ON_ONCE(connector_state->connector->dev, state_val))
return PTR_ERR(state_val); return PTR_ERR(state_val);
val = *state_val; val = *state_val;
@@ -667,7 +667,7 @@ static int gud_connector_create(struct gud_device *gdrm, unsigned int index,
return ret; return ret;
} }
if (WARN_ON(connector->index != index)) if (drm_WARN_ON(drm, connector->index != index))
return -EINVAL; return -EINVAL;
if (flags & GUD_CONNECTOR_FLAGS_POLL_STATUS) if (flags & GUD_CONNECTOR_FLAGS_POLL_STATUS)

10
drivers/gpu/drm/gud/gud_pipe.c
View File

@@ -61,7 +61,7 @@ static size_t gud_xrgb8888_to_r124(u8 *dst, const struct drm_format_info *format
size_t len; size_t len;
void *buf; void *buf;
WARN_ON_ONCE(format->char_per_block[0] != 1); drm_WARN_ON_ONCE(fb->dev, format->char_per_block[0] != 1);
/* Start on a byte boundary */ /* Start on a byte boundary */
rect->x1 = ALIGN_DOWN(rect->x1, block_width); rect->x1 = ALIGN_DOWN(rect->x1, block_width);
@@ -138,7 +138,7 @@ static size_t gud_xrgb8888_to_color(u8 *dst, const struct drm_format_info *forma
pix = ((r >> 7) << 2) | ((g >> 7) << 1) | (b >> 7); pix = ((r >> 7) << 2) | ((g >> 7) << 1) | (b >> 7);
break; break;
default: default:
WARN_ON_ONCE(1); drm_WARN_ON_ONCE(fb->dev, 1);
return len; return len;
} }
@@ -527,7 +527,7 @@ int gud_plane_atomic_check(struct drm_plane *plane,
drm_connector_list_iter_end(&conn_iter); drm_connector_list_iter_end(&conn_iter);
} }
if (WARN_ON_ONCE(!connector_state)) if (drm_WARN_ON_ONCE(plane->dev, !connector_state))
return -ENOENT; return -ENOENT;
len = struct_size(req, properties, len = struct_size(req, properties,
@@ -539,7 +539,7 @@ int gud_plane_atomic_check(struct drm_plane *plane,
gud_from_display_mode(&req->mode, mode); gud_from_display_mode(&req->mode, mode);
req->format = gud_from_fourcc(format->format); req->format = gud_from_fourcc(format->format);
if (WARN_ON_ONCE(!req->format)) { if (drm_WARN_ON_ONCE(plane->dev, !req->format)) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
@@ -561,7 +561,7 @@ int gud_plane_atomic_check(struct drm_plane *plane,
val = new_plane_state->rotation; val = new_plane_state->rotation;
break; break;
default: default:
WARN_ON_ONCE(1); drm_WARN_ON_ONCE(plane->dev, 1);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }