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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0D34C4363D for ; Tue, 6 Oct 2020 12:27:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 44BE1206F7 for ; Tue, 6 Oct 2020 12:27:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44BE1206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96BEA6E456; Tue, 6 Oct 2020 12:27:54 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32DBB6E456 for ; Tue, 6 Oct 2020 12:27:53 +0000 (UTC) IronPort-SDR: XpLrTecmexJ0GiV7gWvPzGyh7dq6C7zsmM4kOuLqnt2OFqDDi6I7OrcyfH3RcVk3k/x42FU0Nu m9ywATOsHQ8A== X-IronPort-AV: E=McAfee;i="6000,8403,9765"; a="161850292" X-IronPort-AV: E=Sophos;i="5.77,343,1596524400"; d="scan'208";a="161850292" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2020 05:27:52 -0700 IronPort-SDR: Yz3O2mheuTbJv7U83svnB3AdHI/s80O62MLXz2x67KkJr6+hSg8+iqIZ31y24yHdBpwey3BXH1 kmEnxWljRFlQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,343,1596524400"; d="scan'208";a="327533993" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga002.jf.intel.com with ESMTP; 06 Oct 2020 05:27:51 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 6 Oct 2020 05:27:49 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by BGSMSX604.gar.corp.intel.com (10.67.234.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 6 Oct 2020 17:57:47 +0530 Received: from bgsmsx604.gar.corp.intel.com ([10.67.234.6]) by BGSMSX604.gar.corp.intel.com ([10.67.234.6]) with mapi id 15.01.1713.004; Tue, 6 Oct 2020 17:57:47 +0530 From: "Shankar, Uma" To: =?iso-8859-1?Q?Ville_Syrj=E4l=E4?= Thread-Topic: [v6 06/11] drm/i915/display: Implement infoframes readback for LSPCON Thread-Index: AQHWitUl42+QsDxZnUKSOnCXhB4ZiKl/hxEAgAoh1bCAAGX2gIAAk1Fw Date: Tue, 6 Oct 2020 12:27:47 +0000 Message-ID: References: <20200914210047.11972-1-uma.shankar@intel.com> <20200914210047.11972-7-uma.shankar@intel.com> <20200929162038.GD6112@intel.com> <5b36dcf01f524edd8c95f363478fab20@intel.com> <20201006090915.GU6112@intel.com> In-Reply-To: <20201006090915.GU6112@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.223.10.1] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [v6 06/11] drm/i915/display: Implement infoframes readback for LSPCON 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" Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" > -----Original Message----- > From: Ville Syrj=E4l=E4 > Sent: Tuesday, October 6, 2020 2:39 PM > To: Shankar, Uma > Cc: intel-gfx@lists.freedesktop.org > Subject: Re: [v6 06/11] drm/i915/display: Implement infoframes readback f= or > LSPCON > = > On Mon, Oct 05, 2020 at 09:36:35PM +0000, Shankar, Uma wrote: > > > > > > > -----Original Message----- > > > From: Ville Syrj=E4l=E4 > > > Sent: Tuesday, September 29, 2020 9:51 PM > > > To: Shankar, Uma > > > Cc: intel-gfx@lists.freedesktop.org > > > Subject: Re: [v6 06/11] drm/i915/display: Implement infoframes > > > readback for LSPCON > > > > > > On Tue, Sep 15, 2020 at 02:30:42AM +0530, Uma Shankar wrote: > > > > Implemented Infoframes enabled readback for LSPCON devices. > > > > This will help align the implementation with state readback > > > > infrastructure. > > > > > > > > v2: Added proper bitmask of enabled infoframes as per Ville's > > > > recommendation. > > > > > > > > Signed-off-by: Uma Shankar > > > > --- > > > > drivers/gpu/drm/i915/display/intel_lspcon.c | 57 > > > > ++++++++++++++++++++- > > > > 1 file changed, 55 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > b/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > index 60863b825cc5..565913b8e656 100644 > > > > --- a/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > @@ -576,11 +576,64 @@ void lspcon_set_infoframes(struct > > > > intel_encoder > > > *encoder, > > > > buf, ret); > > > > } > > > > > > > > +static bool _lspcon_read_avi_infoframe_enabled_mca(struct > > > > +drm_dp_aux > > > > +*aux) { > > > > + int ret; > > > > + u32 val =3D 0; > > > > + u16 reg =3D LSPCON_MCA_AVI_IF_CTRL; > > > > + > > > > + ret =3D drm_dp_dpcd_read(aux, reg, &val, 1); > > > > + if (ret < 0) { > > > > + DRM_ERROR("DPCD read failed, address 0x%x\n", reg); > > > > + return false; > > > > + } > > > > + > > > > + return val & LSPCON_MCA_AVI_IF_KICKOFF; } > > > > + > > > > +static bool _lspcon_read_avi_infoframe_enabled_parade(struct > > > > +drm_dp_aux *aux) { > > > > + int ret; > > > > + u32 val =3D 0; > > > > + u16 reg =3D LSPCON_PARADE_AVI_IF_CTRL; > > > > + > > > > + ret =3D drm_dp_dpcd_read(aux, reg, &val, 1); > > > > + if (ret < 0) { > > > > + DRM_ERROR("DPCD read failed, address 0x%x\n", reg); > > > > + return false; > > > > + } > > > > + > > > > + return val & LSPCON_PARADE_AVI_IF_KICKOFF; } > > > > + > > > > u32 lspcon_infoframes_enabled(struct intel_encoder *encoder, > > > > const struct intel_crtc_state *pipe_config) { > > > > - /* FIXME actually read this from the hw */ > > > > - return 0; > > > > + struct intel_dp *intel_dp =3D enc_to_intel_dp(encoder); > > > > + struct intel_lspcon *lspcon =3D enc_to_intel_lspcon(encoder); > > > > + struct drm_i915_private *dev_priv =3D to_i915(encoder->base.dev); > > > > + bool infoframes_enabled; > > > > + u32 val =3D 0; > > > > + u32 mask, tmp; > > > > + > > > > + if (lspcon->vendor =3D=3D LSPCON_VENDOR_MCA) > > > > + infoframes_enabled =3D > > > _lspcon_read_avi_infoframe_enabled_mca(&intel_dp->aux); > > > > + else > > > > + infoframes_enabled =3D > > > > +_lspcon_read_avi_infoframe_enabled_parade(&intel_dp->aux); > > > > + > > > > + if (infoframes_enabled) > > > > + val |=3D VIDEO_DIP_ENABLE_AVI_HSW; > > > > > > Still not a fan of abusing the HSW specific reg values here. > > > > I just kept it so that rest of the infrastructure can be re-used > > easily. So the AVI and GMP bit fields will get re-used and will not req= uire any > separate handling. > = > Using the abstract infoframe types wouldn't prevent that. Ok, would remove the HSW specific bits. > > > > > > + > > > > + if (lspcon->hdr_supported) { > > > > + tmp =3D intel_de_read(dev_priv, > > > > + HSW_TVIDEO_DIP_CTL(pipe_config- > > > >cpu_transcoder)); > > > > + mask =3D VIDEO_DIP_ENABLE_GMP_HSW; > > > > + > > > > + if (tmp & mask) > > > > + val |=3D mask; > > > > + } > > > > + > > > > + return val; > > > > } > > > > > > > > void lspcon_resume(struct intel_lspcon *lspcon) > > > > -- > > > > 2.26.2 > > > > > > -- > > > Ville Syrj=E4l=E4 > > > Intel > = > -- > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx