From patchwork Fri Jun 17 08:25:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9183015 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 AEACB60776 for ; Fri, 17 Jun 2016 08:25:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D2442838A for ; Fri, 17 Jun 2016 08:25:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92146283A2; Fri, 17 Jun 2016 08:25:55 +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 5CB7E2838A for ; Fri, 17 Jun 2016 08:25:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27F2D6EB5E; Fri, 17 Jun 2016 08:25:40 +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 6695D6EB5B; Fri, 17 Jun 2016 08:25:37 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id 187so14867963wmz.1; Fri, 17 Jun 2016 01:25:37 -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=w2htyNADUzmaTK8Z4WFYy/MoLfN5tuIzH9ClldoW7yIT8TKkFzhyIj5tI+4KTcyUSa Fas0+E+JeJdib5vxhG8IZxqDuWKuelIbIvRNAPD3uxAEtV5dUnaOfqgDwg2xDfdur1ez Vbd70WJuT9EVn/2kpgj8nhkxYl8UwkFpVpl/0t7+gZMWnf+VbQtw/Qj+Kyz6v+KxV8DB RWHD0NskdPBDYKqTjIgYHiZdaBiK+QM4Q4TouxOGfYgT0itUSqG9OIsPD7FytUFKbBLM V/bvgeOyx+Wzjr5DkakspmUKSlP7O4+yldU9v8LLhEuI8odne+9jI4WXWD24C0jYM+mY CcNA== 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=hJ1eArlsxbEk1sNi1bSlT2voD6W41auyi8/aACmGXMLUozQ9eomn64VHf54lVFtUgR zVq+mRBzAN7zWFedPgDgwPBF6F4B6VOnk9ZuM3PEVsD168+nxybgeEKTwQ5z5frz/VxA BmH9j3KLFWogVa8tT8H2wfzNQ2ngNPMfhJzUHSph3/A0EsvkH4KNASJHWA0Vwuo1e4b3 Hwdv5/g6rGvwY4neeWihmDrx+YHkCTIvi57D8rRdzuNRpSA5z/Hm5K6H0DyUNpuTIcyf rbp1bHpSRWUuMYBpOwVad4uI6ho1wtzidDBIb1OvwIdT5WkLVN2GvNKHiRIkzXnmktLZ WVgg== X-Gm-Message-State: ALyK8tJUIgCLliY6dyqvWbExn5TS4uuzRERLvNEf0yZ2OiiL0MIMqfTRe+eJgu2JhiFayQ== X-Received: by 10.28.222.136 with SMTP id v130mr1038297wmg.90.1466151935524; Fri, 17 Jun 2016 01:25:35 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id ag3sm6917055wjc.39.2016.06.17.01.25.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jun 2016 01:25:34 -0700 (PDT) From: Chris Wilson To: dri-devel@lists.freedesktop.org Subject: [PATCH 4/7] drm/hisilicon: Remove redundant calls to drm_connector_register_all() Date: Fri, 17 Jun 2016 09:25:20 +0100 Message-Id: <1466151923-1572-5-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466151923-1572-1-git-send-email-chris@chris-wilson.co.uk> References: <1466151923-1572-1-git-send-email-chris@chris-wilson.co.uk> Cc: Daniel Vetter , intel-gfx@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 Acked-by: Xinliang Liu --- 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);