From patchwork Thu Jan 7 11:44:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7976131 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 EA92EBEEE5 for ; Thu, 7 Jan 2016 11:44:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17305200D9 for ; Thu, 7 Jan 2016 11:44:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2B0D320172 for ; Thu, 7 Jan 2016 11:44:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D374A8A0E4; Thu, 7 Jan 2016 03:44:28 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4F3D8A0E4 for ; Thu, 7 Jan 2016 03:44:27 -0800 (PST) Received: by mail-wm0-f46.google.com with SMTP id b14so118955055wmb.1 for ; Thu, 07 Jan 2016 03:44:27 -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=OZOTyE7moOcdrb3XpgvNOFq66sEGV7ObOo+s6zwb9wE=; b=gLPBEXABWZhZMA3KkRng59HQrzmIM9fumu1wTwL/J/X0ZVP490M20bj99ZN0LGXNnj YdoBku2e9qJclVqhh13254FHfdRAhr2kewspNjmQtx8jPVA5TT3o5t1gHa2UtBBSqB6l TravAE2MBIoen/bNFwybr5ijoL4ICLIiXbysY= 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=OZOTyE7moOcdrb3XpgvNOFq66sEGV7ObOo+s6zwb9wE=; b=KpSVdx5eAFeZISMPU7kaRK/qt2Pm1ACVazDusOCaF1deEkRENJ+Ki9HjtsiZ0VH4EL m0UWpk58iqyYPkVrYMGDyghEQlk1/80qYXHTUGbrbX4oVxNKkqpD+WmZTAqu46hC6NhI nW+F/h20ytz3fgNTVkblvIcXhnSv8YWsIuPe9shNh74chv4Mj886WbL8PXI47QK7yHT/ VSZz0Z6b5x2ouaV9xpaCCsSAf+JP91d4fL/qy8XeLzezkUCpZ1cm3H251f/rhEzlCr11 OMk3Q+n0QJQIK/ynChDBcjkV1R2Es680kWttKAlgo2d/Xm9wBrU0Mk8eyBwEENua/30N rmeg== X-Gm-Message-State: ALoCoQkeXPkkKbG8tpFjgcP+fhQ+LSYLtfDXlrD+1LWyEQ/QyLuPULUUdn+9MnlfTCY5dbJbCWEkOdK66j/eljXto58wpzUa1A== X-Received: by 10.28.72.2 with SMTP id v2mr16757723wma.84.1452167065935; Thu, 07 Jan 2016 03:44:25 -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 w73sm13202576wmw.21.2016.01.07.03.44.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 03:44:25 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/i915: Init power domains early in driver load Date: Thu, 7 Jan 2016 12:44:21 +0100 Message-Id: <1452167061-27252-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). 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 Acked-by: Chris Wilson --- drivers/gpu/drm/i915/i915_dma.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 988a3806512a..490d8b0d931e 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,8 @@ 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_power_domains_init_hw(dev_priv); /* Try to make sure MCHBAR is enabled before poking at it */ intel_setup_mchbar(dev); @@ -1057,12 +1058,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 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 +1090,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 +1101,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: