system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-05 10:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/rect: Add drm_rect_overlap()

Browse source 
Check if two rectangles overlap.
It's a bit similar to drm_rect_intersect() but this won't modify
the rectangle.
Simplifies a bit drm_panic.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240822073852.562286-3-jfalempe@redhat.com
This commit is contained in:
Jocelyn Falempe 2024-08-22 09:33:55 +02:00
parent 6133cf7072
commit 4b570ac2eb
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/drm_panic.c
View file

@ -529,8 +529,7 @@ static void draw_panic_static_user(struct drm_scanout_buffer *sb)
/* Fill with the background color, and draw text on top */ /* Fill with the background color, and draw text on top */
drm_panic_fill(sb, &r_screen, bg_color); drm_panic_fill(sb, &r_screen, bg_color);
if ((r_msg.x1 >= logo_width || r_msg.y1 >= logo_height) && if (!drm_rect_overlap(&r_logo, &r_msg)) {
logo_width <= sb->width && logo_height <= sb->height) {
if (logo_mono) if (logo_mono)
drm_panic_blit(sb, &r_logo, logo_mono->data, DIV_ROUND_UP(logo_width, 8), drm_panic_blit(sb, &r_logo, logo_mono->data, DIV_ROUND_UP(logo_width, 8),
fg_color); fg_color);

15
include/drm/drm_rect.h
View file

@ -238,6 +238,21 @@ static inline void drm_rect_fp_to_int(struct drm_rect *dst,
drm_rect_height(src) >> 16); drm_rect_height(src) >> 16);
} }
/**
* drm_rect_overlap - Check if two rectangles overlap
* @a: first rectangle
* @b: second rectangle
*
* RETURNS:
* %true if the rectangles overlap, %false otherwise.
*/
static inline bool drm_rect_overlap(const struct drm_rect *a,
const struct drm_rect *b)
{
return (a->x2 > b->x1 && b->x2 > a->x1 &&
a->y2 > b->y1 && b->y2 > a->y1);
}
bool drm_rect_intersect(struct drm_rect *r, const struct drm_rect *clip); bool drm_rect_intersect(struct drm_rect *r, const struct drm_rect *clip);
bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst, bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
const struct drm_rect *clip); const struct drm_rect *clip);