From patchwork Wed Jun 15 12:17:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9178427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B00686021C for ; Wed, 15 Jun 2016 12:19:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A147927C26 for ; Wed, 15 Jun 2016 12:19:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9653627D4A; Wed, 15 Jun 2016 12:19:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 502FE27C26 for ; Wed, 15 Jun 2016 12:19:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97EA36E943; Wed, 15 Jun 2016 12:19:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D90A6E915; Wed, 15 Jun 2016 12:18:51 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id k184so5531018wme.2; Wed, 15 Jun 2016 05:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4M1FnBvRarakLemX7pMqq6bBUKWAClPQVYS8wf/63Xs=; b=GZsRQCCfJLWOA5eBsO1tIjbpoSWAny5HLjIS/GSDE4R/hYoMt5zIickbqag3UEZirm QCT8Q0b8Vj11EhAELgDxogUPiiMFiQlhGmkgKLaoD72ekC1wCh//gwHfYWjPFrrMjuHe ST24thApaFmbW2D3zPspHtWQl9HJRObKlOm9ZC0D0szyF9OBynBua7nPXObcQYRrGgew Nftt+pWaGiU4Kf+uVkHJkSZwwO5z+JrWaEH+y9MtdYq4yY0Ul1sIka8G9x7CG6i5Mwrc wOW+LQFpnnK7QCdqd8hZNef02C0pFYTfzhA9+Q0iX8c4KesLLIdNDzMfXiOIyRD9fvxO QywQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=4M1FnBvRarakLemX7pMqq6bBUKWAClPQVYS8wf/63Xs=; b=H13/eR3wEv/XgWbXlXjW1W0e9aR6gqbuWHDtSdie/S2OAYx/m0BMrct+qrwm6RDGCt Amw3ZdygFIeRXpeKFodFGdsz1jVNJO51q/ddwU6GzdgTKzpkG2hymB74AwwnkDder7M8 RBYZA4NIBkyTxoaUo0y9gwmDm05QubypzjkqSkmiu9qV5XK6nFtF8+It0Ei0hkpt7WJ+ OX9xueCgF+BVmYsICMhHsPoYxzs0nPQ9Unaw9pNga7x6gEZIzpg8zcJh53uy7+YiFHK+ 6uVsDPcKwGD7T32zqOy7dbO7wgstYQ+rxiHj1xbfJgsPM1sB6hyDWgiN3XJg+scq4sj0 MIyg== X-Gm-Message-State: ALyK8tKlxVOiVP4LMwEFcoTAUXTvsBxLwu67gjC6GgCmmIrx8R6rnjveAXtnDBe3nP4uIA== X-Received: by 10.28.90.65 with SMTP id o62mr9449551wmb.16.1465993128369; Wed, 15 Jun 2016 05:18:48 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id jf3sm7450242wjb.41.2016.06.15.05.18.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 05:18:47 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Subject: [PATCH 08/44] drm/hisilicon: Remove redundant calls to drm_connector_register_all() Date: Wed, 15 Jun 2016 13:17:53 +0100 Message-Id: <1465993109-19523-9-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> References: <1465993109-19523-1-git-send-email-chris@chris-wilson.co.uk> Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, Xinliang Liu , Chen Feng X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Up to now, the recommendation was for drivers to call drm_dev_register() followed by drm_connector_register_all(). Now that drm_connector_register() is safe against multiple invocations, we can move drm_connector_register_all() to drm_dev_register() and not suffer from any backwards compatibility issues with drivers not following the more rigorous init ordering. Signed-off-by: Chris Wilson Cc: Daniel Vetter Cc: Xinliang Liu Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 193657259ee9..ef2c32ec1616 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -221,19 +221,12 @@ static int kirin_drm_bind(struct device *dev) if (ret) goto err_kms_cleanup; - /* connectors should be registered after drm device register */ - ret = drm_connector_register_all(drm_dev); - if (ret) - goto err_drm_dev_unregister; - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name, driver->major, driver->minor, driver->patchlevel, driver->date, drm_dev->primary->index); return 0; -err_drm_dev_unregister: - drm_dev_unregister(drm_dev); err_kms_cleanup: kirin_drm_kms_cleanup(drm_dev); err_drm_dev_unref: @@ -246,7 +239,6 @@ static void kirin_drm_unbind(struct device *dev) { struct drm_device *drm_dev = dev_get_drvdata(dev); - drm_connector_unregister_all(drm_dev); drm_dev_unregister(drm_dev); kirin_drm_kms_cleanup(drm_dev); drm_dev_unref(drm_dev);