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 341B8C636D4 for ; Fri, 17 Feb 2023 12:03:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CCC510EF8E; Fri, 17 Feb 2023 12:03:03 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C713D10EF8E for ; Fri, 17 Feb 2023 12:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676635382; x=1708171382; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=4eGAdprrsPzhUd/uOGa1EMJelfkNQEvHv9q/HGi6PnQ=; b=IQvljfZdOPx+hefGF2bUAVeNBlCCWQmQqiPB6KysAAXc6j0KH54rYXz3 Am0tSCA6kyhc1J4YtRLGCPYPHPWTGmp/35a449v6ONOT3ywdzZgVJ+tRq WTrJtY6Z9JykoRdVyoUGhsIWFIOjPHrSbsatoRbSLLv+GGvbgvlSdBlln V+GiXN42vLsWHdkFYbVNsdxk37y3+WNRqC3G1BlELYQg0RNqHQftk8sUw L+M10g7vfd3JlvL2eF9KXMJiiKFSOrvwiG/rNYZFOaHJbLTvU/Wz8Z84X NSB+IYPK/OtseNVcGLZ+onS5jATUYlFx/FLRDzIscxii3J6jVYlyoISgY g==; X-IronPort-AV: E=McAfee;i="6500,9779,10623"; a="320078190" X-IronPort-AV: E=Sophos;i="5.97,304,1669104000"; d="scan'208";a="320078190" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 04:03:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10623"; a="670521860" X-IronPort-AV: E=Sophos;i="5.97,304,1669104000"; d="scan'208";a="670521860" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.70]) by orsmga002.jf.intel.com with SMTP; 17 Feb 2023 04:03:00 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 Feb 2023 14:02:59 +0200 Date: Fri, 17 Feb 2023 14:02:59 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Nautiyal, Ankit K" Message-ID: References: <20230216231312.32664-1-ville.syrjala@linux.intel.com> <20230216231312.32664-3-ville.syrjala@linux.intel.com> <02f8d9ad-81bf-b176-4565-015dec53442e@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <02f8d9ad-81bf-b176-4565-015dec53442e@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 3/4] drm/i915: Fix platform default aux ch for skl 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Feb 17, 2023 at 03:15:59PM +0530, Nautiyal, Ankit K wrote: > > On 2/17/2023 4:43 AM, Ville Syrjala wrote: > > From: Ville Syrjälä > > > > SKL/derivatives have DDI E but no AUX E, so we need to pick > > another aux ch as the platform default. DDI E is more or less > > the other half of DDI A, so we pick AUX A. > > > > In all other cases we should have a corresponding aux ch for > > each DDI. > > > > Signed-off-by: Ville Syrjälä > > --- > > drivers/gpu/drm/i915/display/intel_dp_aux.c | 14 ++++++++++++-- > > 1 file changed, 12 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c > > index 57eb3ff187fa..96967e21c94c 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c > > @@ -739,10 +739,20 @@ void intel_dp_aux_init(struct intel_dp *intel_dp) > > cpu_latency_qos_add_request(&intel_dp->pm_qos, PM_QOS_DEFAULT_VALUE); > > } > > > > +static enum aux_ch default_aux_ch(struct intel_encoder *encoder) > > +{ > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > + > > + /* SKL has DDI E but no AUX E */ > > + if (DISPLAY_VER(i915) == 9 && encoder->port == PORT_E) > > + return AUX_CH_A; > > + > > I guess we might need to fix intel_dp_aux_init also. Wont we have > dig_port->aux_ch and intel_dp->aux_ch pointing to different things? There is no intel_dp->aux_ch. > > For example for SKL and DDI E, intel_dp->aux.name will be derived from > dig_port->aux_ch i.e. AUX_CH_A but intel_dp->aux_ctl/data reg will still > point to DP_AUX_CH_CTL/DATA_E. > > Am I missing something? Everything is based on dig_port->aux_ch. > > Regards, > > Ankit > > > > + return (enum aux_ch)encoder->port; > > +} > > + > > enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder) > > { > > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > - enum port port = encoder->port; > > enum aux_ch aux_ch; > > > > aux_ch = intel_bios_dp_aux_ch(encoder->devdata); > > @@ -753,7 +763,7 @@ enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder) > > return aux_ch; > > } > > > > - aux_ch = (enum aux_ch)port; > > + aux_ch = default_aux_ch(encoder); > > > > drm_dbg_kms(&i915->drm, > > "[ENCODER:%d:%s] using AUX %c (platform default)\n", -- Ville Syrjälä Intel