From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C9BCC43334 for ; Wed, 22 Jun 2022 14:41:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 837E210F482; Wed, 22 Jun 2022 14:41:46 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id D06011133E1; Wed, 22 Jun 2022 14:41:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655908904; x=1687444904; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=k3FZ3bLEH2KakbWgpLs1sPHcAOgSBUVbZ76bBTxJJr0=; b=fKVxFBJ8Q49GdEqDkCTmfLyMkgaUMTzHMKOYi7EUKCdquRsg0IHwFjbo 2FOMiYJtgRMR5otX4p5lDWfVMa87LgQT4TgzIUbLus1moohBLu4Mir/fa 6JkiD9Sm94usxGP3WUyHshYrxrNY8mzyVNad6lwh23QhOcxTP1gclRQjf ux9N54G/2g5lyFdfiCm1LgBOqQ8mLTNnuoO60lyRcu1H0afjUJrTob1fN 0fBWJ7by6S6tCJeoz1vnGQrvjIHGD+Zw14yv2rm7Dy3yjHxYtL/TL0m4c G4OE/LcG1U72mbqXb5rJC8S50Ot8YZHwT/lfi7OocnlZJYIuErGz717qL Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10385"; a="279202166" X-IronPort-AV: E=Sophos;i="5.92,212,1650956400"; d="scan'208";a="279202166" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2022 07:41:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,212,1650956400"; d="scan'208";a="592216560" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.163]) by fmsmga007.fm.intel.com with SMTP; 22 Jun 2022 07:41:42 -0700 Received: by stinkbox (sSMTP sendmail emulation); Wed, 22 Jun 2022 17:41:41 +0300 Date: Wed, 22 Jun 2022 17:41:41 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: References: <720c9d9e10faa854ed1a0905b90ed16bf93e40b5.1655895388.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <720c9d9e10faa854ed1a0905b90ed16bf93e40b5.1655895388.git.jani.nikula@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH v3 04/13] drm/edid: abstract debugfs override EDID set/reset X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Jun 22, 2022 at 01:59:18PM +0300, Jani Nikula wrote: > Add functions drm_edid_override_set() and drm_edid_override_reset() to > support "edid_override" connector debugfs, and to hide the details about > it in drm_edid.c. No functional changes at this time. > > Also note in the connector.override_edid flag kernel-doc that this is > only supposed to be modified by the code doing debugfs EDID override > handling. Currently, it is still being modified by amdgpu in > create_eml_sink() and handle_edid_mgmt() for reasons unknown. This was > added in commit 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") > and later moved to amdgpu_dm.c in commit e7b07ceef2a6 ("drm/amd/display: > Merge amdgpu_dm_types and amdgpu_dm"). > > Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/drm_crtc_internal.h | 2 ++ > drivers/gpu/drm/drm_debugfs.c | 21 +++++---------------- > drivers/gpu/drm/drm_edid.c | 26 ++++++++++++++++++++++++++ > include/drm/drm_connector.h | 6 +++++- > 4 files changed, 38 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h > index aecab5308bae..56041b604881 100644 > --- a/drivers/gpu/drm/drm_crtc_internal.h > +++ b/drivers/gpu/drm/drm_crtc_internal.h > @@ -286,3 +286,5 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, > > /* drm_edid.c */ > void drm_mode_fixup_1366x768(struct drm_display_mode *mode); > +int drm_edid_override_set(struct drm_connector *connector, const void *edid, size_t size); > +int drm_edid_override_reset(struct drm_connector *connector); > diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c > index fb04b7a984de..493922069c90 100644 > --- a/drivers/gpu/drm/drm_debugfs.c > +++ b/drivers/gpu/drm/drm_debugfs.c > @@ -350,31 +350,20 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf, > struct seq_file *m = file->private_data; > struct drm_connector *connector = m->private; > char *buf; > - struct edid *edid; > int ret; > > buf = memdup_user(ubuf, len); > if (IS_ERR(buf)) > return PTR_ERR(buf); > > - edid = (struct edid *) buf; > - > - if (len == 5 && !strncmp(buf, "reset", 5)) { > - connector->override_edid = false; > - ret = drm_connector_update_edid_property(connector, NULL); > - } else if (len < EDID_LENGTH || > - EDID_LENGTH * (1 + edid->extensions) > len) > - ret = -EINVAL; > - else { > - connector->override_edid = false; > - ret = drm_connector_update_edid_property(connector, edid); > - if (!ret) > - connector->override_edid = true; > - } > + if (len == 5 && !strncmp(buf, "reset", 5)) > + ret = drm_edid_override_reset(connector); > + else > + ret = drm_edid_override_set(connector, buf, len); > > kfree(buf); > > - return (ret) ? ret : len; > + return ret ? ret : len; > } > > /* > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index e360e1a269f4..c3f0f0a5a8a9 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -2161,6 +2161,32 @@ static struct edid *drm_get_override_edid(struct drm_connector *connector, > return IS_ERR(override) ? NULL : override; > } > > +/* For debugfs edid_override implementation */ > +int drm_edid_override_set(struct drm_connector *connector, const void *edid, > + size_t size) > +{ > + int ret; > + > + if (size < EDID_LENGTH || edid_size(edid) > size) > + return -EINVAL; > + > + connector->override_edid = false; > + > + ret = drm_connector_update_edid_property(connector, edid); > + if (!ret) > + connector->override_edid = true; > + > + return ret; > +} > + > +/* For debugfs edid_override implementation */ > +int drm_edid_override_reset(struct drm_connector *connector) > +{ > + connector->override_edid = false; > + > + return drm_connector_update_edid_property(connector, NULL); > +} > + > /** > * drm_add_override_edid_modes - add modes from override/firmware EDID > * @connector: connector we're probing > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 94b422b55cc1..a1705d6b3fba 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1527,7 +1527,11 @@ struct drm_connector { > struct drm_cmdline_mode cmdline_mode; > /** @force: a DRM_FORCE_ state for forced mode sets */ > enum drm_connector_force force; > - /** @override_edid: has the EDID been overwritten through debugfs for testing? */ > + /** > + * @override_edid: has the EDID been overwritten through debugfs for > + * testing? Do not modify outside of drm_edid_override_set() and > + * drm_edid_override_reset(). > + */ > bool override_edid; > /** @epoch_counter: used to detect any other changes in connector, besides status */ > u64 epoch_counter; > -- > 2.30.2 -- Ville Syrjälä Intel