From nobody Mon Sep 29 22:48:17 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A990C00140 for ; Mon, 15 Aug 2022 23:18:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242674AbiHOXSL (ORCPT ); Mon, 15 Aug 2022 19:18:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345907AbiHOXPA (ORCPT ); Mon, 15 Aug 2022 19:15:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8CEC7C76B; Mon, 15 Aug 2022 13:02:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7D9AFB80EB1; Mon, 15 Aug 2022 20:02:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBCD8C433D6; Mon, 15 Aug 2022 20:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660593740; bh=paxBoEnAGh+TJJxSDISYgtGqLIvQ5WKLbYQHLktb9E0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nJRTNLYeg8U5XGGuRWSm0FA7OMC5kCRiKWXy6ak8b0F3YZK14aamrNBhxHMZjVpPd d/IYRtSZuiDlHvBDqkowKQ9EZ3T7yrolCo8FEk9LORPkGboRoj9Dep9zIhr7D+Gl0/ bmjZYWdTJFONf/rcNakIwysS35ciH+raDVFaeUW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Jani Nikula , Sasha Levin Subject: [PATCH 5.19 0318/1157] drm/edid: reset display info in drm_add_edid_modes() for NULL edid Date: Mon, 15 Aug 2022 19:54:34 +0200 Message-Id: <20220815180452.368173158@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jani Nikula [ Upstream commit d10f7117aa43b0b0d1c4b878afafb6d151da441d ] If a NULL edid gets passed to drm_add_edid_modes(), we should probably also reset the display info. Cc: Ville Syrj=C3=A4l=C3=A4 Signed-off-by: Jani Nikula Reviewed-by: Ville Syrj=C3=A4l=C3=A4 Link: https://patchwork.freedesktop.org/patch/msgid/2ac1c55f94a08d5e72c0b51= 8d956a11002ec85c1.1651569697.git.jani.nikula@intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_edid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index bc43e1b32092..1dea0e2f0cab 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -5697,6 +5697,7 @@ static int drm_edid_connector_update(struct drm_conne= ctor *connector, u32 quirks; =20 if (edid =3D=3D NULL) { + drm_reset_display_info(connector); clear_eld(connector); return 0; } --=20 2.35.1