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 37873D49211 for ; Mon, 18 Nov 2024 12:12:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6D2410E4B2; Mon, 18 Nov 2024 12:12:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DaVVJu76"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29E8810E4B2; Mon, 18 Nov 2024 12:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731931939; x=1763467939; h=from:to:subject:in-reply-to:references:date:message-id: mime-version; bh=qHOar5lZb1k1/LkpSNSECnmae6rRxJfCW/7+9zIqEUE=; b=DaVVJu767dfT7mxyiCUIM/BvCcFNYVKbzU3BMcBUKwlSbDnMfKzfCgwo LqfVVVpZELPMmZdOvEmmIlrihelS5tH7qzdKPe9WCnKqSaOWDbvxq033d kddli1yO710K8PyGXFGP3Z3M9nh5iatpYX/6SoWh6HJbDKgMObkv9nlbr +2wEPEVUZu6UDje1u7uJ5g8oIBJXzbKuU5oa9LBrAtFMfuf0Y29zjjU1s AHkUk7zCEjfkJl2WJMuo65IlJlqBLVN8Kuj0h1bwmyWYkKX9OVjEcHAZ/ iBGMp6BWSvKo1CcK+YrMj5//CR3IeFXez39MIvfP9yy72u8w5xfuQT/6S g==; X-CSE-ConnectionGUID: DzV/H4loT5GlgrONbVgEZA== X-CSE-MsgGUID: 6t+xerQfR9ulRt7waKsXKA== X-IronPort-AV: E=McAfee;i="6700,10204,11259"; a="31938145" X-IronPort-AV: E=Sophos;i="6.12,164,1728975600"; d="scan'208";a="31938145" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 04:12:19 -0800 X-CSE-ConnectionGUID: 9T9wvNAmQ6GiK+7PdnwkYA== X-CSE-MsgGUID: X8x7ycSFRb6HoE2OEc4oig== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,164,1728975600"; d="scan'208";a="126749224" Received: from jkrzyszt-mobl2.ger.corp.intel.com (HELO localhost) ([10.245.246.148]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2024 04:12:17 -0800 From: Jani Nikula To: Imre Deak , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH 3/4] drm/i915/dp_mst: Expose a connector to kernel users after it's properly initialized In-Reply-To: <20241115164159.1081675-3-imre.deak@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20241115164159.1081675-1-imre.deak@intel.com> <20241115164159.1081675-3-imre.deak@intel.com> Date: Mon, 18 Nov 2024 14:12:14 +0200 Message-ID: <878qtg4u75.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 15 Nov 2024, Imre Deak wrote: > After a connector is added to the drm_mode_config::connector_list, it's > visible to any in-kernel users looking up connectors via the above list. > Make sure that the connector is properly initialized before such > look-ups. > > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 29 ++++++++------------- > 1 file changed, 11 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index f058360a26413..d91a1d1fb26f4 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -1719,6 +1719,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo > if (!intel_connector) > return NULL; > > + connector = &intel_connector->base; I'd rather see a patch s/intel_connector/connector/ and using &connector->base for drm_connector. > + > intel_connector->get_hw_state = intel_dp_mst_get_hw_state; > intel_connector->sync_state = intel_dp_connector_sync_state; > intel_connector->mst_port = intel_dp; > @@ -1727,30 +1729,19 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo > > intel_dp_init_modeset_retry_work(intel_connector); > > - /* > - * TODO: The following drm_connector specific initialization belongs > - * to DRM core, however it happens atm too late in > - * drm_connector_init(). That function will also expose the connector > - * to in-kernel users, so it can't be called until the connector is > - * sufficiently initialized; init the device pointer used by the > - * following DSC setup, until a fix moving this to DRM core. > - */ > - intel_connector->base.dev = mgr->dev; > - > - intel_connector->dp.dsc_decompression_aux = drm_dp_mst_dsc_aux_for_port(port); > - intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector); > - intel_connector->dp.dsc_hblank_expansion_quirk = > - detect_dsc_hblank_expansion_quirk(intel_connector); > - > - connector = &intel_connector->base; > - ret = drm_connector_init(display->drm, connector, &intel_dp_mst_connector_funcs, > - DRM_MODE_CONNECTOR_DisplayPort); > + ret = drm_connector_init_core(display->drm, connector, &intel_dp_mst_connector_funcs, > + DRM_MODE_CONNECTOR_DisplayPort); > if (ret) { > drm_dp_mst_put_port_malloc(port); > intel_connector_free(intel_connector); > return NULL; > } > > + intel_connector->dp.dsc_decompression_aux = drm_dp_mst_dsc_aux_for_port(port); > + intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector); > + intel_connector->dp.dsc_hblank_expansion_quirk = > + detect_dsc_hblank_expansion_quirk(intel_connector); > + > drm_connector_helper_add(connector, &intel_dp_mst_connector_helper_funcs); > > for_each_pipe(display, pipe) { > @@ -1771,6 +1762,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo > drm_dbg_kms(display->drm, "[%s:%d] HDCP MST init failed, skipping.\n", > connector->name, connector->base.id); > > + drm_connector_add(connector); > + > return connector; > > err: -- Jani Nikula, Intel