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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 4C8FEC433DF for ; Mon, 22 Jun 2020 17:02:54 +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 26A1E20644 for ; Mon, 22 Jun 2020 17:02:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26A1E20644 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 B5F0D6E871; Mon, 22 Jun 2020 17:02:53 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id C905A89E0D for ; Mon, 22 Jun 2020 17:02:51 +0000 (UTC) IronPort-SDR: om1NtZ7PuejFFXl3zQu+kD9LV2JRAz+8mo7A6M3mfvlAH70JcprPzBJntVd9IWO6jsqUGmKo3p Bi/KpRMBSzqQ== X-IronPort-AV: E=McAfee;i="6000,8403,9660"; a="123469652" X-IronPort-AV: E=Sophos;i="5.75,268,1589266800"; d="scan'208";a="123469652" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 10:02:50 -0700 IronPort-SDR: MPokrJjE0kiOh/yGvjtj26tBjU4TEL7YL65C2aU19PUR2Ps5TpSFhXsdGTkoea0F3ztcCYxocJ Q78W5rKZPhcw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,268,1589266800"; d="scan'208";a="281100944" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga007.jf.intel.com with SMTP; 22 Jun 2020 10:02:47 -0700 Received: by stinkbox (sSMTP sendmail emulation); Mon, 22 Jun 2020 20:02:46 +0300 Date: Mon, 22 Jun 2020 20:02:46 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Shankar, Uma" Message-ID: <20200622170246.GP6112@intel.com> References: <20200610191232.11620-1-uma.shankar@intel.com> <20200610191232.11620-7-uma.shankar@intel.com> <20200611154650.GB6112@intel.com> <20200611160112.GC6112@intel.com> <20200615205233.GS6112@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [v3 6/8] 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" On Mon, Jun 22, 2020 at 11:44:58AM +0000, Shankar, Uma wrote: > = > > > > > -----Original Message----- > > > > > From: Ville Syrj=E4l=E4 > > > > > Sent: Thursday, June 11, 2020 9:31 PM > > > > > To: Shankar, Uma > > > > > Cc: intel-gfx@lists.freedesktop.org; jani.nikula@linux.intel.com; > > > > > Mun, Gwan- gyeong > > > > > Subject: Re: [v3 6/8] drm/i915/display: Implement infoframes > > > > > readback for LSPCON > > > > > > > > > > On Thu, Jun 11, 2020 at 06:46:50PM +0300, Ville Syrj=E4l=E4 wrote: > > > > > > On Thu, Jun 11, 2020 at 12:42:30AM +0530, Uma Shankar wrote: > > > > > > > Implemented Infoframes enabled readback for LSPCON devices. > > > > > > > This will help align the implementation with state readback > > > > > > > infrastructure. > > > > > > > > > > > > > > Signed-off-by: Uma Shankar > > > > > > > --- > > > > > > > drivers/gpu/drm/i915/display/intel_lspcon.c | 63 > > > > > > > ++++++++++++++++++++- > > > > > > > 1 file changed, 61 insertions(+), 2 deletions(-) > > > > > > > > > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > > > > b/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > > > > index 9034ce6f20b9..0ebe9a700291 100644 > > > > > > > --- a/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > > > > +++ b/drivers/gpu/drm/i915/display/intel_lspcon.c > > > > > > > @@ -576,11 +576,70 @@ 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; > > > > > > > + } > > > > > > > + > > > > > > > + if (val & LSPCON_MCA_AVI_IF_KICKOFF) > > > > > > > + return true; > > > > > > > + > > > > > > > + return false; > > > > > > > > > > > > return val & ...; > > > > > > > > > > > > > +} > > > > > > > + > > > > > > > +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; > > > > > > > + } > > > > > > > + > > > > > > > + if (val & LSPCON_PARADE_AVI_IF_KICKOFF) > > > > > > > + return true; > > > > > > > + > > > > > > > + return false; > > > > > > > +} > > > > > > > + > > > > > > > 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 mask =3D 0; > > > > > > > + u32 val; > > > > > > > + > > > > > > > + 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) > > > > > > > + return true; > > > > > > > > > > > > This is supposed to return a bitmask of all enabled infoframes. > > > > > > > > > Actually since we're dealing with both the LSPCON specific stuff > > > > > and DIP stuff for the DRM infoframe I think we should stop using > > > > > using intel_hdmi_infoframes_enabled(), and instead provide a > > > > > LSPCON specific replacement for it. That way we can directly > > > > > return the abstract bitmask instead of pretending to return a bit= mask of > > the DIP bits. > = > We have DP (VSC etc) packets also managed as HDMI infoframes only. We can= keep the > same with bitmask as VIDEO_DIP_ENABLE_AVI_HSW for AVI and similarly VIDEO= _DIP_ENABLE_GMP_HSW > for DRM (HDR metadata). This will help all the helper align appropriately= even in the intel_dump_pipe_config. intel_dump_infoframe() does not use any platform specific bitmasks. So I don't understand what you're talking about here. > = > Will fix this accordingly and send the next version. Hope this is ok. > = > > > > Sure, will fix this and resend the next version. > > > > > > > > > > > > > > > > Also my question "how do we turn off infoframes once enabled?" > > > > > > from > > > > > > https://patchwork.freedesktop.org/patch/351719/?series=3D72928&= rev > > > > > > =3D1 > > > > > > still remains unanswered... > > > > > > > > For the AVI infoframe we generally compute and change the respective > > > > values. If no change is requested and computed we can let the > > > > existing infoframes be transmitted. AFAIK there is no mechanism > > > > called out, to explicitly disable this on Lspcon. Have not seen any > > > > issues due to this, so > > > hoping that it may be safe even if they are enabled. > > > > > > It's not valid to transmit infoframes to DVI sinks. > > = > > With your fix, we won't be enabling or setting the infoframe on DVI sin= ks. > > If I understand correctly, we may have issue if we connect HDMI (where = we > > would have sent the infoframe) and later unplug and plug a DVI sink. Wi= th > > unplug if Lspcon is not resetting this internally then this will be a p= roblem. I will > > try to get this information on Lspcon behavior. > = > Hi Ville, > Searched various docs on LSPCON and couldn't find any mention of disablin= g infoframe. > Reached out to few folks who were interfacing with Lspcon vendors and got= this finally > clarified. The expectation is that LSPCON will reset stuff on unplug and= will not send infoframes to DVI sink, > so from source side we don't need to explicitly disable them. Lspcon will= take care of this, this was > tested for compliance as well by them. Unplug is irrelevant. We also have the property by which the user can force the inforframes off. > = > I will share the updated series adding your patch stopping infoframes to = be sent to DVI sinks. > Please review the same. > = > Thank & Regards, > Uma Shankar > = > > > > > > > > I am planning to take your patch from the series and float along > > > > with this series, adding check for DRM Infoframes also. Hope that i= s ok ? > > > > > > > > Thanks Ville for your feedback. > > > > > > > > Regards, > > > > Uma Shankar > > > > > > > > > > > + > > > > > > > + if (lspcon->hdr_supported) { > > > > > > > + val =3D intel_de_read(dev_priv, > > > > > > > + HSW_TVIDEO_DIP_CTL(pipe_config- > > > > > >cpu_transcoder)); > > > > > > > + mask |=3D VIDEO_DIP_ENABLE_GMP_HSW; > > > > > > > + > > > > > > > + if (val & mask) > > > > > > > + return val & mask; > > > > > > > + } > > > > > > > + > > > > > > > + return false; > > > > > > > } > > > > > > > > > > > > > > void lspcon_resume(struct intel_lspcon *lspcon) > > > > > > > -- > > > > > > > 2.22.0 > > > > > > > > > > > > -- > > > > > > Ville Syrj=E4l=E4 > > > > > > Intel > > > > > > > > > > -- > > > > > Ville Syrj=E4l=E4 > > > > > Intel > > > > > > -- > > > 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