From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AFCC52820AF; Tue, 27 May 2025 17:57:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368649; cv=none; b=Vr4TY560GQxMOcYWOxGB+vuFwbyw04kbmngfItlSgJhftWuUY9n7fWuj20Z/TXChV8DC4mBGUKTN/ABLmwZecPMXGzFuc23v6AgBhpGy5gxJWOVh7HvBYg9DAvGBfRcWIS4eozyw7JQgR+aTTxgZi3gn1g1YVr2dzX8osKnNspU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368649; c=relaxed/simple; bh=Ez3jCceKjqmtQ5gYg3dxlzBs//p1GKRjiQGLadz4yH0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fdDtR+PTkAtVaJDzR8yezypdA/U7fP1HD7cFbFzxy659jF5F0UYrrqlHbazvBoBrjqP493yfVQR+k/ZRX+3+bibMbKFI5QH2RdXDtAZZ7yRt6v9OUUWGZ5TLDL78L2wa4wMnXmKXPiXWDaCSZCRaC+YOGOmJ4+xSOon7/aXtKuc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t/ZmH7m1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="t/ZmH7m1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0372C4CEE9; Tue, 27 May 2025 17:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748368649; bh=Ez3jCceKjqmtQ5gYg3dxlzBs//p1GKRjiQGLadz4yH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t/ZmH7m1pMs69BE+uxmkpR2gna7O6R3MFew181zhLw80xKEHfRMJCPMF7mkn/LEQP slZPkxHvH/PgJL0y3Qzo3jShU82Yi1ZV1QsUfv9sSGoTmteJEFgMTt7FSYa5xa/Ujv YhIa7SO0yTSggUUgsW59Mb6/WUKUV2uSCGeZPP0s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "feijuan.li" , Jani Nikula Subject: [PATCH 6.14 744/783] drm/edid: fixed the bug that hdr metadata was not reset Date: Tue, 27 May 2025 18:29:01 +0200 Message-ID: <20250527162543.426107971@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: feijuan.li commit 6692dbc15e5ed40a3aa037aced65d7b8826c58cd upstream. When DP connected to a device with HDR capability, the hdr structure was filled.Then connected to another sink device without hdr capability, but the hdr info still exist. Fixes: e85959d6cbe0 ("drm: Parse HDR metadata info from EDID") Cc: # v5.3+ Signed-off-by: "feijuan.li" Reviewed-by: Jani Nikula Link: https://lore.kernel.org/r/20250514063511.4151780-1-feijuan.li@samsung.com Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_edid.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6596,6 +6596,7 @@ static void drm_reset_display_info(struc info->has_hdmi_infoframe = false; info->rgb_quant_range_selectable = false; memset(&info->hdmi, 0, sizeof(info->hdmi)); + memset(&connector->hdr_sink_metadata, 0, sizeof(connector->hdr_sink_metadata)); info->edid_hdmi_rgb444_dc_modes = 0; info->edid_hdmi_ycbcr444_dc_modes = 0;