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 CDB4FC6FA8F for ; Wed, 30 Aug 2023 11:59:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18A6B10E4FF; Wed, 30 Aug 2023 11:59:12 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5ABD310E129; Wed, 30 Aug 2023 11:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693396749; x=1724932749; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=qOqUVVgQwlfiQmAWLlrKFZ13Ts0gYzw7r11Loeui4pk=; b=mUiDTRZKk9gNJ/dm/hlkstHnEmWSHA6RA/3Vh8WpZA+WQpaS/MDrrvWG v4bxjtUyf9er0WnHzGtzSnFmdFWxfi3GXbnhmCMjptCsLraLSETrqzMgM mbRWbbUerY1JQdvCSklMhC6LcR5MzyBJ8ZfPDpeIVoP2ZFssnqCYy5GXg 69Ok5DfBomcQOMu+PSVBLUH25joPqYdokJ8m3O9MDTza7ARZGObzZkGL8 6W1H4e9wiJrG+S+ohTnVpwW5E7uPWAMu5wDH0mPmDb2oj4VMdpsmItPt7 S08PMsPNLHF7oe8tDV3F4MzGJ4EHUOA5fbo6kkmlmYVrQHYpakZrNxTIW g==; X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="375576802" X-IronPort-AV: E=Sophos;i="6.02,213,1688454000"; d="scan'208";a="375576802" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2023 04:59:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="774092363" X-IronPort-AV: E=Sophos;i="6.02,213,1688454000"; d="scan'208";a="774092363" Received: from ziemtocx-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.57.251]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2023 04:59:05 -0700 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org In-Reply-To: <20230829113920.13713-3-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230829113920.13713-1-ville.syrjala@linux.intel.com> <20230829113920.13713-3-ville.syrjala@linux.intel.com> Date: Wed, 30 Aug 2023 14:59:03 +0300 Message-ID: <873500212w.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 02/12] drm/sysfs: Register "ddc" symlink later 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: Neil Armstrong , Daniel Vetter , dri-devel@lists.freedesktop.org, Andrzej Pietrasiewicz , Andrzej Hajda , Sam Ravnborg , Emil Velikov Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 29 Aug 2023, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > Currently drm_sysfs_connector_add() attempts to register > the "ddc" symlink (based one connector->ddc) before the > driver's .early_register() hook has been called. That is > too early for i915 which only fully registers the aux ch > and associated i2c bus from said hook (to prevent half > initialized stuff getting exposed to userspace). This > causes my attempt at using drm_connector_init_with_ddc() > to fail, and the entire connector disappears from sysfs > on account of sysfs_create_link() failing. > > To fix that split the sysfs symlink stuff into separate > functions (drm_sysfs_connector_add_late() and > drm_sysfs_connector_remove_early()) which are called > on the opposite side of the .later_register() and > .early_unregister() hooks. > > Cc: Andrzej Pietrasiewicz > Cc: Daniel Vetter > Cc: Andrzej Hajda > Cc: Emil Velikov > Cc: Sam Ravnborg > Cc: Neil Armstrong > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/drm_connector.c | 9 +++++++++ > drivers/gpu/drm/drm_internal.h | 2 ++ > drivers/gpu/drm/drm_sysfs.c | 22 +++++++++++++++------- > 3 files changed, 26 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connec= tor.c > index 988996cf6da5..9d4c7b0c5c05 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -631,6 +631,10 @@ int drm_connector_register(struct drm_connector *con= nector) > goto err_debugfs; > } >=20=20 > + ret =3D drm_sysfs_connector_add_late(connector); > + if (ret) > + goto err_late_register; > + > drm_mode_object_register(connector->dev, &connector->base); >=20=20 > connector->registration_state =3D DRM_CONNECTOR_REGISTERED; > @@ -647,6 +651,9 @@ int drm_connector_register(struct drm_connector *conn= ector) > mutex_unlock(&connector_list_lock); > goto unlock; >=20=20 > +err_late_register: > + if (connector->funcs->early_unregister) > + connector->funcs->early_unregister(connector); > err_debugfs: > drm_debugfs_connector_remove(connector); > drm_sysfs_connector_remove(connector); > @@ -681,6 +688,8 @@ void drm_connector_unregister(struct drm_connector *c= onnector) > connector->privacy_screen, > &connector->privacy_screen_notifier); >=20=20 > + drm_sysfs_connector_remove_early(connector); > + > if (connector->funcs->early_unregister) > connector->funcs->early_unregister(connector); >=20=20 > diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_interna= l.h > index ba12acd55139..4053cf8105ce 100644 > --- a/drivers/gpu/drm/drm_internal.h > +++ b/drivers/gpu/drm/drm_internal.h > @@ -153,6 +153,8 @@ int drm_sysfs_init(void); > void drm_sysfs_destroy(void); > struct device *drm_sysfs_minor_alloc(struct drm_minor *minor); > int drm_sysfs_connector_add(struct drm_connector *connector); > +int drm_sysfs_connector_add_late(struct drm_connector *connector); > +void drm_sysfs_connector_remove_early(struct drm_connector *connector); > void drm_sysfs_connector_remove(struct drm_connector *connector); >=20=20 > void drm_sysfs_lease_event(struct drm_device *dev); > diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c > index b169b3e44a92..a953f69a34b6 100644 > --- a/drivers/gpu/drm/drm_sysfs.c > +++ b/drivers/gpu/drm/drm_sysfs.c > @@ -400,10 +400,6 @@ int drm_sysfs_connector_add(struct drm_connector *co= nnector) > drm_err(dev, "failed to add component to create link to typec connect= or\n"); > } >=20=20 > - if (connector->ddc) > - return sysfs_create_link(&connector->kdev->kobj, > - &connector->ddc->dev.kobj, "ddc"); > - > return 0; >=20=20 > err_free: > @@ -411,14 +407,26 @@ int drm_sysfs_connector_add(struct drm_connector *c= onnector) > return r; > } >=20=20 > +int drm_sysfs_connector_add_late(struct drm_connector *connector) > +{ > + if (connector->ddc) > + return sysfs_create_link(&connector->kdev->kobj, > + &connector->ddc->dev.kobj, "ddc"); > + > + return 0; > +} > + > +void drm_sysfs_connector_remove_early(struct drm_connector *connector) > +{ > + if (connector->ddc) > + sysfs_remove_link(&connector->kdev->kobj, "ddc"); > +} > + > void drm_sysfs_connector_remove(struct drm_connector *connector) > { > if (!connector->kdev) > return; >=20=20 > - if (connector->ddc) > - sysfs_remove_link(&connector->kdev->kobj, "ddc"); > - > if (dev_fwnode(connector->kdev)) > component_del(connector->kdev, &typec_connector_ops); --=20 Jani Nikula, Intel Open Source Graphics Center