tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm: gud: replace WARN_ON/WARN_ON_ONCE with drm versions

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

authored by

Ruben Wauters and committed by
Thomas Zimmermann 2d2f1dc7 f7d9c6a7

+9 -9
+4 -4
drivers/gpu/drm/gud/gud_connector.c
··· 561 561 continue; /* not a DRM property */ 562 562 563 563 property = gud_connector_property_lookup(connector, prop); 564 - if (WARN_ON(IS_ERR(property))) 564 + if (drm_WARN_ON(drm, IS_ERR(property))) 565 565 continue; 566 566 567 567 state_val = gud_connector_tv_state_val(prop, &gconn->initial_tv_state); 568 - if (WARN_ON(IS_ERR(state_val))) 568 + if (drm_WARN_ON(drm, IS_ERR(state_val))) 569 569 continue; 570 570 571 571 *state_val = val; ··· 593 593 unsigned int *state_val; 594 594 595 595 state_val = gud_connector_tv_state_val(prop, &connector_state->tv); 596 - if (WARN_ON_ONCE(IS_ERR(state_val))) 596 + if (drm_WARN_ON_ONCE(connector_state->connector->dev, state_val)) 597 597 return PTR_ERR(state_val); 598 598 599 599 val = *state_val; ··· 667 667 return ret; 668 668 } 669 669 670 - if (WARN_ON(connector->index != index)) 670 + if (drm_WARN_ON(drm, connector->index != index)) 671 671 return -EINVAL; 672 672 673 673 if (flags & GUD_CONNECTOR_FLAGS_POLL_STATUS)
+5 -5
drivers/gpu/drm/gud/gud_pipe.c
··· 61 61 size_t len; 62 62 void *buf; 63 63 64 - WARN_ON_ONCE(format->char_per_block[0] != 1); 64 + drm_WARN_ON_ONCE(fb->dev, format->char_per_block[0] != 1); 65 65 66 66 /* Start on a byte boundary */ 67 67 rect->x1 = ALIGN_DOWN(rect->x1, block_width); ··· 138 138 pix = ((r >> 7) << 2) | ((g >> 7) << 1) | (b >> 7); 139 139 break; 140 140 default: 141 - WARN_ON_ONCE(1); 141 + drm_WARN_ON_ONCE(fb->dev, 1); 142 142 return len; 143 143 } 144 144 ··· 527 527 drm_connector_list_iter_end(&conn_iter); 528 528 } 529 529 530 - if (WARN_ON_ONCE(!connector_state)) 530 + if (drm_WARN_ON_ONCE(plane->dev, !connector_state)) 531 531 return -ENOENT; 532 532 533 533 len = struct_size(req, properties, ··· 539 539 gud_from_display_mode(&req->mode, mode); 540 540 541 541 req->format = gud_from_fourcc(format->format); 542 - if (WARN_ON_ONCE(!req->format)) { 542 + if (drm_WARN_ON_ONCE(plane->dev, !req->format)) { 543 543 ret = -EINVAL; 544 544 goto out; 545 545 } ··· 561 561 val = new_plane_state->rotation; 562 562 break; 563 563 default: 564 - WARN_ON_ONCE(1); 564 + drm_WARN_ON_ONCE(plane->dev, 1); 565 565 ret = -EINVAL; 566 566 goto out; 567 567 }