Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755054AbcDTL2i (ORCPT ); Wed, 20 Apr 2016 07:28:38 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38306 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754126AbcDTL2g (ORCPT ); Wed, 20 Apr 2016 07:28:36 -0400 Date: Wed, 20 Apr 2016 13:28:31 +0200 From: Daniel Vetter To: Alexey Brodkin Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Vetter , David Airlie , Boris Brezillon Subject: Re: [PATCH 1/3 v6] drm: Introduce drm_connector_register_all() helper Message-ID: <20160420112831.GO2510@phenom.ffwll.local> Mail-Followup-To: Alexey Brodkin , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Airlie , Boris Brezillon References: <1461068693-11260-1-git-send-email-abrodkin@synopsys.com> <1461068693-11260-2-git-send-email-abrodkin@synopsys.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1461068693-11260-2-git-send-email-abrodkin@synopsys.com> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4839 Lines: 135 On Tue, Apr 19, 2016 at 03:24:51PM +0300, Alexey Brodkin wrote: > As a pair to already existing drm_connector_unregister_all() we're adding > generic implementation of what is already done in some drivers. > > Once this helper is implemented we'll be ready to switch existing > driver-specific implementations with the generic one. > > Signed-off-by: Alexey Brodkin > Cc: Daniel Vetter > Cc: David Airlie > Cc: Boris Brezillon > --- > > No changes v5 -> v6. > > Changes v4 -> v5: > * Added missing mutex unlock on a fail path in drm_connector_register_all(). > Thanks David for his attention and patience! When resending, please add everyone who commmented on previous versions of your patches to the cc: list. Just to make sure they have a chance to look at the next version. -Daniel > > Changes v3 -> v4: > * In drm_connector_register_all() fail path which calls unregister_all() > is moved outside of loop&locked section (as suggested by Daniel) > > Changes v2 -> v3: > * Updated title with capital after colon > * Simplified failure path with direct and unconditional invocation of > unregister_all() > * Updated kerneldoc description of the drm_connector_register_all() > > Changes v1 -> v2: > * Rename drm_connector_unplug_all() to drm_connector_unregister_all() > * Use drm_for_each_connector() instead of list_for_each_entry() > * Updated kerneldoc for drm_dev_register() > > drivers/gpu/drm/drm_crtc.c | 40 ++++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/drm_drv.c | 6 +++++- > include/drm/drm_crtc.h | 3 ++- > 3 files changed, 47 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index f7fe9e1..ee549a3 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -1068,6 +1068,46 @@ void drm_connector_unregister(struct drm_connector *connector) > EXPORT_SYMBOL(drm_connector_unregister); > > /** > + * drm_connector_register_all - register all connectors > + * @dev: drm device > + * > + * This function registers all connectors in sysfs and other places so that > + * userspace can start to access them. Drivers can call it after calling > + * drm_dev_register() to complete the device registration, if they don't call > + * drm_connector_register() on each connector individually. > + * > + * When a device is unplugged and should be removed from userspace access, > + * call drm_connector_unregister_all(), which is the inverse of this > + * function. > + * > + * Returns: > + * Zero on success, error code on failure. > + */ > +int drm_connector_register_all(struct drm_device *dev) > +{ > + struct drm_connector *connector; > + int ret; > + > + mutex_lock(&dev->mode_config.mutex); > + > + drm_for_each_connector(connector, dev) { > + ret = drm_connector_register(connector); > + if (ret) > + goto err; > + } > + > + mutex_unlock(&dev->mode_config.mutex); > + > + return 0; > + > +err: > + mutex_unlock(&dev->mode_config.mutex); > + drm_connector_unregister_all(dev); > + return ret; > +} > +EXPORT_SYMBOL(drm_connector_register_all); > + > +/** > * drm_connector_unregister_all - unregister connector userspace interfaces > * @dev: drm device > * > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index 167c8d3..2c9a2b6 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -715,7 +715,11 @@ EXPORT_SYMBOL(drm_dev_unref); > * > * Register the DRM device @dev with the system, advertise device to user-space > * and start normal device operation. @dev must be allocated via drm_dev_alloc() > - * previously. > + * previously. Right after drm_dev_register() the driver should call > + * drm_connector_register_all() to register all connectors in sysfs. This is > + * a separate call for backward compatibility with drivers still using > + * the deprecated ->load() callback, where connectors are registered from within > + * the ->load() callback. > * > * Never call this twice on any device! > * > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 6d46842..f9d2274 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -2249,7 +2249,8 @@ static inline unsigned drm_connector_index(struct drm_connector *connector) > return connector->connector_id; > } > > -/* helper to unregister all connectors from sysfs for device */ > +/* helpers to {un}register all connectors from sysfs for device */ > +extern int drm_connector_register_all(struct drm_device *dev); > extern void drm_connector_unregister_all(struct drm_device *dev); > > extern int drm_bridge_add(struct drm_bridge *bridge); > -- > 2.5.5 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch