From patchwork Thu Jan 7 13:16:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7977381 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 24BFCBEEE5 for ; Thu, 7 Jan 2016 13:17:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 436C62014A for ; Thu, 7 Jan 2016 13:17:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 489482017E for ; Thu, 7 Jan 2016 13:17:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C0096E3D3; Thu, 7 Jan 2016 05:17:00 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E9D56E3D3 for ; Thu, 7 Jan 2016 05:16:59 -0800 (PST) Received: by mail-wm0-f49.google.com with SMTP id u188so97950372wmu.1 for ; Thu, 07 Jan 2016 05:16:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=gwHrL/ZaXFKQjpQaNrdyyg7WUExE62SJ2iYTkget0rg=; b=e/HlhbqVwGSMeqFqACYUP6P0eKzUiXbIk6K5rmgvyeFz5nYTeajMt1ytVXSzpE4+6J h48BgzAXq08d/lUERrx5a4URlS3iX245wA5Dfpmx8hCTV3SCfKBQuE/AklSKd5STv9Py KK486W4lK9chpQSAFeTh97mQNZl6aslRNywMM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=gwHrL/ZaXFKQjpQaNrdyyg7WUExE62SJ2iYTkget0rg=; b=jjMA9nsGC1RZduSluJs9h5G/VGtIzCCsHWJYYbadZ2ykdfENO62ctadneFTBH/9LpV ciRLSRgGgiGpZ5JylzPXh5Hd9eQjUHSk93ATZeMuaavjQpMwxDB+WgJGG5FAYzGHLA3M t01SoMPMSNg4xPLdUqnakTFSFSbLbO4B1wRsWUTzfLK9MAaf0FQe1n4eq6S5J9wGwFaA FDtF87/6kTRHMwKohRrCW16L7BXhUyRfluGH2LWtBF+EYtIYyvYluwPe7xYPb6s9kKpq yjAARJQc2BBDFZmml+HkAFzxaIW6R5OrzPmoutlVFArMqk6BVpKwzWP+E9ibl/9SO49n zSFg== X-Gm-Message-State: ALoCoQnMb3QJhwHgfs+b5A4bUXvo6JT52wl9SYzy10fDdBN16nZ5pV/UVFRasY/7vmYa4SPgfm9Tl/JS/uSzsT3zhs0inYuQoA== X-Received: by 10.194.5.227 with SMTP id v3mr73174360wjv.59.1452172617653; Thu, 07 Jan 2016 05:16:57 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id a126sm13621291wmh.0.2016.01.07.05.16.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 05:16:56 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/i915: Init power domains early in driver load Date: Thu, 7 Jan 2016 14:16:48 +0100 Message-Id: <1452172608-2639-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> References: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Meelis Roos , Jani Nikula , Daniel Vetter , Intel Graphics Development , stable@vger.kernel.org, Daniel Vetter 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit ac9b8236551d1177fd07b56aef9b565d1864420d Author: Ville Syrjälä Date: Fri Nov 27 18:55:26 2015 +0200 drm/i915: Introduce a gmbus power domain gmbus also needs the power domain infrastructure right from the start, since as soon as we register the i2c controllers someone can use them. v2: Adjust cleanup paths too (Chris). v3: Rebase onto -nightly (totally bogus tree I had lying around) and also move dpio init head (Ville). Cc: Ville Syrjälä Cc: Patrik Jakobsson Cc: Imre Deak Cc: Jani Nikula Cc: Meelis Roos Cc: Chris Wilson Fixes: ac9b8236551d ("drm/i915: Introduce a gmbus power domain") Cc: stable@vger.kernel.org References: http://www.spinics.net/lists/intel-gfx/msg83075.html Tested-by: Meelis Roos Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 988a3806512a..fcefd3beef50 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -398,7 +398,6 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_vga_switcheroo; - intel_power_domains_init_hw(dev_priv, false); intel_csr_ucode_init(dev_priv); @@ -1025,6 +1024,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) intel_irq_init(dev_priv); intel_uncore_sanitize(dev); + intel_power_domains_init(dev_priv); + intel_init_dpio(dev_priv); + intel_power_domains_init_hw(dev_priv, false); /* Try to make sure MCHBAR is enabled before poking at it */ intel_setup_mchbar(dev); @@ -1049,20 +1051,16 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) intel_device_info_runtime_init(dev); - intel_init_dpio(dev_priv); - if (INTEL_INFO(dev)->num_pipes) { ret = drm_vblank_init(dev, INTEL_INFO(dev)->num_pipes); if (ret) goto out_gem_unload; } - intel_power_domains_init(dev_priv); - ret = i915_load_modeset_init(dev); if (ret < 0) { DRM_ERROR("failed to init modeset\n"); - goto out_power_well; + goto out_vblank; } /* @@ -1091,8 +1089,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) return 0; -out_power_well: - intel_power_domains_fini(dev_priv); +out_vblank: drm_vblank_cleanup(dev); out_gem_unload: WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier)); @@ -1103,6 +1100,7 @@ out_gem_unload: intel_teardown_gmbus(dev); intel_teardown_mchbar(dev); + intel_power_domains_fini(dev_priv); pm_qos_remove_request(&dev_priv->pm_qos); destroy_workqueue(dev_priv->gpu_error.hangcheck_wq); out_freedpwq: