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 774C6FA3740 for ; Thu, 27 Oct 2022 14:50:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5829D10E662; Thu, 27 Oct 2022 14:50:02 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9736B10E678 for ; Thu, 27 Oct 2022 14:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666882198; x=1698418198; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=5Q001EyV9Typ3NGOAa7f5lhwdUdplIHZrtfUxvmYmb0=; b=BH6NxzaIBxRB62NlIUxe9DpvFE042ZI+pusuhXsCJpb8JupB108tjKWc U2byGNsyH4Kl8FY5bxAFoh2kvXwGhJmtFNZiz9MUZBASlDFWC6Egzj2UO T/AV61GOz00AO9t4vc5QUzCczwdOM+f6JQbmoCXwyrhzp0VKAhDItLINe jUp7HT4GidYkYisdtaELAaiV0kfh5MYZYbcn4XiXEDoYlzKbiFrSMf70q iM45ODaiJ02xKAJgK+C6GP1LRVtVy8h3AaQDMlbk+zGqTXcGPBIFgWVHa 6TfUruIr/SI1hqwxmSHJy/EibK9f9JOIzPq/pCUT38GN/XFu2BWnBITPb g==; X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="309938397" X-IronPort-AV: E=Sophos;i="5.95,217,1661842800"; d="scan'208";a="309938397" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2022 07:49:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10512"; a="663642860" X-IronPort-AV: E=Sophos;i="5.95,217,1661842800"; d="scan'208";a="663642860" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.191]) by orsmga008.jf.intel.com with SMTP; 27 Oct 2022 07:49:54 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 27 Oct 2022 17:49:53 +0300 Date: Thu, 27 Oct 2022 17:49:53 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: References: <20221026101134.20865-1-ville.syrjala@linux.intel.com> <20221026101134.20865-3-ville.syrjala@linux.intel.com> <87pmedcp07.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87pmedcp07.fsf@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 2/8] drm/i915/sdvo: Setup DDC fully before output init 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, stable@vger.kernel.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Oct 27, 2022 at 05:36:24PM +0300, Jani Nikula wrote: > On Wed, 26 Oct 2022, Ville Syrjala wrote: > > From: Ville Syrjälä > > > > Call intel_sdvo_select_ddc_bus() before initializing any > > of the outputs. And before that is functional (assuming no VBT) > > we have to set up the controlled_outputs thing. Otherwise DDC > > won't be functional during the output init but LVDS really > > needs it for the fixed mode setup. > > > > Note that the whole multi output support still looks very > > bogus, and more work will be needed to make it correct. > > But for now this should at least fix the LVDS EDID fixed mode > > setup. > > > > Cc: stable@vger.kernel.org > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301 > > Fixes: aa2b88074a56 ("drm/i915/sdvo: Fix multi function encoder stuff") > > Signed-off-by: Ville Syrjälä > > --- > > drivers/gpu/drm/i915/display/intel_sdvo.c | 31 +++++++++-------------- > > 1 file changed, 12 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c > > index c6200a91a777..ccf81d616cb4 100644 > > --- a/drivers/gpu/drm/i915/display/intel_sdvo.c > > +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c > > @@ -2746,13 +2746,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) > > if (!intel_sdvo_connector) > > return false; > > > > - if (device == 0) { > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0; > > + if (device == 0) > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0; > > - } else if (device == 1) { > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1; > > + else if (device == 1) > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1; > > - } > > > > intel_connector = &intel_sdvo_connector->base; > > connector = &intel_connector->base; > > @@ -2807,7 +2804,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) > > encoder->encoder_type = DRM_MODE_ENCODER_TVDAC; > > connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO; > > > > - intel_sdvo->controlled_output |= type; > > intel_sdvo_connector->output_flag = type; > > > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { > > @@ -2848,13 +2844,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device) > > encoder->encoder_type = DRM_MODE_ENCODER_DAC; > > connector->connector_type = DRM_MODE_CONNECTOR_VGA; > > > > - if (device == 0) { > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0; > > + if (device == 0) > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0; > > - } else if (device == 1) { > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1; > > + else if (device == 1) > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1; > > - } > > > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { > > kfree(intel_sdvo_connector); > > @@ -2884,13 +2877,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) > > encoder->encoder_type = DRM_MODE_ENCODER_LVDS; > > connector->connector_type = DRM_MODE_CONNECTOR_LVDS; > > > > - if (device == 0) { > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0; > > + if (device == 0) > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0; > > - } else if (device == 1) { > > - intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1; > > + else if (device == 1) > > intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1; > > - } > > > > if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { > > kfree(intel_sdvo_connector); > > @@ -2945,8 +2935,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags) > > static bool > > intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags) > > { > > + struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev); > > + > > flags = intel_sdvo_filter_output_flags(flags); > > > > + intel_sdvo->controlled_output = flags; > > + > > + intel_sdvo_select_ddc_bus(i915, intel_sdvo); > > AFAICT the ->controlled_outputs member could now be removed and just > passed by value here. Hmm. True. Though the whole thing is utter garbage anyway. intel_sdvo_guess_ddc_bus() really expects controlled_outputs to contain only a single bit. I guess it kinda works by luck most or the time, at least for single output devices. I suppose I can still include the controlled_outputs nukage into this patch. What we really need to do is to have a ddc adapter per each connector, and then each one can properly figure out its own ddc bus. Right now there is some kind of horrible hack in intel_sdvo_tmds_sink_detect() that probes all the ddc buses if it didn't find anything on the one that got chosen initally. Fixing intel_sdvo_guess_ddc_bus() for that is trivial, but I think fixing the VBT mapping stuff is a bit harder since we now just parse that per SDVO port rather than per SDVO output. attached_output is another nonsense thing that needs to get nuked, but that one should be a bit easier. Anyways, more work clearly needed here... > Reviewed-by: Jani Nikula Thanks. > > > > + > > if (flags & SDVO_OUTPUT_TMDS0) > > if (!intel_sdvo_dvi_init(intel_sdvo, 0)) > > return false; > > @@ -2987,7 +2983,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags) > > if (flags == 0) { > > unsigned char bytes[2]; > > > > - intel_sdvo->controlled_output = 0; > > memcpy(bytes, &intel_sdvo->caps.output_flags, 2); > > DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n", > > SDVO_NAME(intel_sdvo), > > @@ -3399,8 +3394,6 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv, > > */ > > intel_sdvo->base.cloneable = 0; > > > > - intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo); > > - > > /* Set the input timing to the screen. Assume always input 0. */ > > if (!intel_sdvo_set_target_input(intel_sdvo)) > > goto err_output; > > -- > Jani Nikula, Intel Open Source Graphics Center -- Ville Syrjälä Intel