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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 355AEC433E0 for ; Wed, 3 Jun 2020 18:37:48 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1A3482074B for ; Wed, 3 Jun 2020 18:37:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A3482074B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=vmware.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7209E89294; Wed, 3 Jun 2020 18:37:47 +0000 (UTC) Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com [208.91.0.189]) by gabe.freedesktop.org (Postfix) with ESMTPS id D550489294 for ; Wed, 3 Jun 2020 18:37:46 +0000 (UTC) Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Wed, 3 Jun 2020 11:37:42 -0700 Received: from [0.0.0.0] (oddjob.vmware.com [10.253.4.32]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id E85D7B2746; Wed, 3 Jun 2020 14:37:42 -0400 (EDT) Subject: Re: [PATCH v2 1/2] drm: vmwgfx: remove drm_driver::master_set() return typ To: Emil Velikov , References: <20200530124640.4176323-1-emil.l.velikov@gmail.com> From: Roland Scheidegger Message-ID: Date: Wed, 3 Jun 2020 20:37:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <20200530124640.4176323-1-emil.l.velikov@gmail.com> Content-Language: de-DE Received-SPF: None (EX13-EDG-OU-001.vmware.com: sroland@vmware.com does not designate permitted sender hosts) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Sam Ravnborg , VMware Graphics Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Looks like a nice cleanup to me. (No idea if at some point there actually was a reason for a return value...) Reviewed-by: Roland Scheidegger Am 30.05.20 um 14:46 schrieb Emil Velikov: > The function always returns zero (success). Ideally we'll remove it all > together - although that's requires a little more work. > > For now, we can drop the return type and simplify the drm core code > surrounding it. > > v2: remove redundant assignment (Sam) > > Cc: David Airlie > Cc: Daniel Vetter > Cc: VMware Graphics > Cc: Roland Scheidegger > Signed-off-by: Emil Velikov > Cc: Sam Ravnborg > Reviewed-by: Sam Ravnborg > --- > VMWare team, I'm planning to push this via drm-misc. Review, ack and > comments are appreciated. > --- > drivers/gpu/drm/drm_auth.c | 32 +++++++---------------------- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +++----- > include/drm/drm_drv.h | 4 ++-- > 3 files changed, 12 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c > index 74ce0c29c960..4c723e3a689c 100644 > --- a/drivers/gpu/drm/drm_auth.c > +++ b/drivers/gpu/drm/drm_auth.c > @@ -122,27 +122,19 @@ struct drm_master *drm_master_create(struct drm_device *dev) > return master; > } > > -static int drm_set_master(struct drm_device *dev, struct drm_file *fpriv, > - bool new_master) > +static void drm_set_master(struct drm_device *dev, struct drm_file *fpriv, > + bool new_master) > { > - int ret = 0; > - > dev->master = drm_master_get(fpriv->master); > - if (dev->driver->master_set) { > - ret = dev->driver->master_set(dev, fpriv, new_master); > - if (unlikely(ret != 0)) { > - drm_master_put(&dev->master); > - } > - } > + if (dev->driver->master_set) > + dev->driver->master_set(dev, fpriv, new_master); > > - fpriv->was_master = (ret == 0); > - return ret; > + fpriv->was_master = true; > } > > static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv) > { > struct drm_master *old_master; > - int ret; > > lockdep_assert_held_once(&dev->master_mutex); > > @@ -157,22 +149,12 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv) > fpriv->is_master = 1; > fpriv->authenticated = 1; > > - ret = drm_set_master(dev, fpriv, true); > - if (ret) > - goto out_err; > + drm_set_master(dev, fpriv, true); > > if (old_master) > drm_master_put(&old_master); > > return 0; > - > -out_err: > - /* drop references and restore old master on failure */ > - drm_master_put(&fpriv->master); > - fpriv->master = old_master; > - fpriv->is_master = 0; > - > - return ret; > } > > /* > @@ -265,7 +247,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, > goto out_unlock; > } > > - ret = drm_set_master(dev, file_priv, false); > + drm_set_master(dev, file_priv, false); > out_unlock: > mutex_unlock(&dev->master_mutex); > return ret; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > index c2247a893ed4..470428387878 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > @@ -1129,9 +1129,9 @@ static long vmw_compat_ioctl(struct file *filp, unsigned int cmd, > } > #endif > > -static int vmw_master_set(struct drm_device *dev, > - struct drm_file *file_priv, > - bool from_open) > +static void vmw_master_set(struct drm_device *dev, > + struct drm_file *file_priv, > + bool from_open) > { > /* > * Inform a new master that the layout may have changed while > @@ -1139,8 +1139,6 @@ static int vmw_master_set(struct drm_device *dev, > */ > if (!from_open) > drm_sysfs_hotplug_event(dev); > - > - return 0; > } > > static void vmw_master_drop(struct drm_device *dev, > diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h > index bb924cddc09c..835c38a76ef6 100644 > --- a/include/drm/drm_drv.h > +++ b/include/drm/drm_drv.h > @@ -311,8 +311,8 @@ struct drm_driver { > * > * Called whenever the minor master is set. Only used by vmwgfx. > */ > - int (*master_set)(struct drm_device *dev, struct drm_file *file_priv, > - bool from_open); > + void (*master_set)(struct drm_device *dev, struct drm_file *file_priv, > + bool from_open); > /** > * @master_drop: > * > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel