From patchwork Fri Jun 24 07:00:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9196801 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 7C28160871 for ; Fri, 24 Jun 2016 07:02:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CCA028495 for ; Fri, 24 Jun 2016 07:02:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61C8028498; Fri, 24 Jun 2016 07:02:22 +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=ham 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 17E2D28495 for ; Fri, 24 Jun 2016 07:02:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9895B6EA50; Fri, 24 Jun 2016 07:02:19 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC93C6E2DA for ; Fri, 24 Jun 2016 07:01:01 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id 187so2587531wmz.1 for ; Fri, 24 Jun 2016 00:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=8XZaI7xcQaFnLr7qhSvctnAF1zfHfCec2tw9vCKCP9Y=; b=UEn25Zp01IK0jevTCtGlfj3M/qOcKu3pB2SjFSEnInYteEs8e6xtO6W8hWchTJl0r0 jfDtAn5Y3GEdJuTmBFPKJyf265ZFyTj91WZUqG8kEJ1jrHjZ6ZHSOKJf9poWkp6qIdk8 VgwvKt9VRlBiMYbwkcOEy4gO2lyAWcENBr1y9azk1pf94nPmHmMCK8cd/qIb51z1hfAe 2BsZRGeZWx6azpSuKcuerqh0JDKbqmOWp7135NTLIwwC5hmc/rUdDGZSHWp4ZLMl6/EX 5EM+I2B2g6T/6Np2MnagFpoUOZyDm6rL88VUxfROy59MILes2uMMp76masmNZKOB0l7y DJgg== 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:subject:date:message-id :in-reply-to:references; bh=8XZaI7xcQaFnLr7qhSvctnAF1zfHfCec2tw9vCKCP9Y=; b=MTOdz+429TAaMLXyvxwMawS1XjhYH0IZVX9L313Z6AKG2HnT4aTg34qMuHJXIkhKG4 KMd+ENFlPdOpgDS3GREZmvLReWhFgUHJpx+F1oPhM2owwARqZBTM4pTehcU7g61SkaF9 1KQr4rWomXvNir+G++VVsrbxth2rpe6q+UiRkPGLhSrkFF+1A01phMeQwUCoOy2Pje4O DH43kDKi1iGBhYiqTUmo4BxLuM8ByVPgk5YgQfpkvgWlW98+EU4NSsBlVY39u66B8jpL TK95N5uCgR9Lai4c4FOBdmaR/HYq9KsbDHzMKGQ9T3O2yIO/jQiElrM4pC4LWdCMYbrF adtQ== X-Gm-Message-State: ALyK8tKgMqB+Z2s2y1/uzDlUj0DXMsma+OT9voukqcEXi2qVgVRHipuEJd6JFLqkxXLuGg== X-Received: by 10.28.207.13 with SMTP id f13mr17579070wmg.53.1466751660077; Fri, 24 Jun 2016 00:01:00 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id t188sm1621708wma.8.2016.06.24.00.00.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jun 2016 00:00:59 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 24 Jun 2016 08:00:39 +0100 Message-Id: <1466751645-6529-8-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466751645-6529-1-git-send-email-chris@chris-wilson.co.uk> References: <1466751645-6529-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 08/14] drm/i915: Remove redundant drm_connector_register_all() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP drm_connector_register_all() is now automatically called by drm_dev_register(), and so we no longer have to do so ourselves (via intel_modeset_register() after calling drm_dev_register()). Similarly for unregistering. Signed-off-by: Chris Wilson Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 2 -- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/intel_display.c | 10 ---------- 3 files changed, 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a9c2f635aaab..77c3e2373ad9 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1403,7 +1403,6 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) if (drm_dev_register(dev, 0) == 0) { i915_debugfs_register(dev_priv); i915_setup_sysfs(dev); - intel_modeset_register(dev_priv); } else DRM_ERROR("Failed to register driver for userspace access!\n"); @@ -1440,7 +1439,6 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv) acpi_video_unregister(); intel_opregion_unregister(dev_priv); - intel_modeset_unregister(dev_priv); i915_teardown_sysfs(dev_priv->dev); i915_debugfs_unregister(dev_priv); drm_dev_unregister(dev_priv->dev); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8179bc7d6b1b..b2d19457edff 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3735,8 +3735,6 @@ extern void intel_modeset_init_hw(struct drm_device *dev); extern void intel_modeset_init(struct drm_device *dev); extern void intel_modeset_gem_init(struct drm_device *dev); extern void intel_modeset_cleanup(struct drm_device *dev); -extern void intel_modeset_register(struct drm_i915_private *dev_priv); -extern void intel_modeset_unregister(struct drm_i915_private *dev_priv); extern int intel_connector_register(struct drm_connector *); extern void intel_connector_unregister(struct drm_connector *); extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 798c175c37bf..c3257177d527 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15551,16 +15551,6 @@ void intel_modeset_init_hw(struct drm_device *dev) intel_enable_gt_powersave(dev_priv); } -void intel_modeset_register(struct drm_i915_private *dev_priv) -{ - drm_connector_register_all(dev_priv->dev); -} - -void intel_modeset_unregister(struct drm_i915_private *dev_priv) -{ - drm_connector_unregister_all(dev_priv->dev); -} - /* * Calculate what we think the watermarks should be for the state we've read * out of the hardware and then immediately program those watermarks so that