From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 E9A161E9B14 for ; Tue, 13 May 2025 08:31:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747125085; cv=none; b=ClZmgo47O4mKThoDzas0qb4jtenXJ0nN1SloaOktaUMhaicK6Tplnrj7wuzTZzexUCCSAdlIv6GDV6MhfG+c5T2SQ5P3oSabzrTkFYmiavRuto+IOW63WGqiBVO/9dOxEec60XRHaE+4j1hFgdM2WXRjHhDMM0ryLelXlxXisbI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747125085; c=relaxed/simple; bh=7xVkCv5/WtRaQADfBp06Txnipb0t0/dIJvMLX4GArzg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=T5A7KlH+oKh21C9FN16vOwIiWWAehHY4m+8uzo9fgR6csPTCGm82ygDe9IAjTpzt8cd06Pf9w3NlgoexTgtsuTTZJTlxuqjqnVZ5MbLFJ4P79t73gqcsaOg0Dd0DiS8rS5w8cWws96JhVB/XmAjg1zUKKHaUZBwnQVeqgsuULoo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=U3XOp6Sg; arc=none smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="U3XOp6Sg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747125084; x=1778661084; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=7xVkCv5/WtRaQADfBp06Txnipb0t0/dIJvMLX4GArzg=; b=U3XOp6Sgb6N7S9/7oOHkUqzasWbV0R0ldM0+xT7UjNimughs6QO+P59V +XH2CIXQAXR2GRQVvzsKpMm+Skv6Q5hpIebnlTRHa8AilBOvYBKWq2kQZ uFCiN7nnON/VfEz93VRZpaeQ0BJ2j7OI6skrulqvPGGELVKXuYMnDPcGO 8td6aQZx8uqwHr2UG9CUtFx+Pf+Zg8izUgTU5aNh0QoDMpUxhnI/z4rzv VrcLvQaIxQY30P8qgXUwDKhz9Knw5xE9VxnxUNPs4dQDJMfE7fcHBchfq r/qvf+MfNsdE9ZVoFloXniWNNM42Qgz6LFmBwLLKF/wN83dEHG3k3swlc A==; X-CSE-ConnectionGUID: rH+HwjMgQmODpUIhu7Ic1g== X-CSE-MsgGUID: 1mu1GGXbRAC4z5F9zEmP3w== X-IronPort-AV: E=McAfee;i="6700,10204,11431"; a="48854689" X-IronPort-AV: E=Sophos;i="6.15,284,1739865600"; d="scan'208";a="48854689" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2025 01:31:23 -0700 X-CSE-ConnectionGUID: RORnQEJ9Q0SC/t43H+X+FA== X-CSE-MsgGUID: E/YNyvopT/6G2+YQY2Ub0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,284,1739865600"; d="scan'208";a="137497947" Received: from dalessan-mobl3.ger.corp.intel.com (HELO localhost) ([10.245.244.175]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2025 01:31:19 -0700 From: Jani Nikula To: feijuan.li@samsung.com, "jingoohan1@gmail.com" , "maarten.lankhorst@linux.intel.com" , "mripard@kernel.org" , "tzimmermann@suse.de" , "airlied@gmail.com" , "simona@ffwll.ch" , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" Cc: Hongfei Tang , Minggui Yan , Qilin Wang Subject: Re: [PATCH v2] drm/edid: fixed the bug that hdr metadata was not cleared In-Reply-To: <20250513011145epcms5p84bf94d5c03933fd61f4abf1fadab5016@epcms5p8> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250513011145epcms5p84bf94d5c03933fd61f4abf1fadab5016@epcms5p8> Date: Tue, 13 May 2025 11:31:16 +0300 Message-ID: <87sel8j4iz.fsf@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Tue, 13 May 2025, Feijuan Li wrote: > Dear maintainer: > > I have changed the patch as your suggestion. > v1->v2:make a new function for hdr info reset. > > > From: "feijuan.li" > Date: Fri, 18 Apr 2025 14:56:49 +0000 > Subject: [PATCH v2] drm/edid: fixed the bug that hdr metadata was not res= et > > 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. > > Signed-off-by: feijuan.li > --- > =C2=A0drivers/gpu/drm/drm_edid.c 6 ++++++ > =C2=A01 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 13bc4c290b17..cd0e4148f6b0 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -6576,6 +6576,11 @@ static void drm_update_mso(struct drm_connector *c= onnector, > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0displayid_iter_end(&iter); > =C2=A0} > =C2=A0 > +static void drm_reset_hdr_sink_metadata(struct drm_connector *connector) > +{ > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 memset(&connector->hdr_sink_metadata, 0, siz= eof(connector->hdr_sink_metadata)); Please just put this memset inside drm_reset_display_info() right after: memset(&info->hdmi, 0, sizeof(info->hdmi)); I have local patches to move hdr_sink_metadata as part of display info anyway. Adding an extra function here is a bit much. There's also something wrong with the formatting here. Please use git send-email. BR, Jani. > +} > + > =C2=A0/* A connector has no EDID information, so we've got no EDID to com= pute quirks from. Reset > =C2=A0 * all of the values which would have been set from EDID > =C2=A0 */ > @@ -6651,6 +6656,7 @@ static void update_display_info(struct drm_connecto= r *connector, > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct drm_display_info *info =3D &conn= ector->display_info; > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0const struct edid *edid; > =C2=A0 > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 drm_reset_hdr_sink_metadata(connector); > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0drm_reset_display_info(connector); > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0clear_eld(connector); > =C2=A0 > --=C2=A0 > 2.25.1 > > --=20 Jani Nikula, Intel