From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 8C2FF319862 for ; Wed, 15 Oct 2025 08:58:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760518684; cv=none; b=h/OvrCiLu2melKxnmhAjJ1l6UdZFARN8E/TQPCrk952XZt9LlerzdElsoCVfcQoG87sjVmUZVx4nwrZVMvm0moGIm9FmNFH7TXRWvO1MtawoZDtLjQ813ts+Cfdbgnhf+AZcG5dxHlPYHC97GoBWOUUmcYDvwm0sBPerHzjxd3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760518684; c=relaxed/simple; bh=vPVI36ukM/Jq0am/HgD0hAXC6elfkRj6PkYOhAkPO4s=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DNq/P+D52Bacu/J6dpz5uHveZu+eJsCjk7UDfDunnykEVUUqu+QNE4Z85zS83kTivdwloXbWUL637ke1sfj+piKnIaiOlOJ8+tQ5QXbHFGLA8pqgc854HZWk2uebA8Khu6Is/0cHV6z2HwIj1htL41GRaod01Fbg9LfNoM9shp8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=Ounk6qKI; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="Ounk6qKI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760518680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZiAhmyFaEKVq6s3K9ByIEa1k2zTn1HXQWc3GKVxQxE=; b=Ounk6qKIuDkv/YlzvOqzvVGc30/PyDzIXxiqw0j8QEHvJDRPef2yQUYhf/dKNHRzLwvScX Si7dGIEFlZ9uuR+VXKK7rfP1lJBbilBavuKesySueSYK59fu3dGS/LisPgTStvvjFKi/Bj MYL6poyne9/GFtnDcHcxuFFVPLMiEtw= Received: from mx-prod-mc-03.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-694-0wJ9LuW7PwiwCdTHihkCDw-1; Wed, 15 Oct 2025 04:57:57 -0400 X-MC-Unique: 0wJ9LuW7PwiwCdTHihkCDw-1 X-Mimecast-MFC-AGG-ID: 0wJ9LuW7PwiwCdTHihkCDw_1760518675 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 52BDF1956048; Wed, 15 Oct 2025 08:57:55 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.133]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 72DAF19560AD; Wed, 15 Oct 2025 08:57:52 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v3 1/3] drm/panic: Rename draw_panic_static_* to draw_panic_screen_* Date: Wed, 15 Oct 2025 10:51:42 +0200 Message-ID: <20251015085733.227684-2-jfalempe@redhat.com> In-Reply-To: <20251015085733.227684-1-jfalempe@redhat.com> References: <20251015085733.227684-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: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 I called them "static" because the panic screen is drawn only once, but this can be confused with the static meaning in C. Also remove some unnecessary braces in draw_panic_dispatch(). No functionnal change. Signed-off-by: Jocelyn Falempe --- drivers/gpu/drm/drm_panic.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 1d6312fa1429..1e06e3a18d09 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -437,7 +437,7 @@ static void drm_panic_logo_draw(struct drm_scanout_buffer *sb, struct drm_rect * fg_color); } -static void draw_panic_static_user(struct drm_scanout_buffer *sb) +static void draw_panic_screen_user(struct drm_scanout_buffer *sb) { u32 fg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, sb->format->format); @@ -506,7 +506,7 @@ static int draw_line_with_wrap(struct drm_scanout_buffer *sb, const struct font_ * Draw the kmsg buffer to the screen, starting from the youngest message at the bottom, * and going up until reaching the top of the screen. */ -static void draw_panic_static_kmsg(struct drm_scanout_buffer *sb) +static void draw_panic_screen_kmsg(struct drm_scanout_buffer *sb) { u32 fg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, sb->format->format); @@ -694,7 +694,7 @@ static int drm_panic_get_qr_code(u8 **qr_image) /* * Draw the panic message at the center of the screen, with a QR Code */ -static int _draw_panic_static_qr_code(struct drm_scanout_buffer *sb) +static int _draw_panic_screen_qr_code(struct drm_scanout_buffer *sb) { u32 fg_color = drm_draw_color_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, sb->format->format); @@ -759,15 +759,15 @@ static int _draw_panic_static_qr_code(struct drm_scanout_buffer *sb) return 0; } -static void draw_panic_static_qr_code(struct drm_scanout_buffer *sb) +static void draw_panic_screen_qr_code(struct drm_scanout_buffer *sb) { - if (_draw_panic_static_qr_code(sb)) - draw_panic_static_user(sb); + if (_draw_panic_screen_qr_code(sb)) + draw_panic_screen_user(sb); } #else -static void draw_panic_static_qr_code(struct drm_scanout_buffer *sb) +static void draw_panic_screen_qr_code(struct drm_scanout_buffer *sb) { - draw_panic_static_user(sb); + draw_panic_screen_user(sb); } static void drm_panic_qr_init(void) {}; @@ -790,13 +790,12 @@ static bool drm_panic_is_format_supported(const struct drm_format_info *format) static void draw_panic_dispatch(struct drm_scanout_buffer *sb) { - if (!strcmp(drm_panic_screen, "kmsg")) { - draw_panic_static_kmsg(sb); - } else if (!strcmp(drm_panic_screen, "qr_code")) { - draw_panic_static_qr_code(sb); - } else { - draw_panic_static_user(sb); - } + if (!strcmp(drm_panic_screen, "kmsg")) + draw_panic_screen_kmsg(sb); + else if (!strcmp(drm_panic_screen, "qr_code")) + draw_panic_screen_qr_code(sb); + else + draw_panic_screen_user(sb); } static void drm_panic_set_description(const char *description) -- 2.51.0