From nobody Mon Feb 9 14:14:50 2026 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 D32932E2850 for ; Thu, 9 Oct 2025 12:30:28 +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=1760013030; cv=none; b=GaazLFnmLjeWxzyRPOG6dAvVEPUWwEvD2XRuF3SiO43yPTXP1NOUA7m+MimJMdQuddPbWVC2Zuk6wYAmCVLu+t2DPO7ocvtieHpUrFPUxPtnvcJvFI3K7KqxM0uz8c/CBWq+xBP3xv8HQYYh2ItUPcp/NNvIR1miyaxHU46D35M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013030; c=relaxed/simple; bh=43F5c+zaUZG6YJN+thQRVnYCUYyJL65rXk0RmVSUeQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ao1B4CvoQsCMqyAH/DsukIDLulEcBMYpDCUoRPYYlfqYGSZdoNJxgYl0gWJYJ70gd8RYYB4gsy6dQKX7X4yTXDJUZQfwkdzfGpoFJLloWty5Nf2TG9mp7DMXuDjkmDKOhwau8AvIqI/j7keeqx9q/+XRDqSJOgmnDa0FGPf0p9U= 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=I8AtabTW; arc=none smtp.client-ip=170.10.129.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="I8AtabTW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760013027; 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=+jU6y3U31OtGeGVZmCu0gO04BJwFhkS/aeWCbYDaXik=; b=I8AtabTWNJmP4yrts2PH06zERAcbrNMPFBqwP1az6/DWSSYbbYZOiFw5HYazCnvRKx95QO DPhRBCC1PdtdIaS7pKLqodyvsN/fFySd54jYF/vKO9fAK0aejAlkpBCpDRHkPtH4bFTvK2 uyBGFdT8lWGN/I0D/fYYh8bK8/pGr+k= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-185-q1Xljwk-N8-wwzTwoFRdAg-1; Thu, 09 Oct 2025 08:30:23 -0400 X-MC-Unique: q1Xljwk-N8-wwzTwoFRdAg-1 X-Mimecast-MFC-AGG-ID: q1Xljwk-N8-wwzTwoFRdAg_1760013022 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 357A6180048E; Thu, 9 Oct 2025 12:30:22 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.212]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BD2E318004D8; Thu, 9 Oct 2025 12:30:18 +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 Cc: stable@vger.kernel.org Subject: [PATCH 2/6] drm/panic: Fix overlap between qr code and logo Date: Thu, 9 Oct 2025 14:24:49 +0200 Message-ID: <20251009122955.562888-3-jfalempe@redhat.com> In-Reply-To: <20251009122955.562888-1-jfalempe@redhat.com> References: <20251009122955.562888-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.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" The borders of the qr code was not taken into account to check if it overlap with the logo, leading to the logo being partially covered. Signed-off-by: Jocelyn Falempe Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 23ba791c6131..179cbf21f22d 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -749,7 +749,7 @@ static int _draw_panic_static_qr_code(struct drm_scanou= t_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) && !drm_rect_overlap(&r_logo, &r_q= r)) + if (!drm_rect_overlap(&r_logo, &r_msg) && !drm_rect_overlap(&r_logo, &r_q= r_canvas)) drm_panic_logo_draw(sb, &r_logo, font, fg_color); =20 draw_txt_rectangle(sb, font, panic_msg, panic_msg_lines, true, &r_msg, fg= _color); --=20 2.51.0