From nobody Wed Dec 17 05:27:08 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2374813B294 for ; Wed, 24 Jul 2024 08:00:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721808004; cv=none; b=Qyf83eKemZhHtxGcvLddFpp2rKx7RV2XZWz+lE5mi7s35t0eyl43swvnMo5+ba5hadMRchYO+WjPgzLQkONsht7zAJ7a3s+cs0vItTFxftorarEw4STJE/sOGHQbBMOc2vvb98yZGt3KmRmEFqGB1+2758LLBqilL/J2FS0wv3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721808004; c=relaxed/simple; bh=QKh8kHyo6MpTJXlDx6vSjB9+McOKu3u/UZwR+PuBLeE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=euy5Y2KPqBAwWAOCSMT3SplvvNnHdqVF2HQnWYy9hLbeAJ6rbRP6I2bPauUsqpheFlYvI3Xoz4ssZSUxZnmr497r3IfxyhYMNx5RHU2f/SfMCUHaP92A1P6YVNfNCz+zQdUIblv5OjEwCg+jLiP5he78I2KiAR59aRiSrOKgKL8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=KIVW0Lxz; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KIVW0Lxz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721808001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Logu1F9QkiqIeR53Vm0Bz7Y4kNXSgg+0lvDkeL0d8hY=; b=KIVW0Lxz+K2g+RYjRfIPu3VSlg1LY7FdccO+yF8XnCRiKqDMYd6XLEEl46FEEpzP0SHp8x e3vbgKDkUKGnE1C6UZN4FJzq9qSjfTMZVOImCrTOQhmFW4QF5NIGKWo/hUXYiq9R1D94vp d52aKi1C76zmqcdjrjg4YDa/lABG/20= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-440-mT5t_rWtNdO6dkeqBVkxUQ-1; Wed, 24 Jul 2024 03:53:08 -0400 X-MC-Unique: mT5t_rWtNdO6dkeqBVkxUQ-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6105219560AD; Wed, 24 Jul 2024 07:53:06 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.39.192.4]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D16C5195605A; Wed, 24 Jul 2024 07:53:00 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "Bjorn Roy Baron" , Benno Lossin , Andreas Hindborg , Alice Ryhl , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, rust-for-linux@vger.kernel.org, Danilo Krummrich Cc: Jocelyn Falempe Subject: [PATCH v5 3/4] drm/panic: Simplify logo handling Date: Wed, 24 Jul 2024 09:48:44 +0200 Message-ID: <20240724075227.541245-4-jfalempe@redhat.com> In-Reply-To: <20240724075227.541245-1-jfalempe@redhat.com> References: <20240724075227.541245-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Content-Type: text/plain; charset="utf-8" Move logo rectangle initialisation, and logo drawing in separate functions, so they can be re-used by different panic screens. It prepares the introduction of the QR code panic screen. Signed-off-by: Jocelyn Falempe --- drivers/gpu/drm/drm_panic.c | 57 +++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 1e954441e1b6..6e73bd200f1a 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -82,6 +82,7 @@ static struct drm_panic_line panic_msg[] =3D { PANIC_LINE(""), PANIC_LINE("Please reboot your computer."), }; +static const int panic_msg_lines =3D ARRAY_SIZE(panic_msg); =20 static const struct drm_panic_line logo_ascii[] =3D { PANIC_LINE(" .--. _"), @@ -92,6 +93,7 @@ static const struct drm_panic_line logo_ascii[] =3D { PANIC_LINE(" /'\\_ _/`\\ (_)"), PANIC_LINE(" \\___)=3D(___/"), }; +static const int logo_ascii_lines =3D ARRAY_SIZE(logo_ascii); =20 #if defined(CONFIG_LOGO) && !defined(MODULE) static const struct linux_logo *logo_mono; @@ -490,33 +492,45 @@ static void draw_txt_rectangle(struct drm_scanout_buf= fer *sb, } } =20 +static void drm_panic_logo_rect(struct drm_rect *rect, const struct font_d= esc *font) +{ + if (logo_mono) + drm_rect_init(rect, 0, 0, logo_mono->width, logo_mono->height); + else { + int logo_width =3D get_max_line_len(logo_ascii, logo_ascii_lines) * font= ->width; + + drm_rect_init(rect, 0, 0, logo_width, logo_ascii_lines * font->height); + } +} + +static void drm_panic_logo_draw(struct drm_scanout_buffer *sb, struct drm_= rect *rect, + const struct font_desc *font, u32 fg_color) +{ + if (logo_mono) + drm_panic_blit(sb, rect, logo_mono->data, + DIV_ROUND_UP(drm_rect_width(rect), 8), 1, fg_color); + else + draw_txt_rectangle(sb, font, logo_ascii, logo_ascii_lines, false, rect, + fg_color); +} + static void draw_panic_static_user(struct drm_scanout_buffer *sb) { - size_t msg_lines =3D ARRAY_SIZE(panic_msg); - size_t logo_ascii_lines =3D ARRAY_SIZE(logo_ascii); u32 fg_color =3D convert_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR,= sb->format->format); u32 bg_color =3D convert_from_xrgb8888(CONFIG_DRM_PANIC_BACKGROUND_COLOR,= sb->format->format); const struct font_desc *font =3D get_default_font(sb->width, sb->height, = NULL, NULL); struct drm_rect r_screen, r_logo, r_msg; - unsigned int logo_width, logo_height; + unsigned int panic_msg_width; =20 if (!font) return; =20 r_screen =3D DRM_RECT_INIT(0, 0, sb->width, sb->height); - - if (logo_mono) { - logo_width =3D logo_mono->width; - logo_height =3D logo_mono->height; - } else { - logo_width =3D get_max_line_len(logo_ascii, logo_ascii_lines) * font->wi= dth; - logo_height =3D logo_ascii_lines * font->height; - } - - r_logo =3D DRM_RECT_INIT(0, 0, logo_width, logo_height); + drm_panic_logo_rect(&r_logo, font); + panic_msg_width =3D get_max_line_len(panic_msg, panic_msg_lines) * font->= width; r_msg =3D DRM_RECT_INIT(0, 0, - min(get_max_line_len(panic_msg, msg_lines) * font->width, sb->wid= th), - min(msg_lines * font->height, sb->height)); + min(panic_msg_width, sb->width), + min(panic_msg_lines * font->height, sb->height)); =20 /* Center the panic message */ drm_rect_translate(&r_msg, (sb->width - r_msg.x2) / 2, (sb->height - r_ms= g.y2) / 2); @@ -524,15 +538,10 @@ static void draw_panic_static_user(struct drm_scanout= _buffer *sb) /* Fill with the background color, and draw text on top */ drm_panic_fill(sb, &r_screen, bg_color); =20 - if (!drm_rect_overlap(&r_logo, &r_msg)) { - if (logo_mono) - drm_panic_blit(sb, &r_logo, logo_mono->data, DIV_ROUND_UP(logo_width, 8= ), - fg_color); - else - draw_txt_rectangle(sb, font, logo_ascii, logo_ascii_lines, false, &r_lo= go, - fg_color); - } - draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg, fg_color= ); + if (!drm_rect_overlap(&r_logo, &r_msg)) + drm_panic_logo_draw(sb, &r_logo, font, fg_color); + + draw_txt_rectangle(sb, font, panic_msg, panic_msg_lines, true, &r_msg, fg= _color); } =20 /* --=20 2.45.2