From patchwork Thu Jan 7 09:10:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7974931 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 3E206BEEE5 for ; Thu, 7 Jan 2016 09:11:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6AD532017E for ; Thu, 7 Jan 2016 09:11:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6EE0C20149 for ; Thu, 7 Jan 2016 09:11:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 25BC96E63E; Thu, 7 Jan 2016 01:11:04 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id A89356E63F for ; Thu, 7 Jan 2016 01:11:02 -0800 (PST) Received: by mail-wm0-f53.google.com with SMTP id l65so88518032wmf.1 for ; Thu, 07 Jan 2016 01:11:02 -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:mime-version:content-type :content-transfer-encoding; bh=CyJccHjY306gIElGcYh3RQmzepymZNRXfT0aJPkFHBo=; b=dSdP8kKwXgxG0HVgvJUzqsJilbDU2+Nh//GI37sfN+JyTJkIwaGcD9UV6JUBnW8SXB QUR/C3h0qC3+CD0hKw64J4ONkeeQFEuCQiftwgr8ixLka3hVanqF3xEOMg71CGfVaZSZ cYFaedlZyOXi/zMJaoA7znj9+PTAWtgnepxAo= 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:mime-version :content-type:content-transfer-encoding; bh=CyJccHjY306gIElGcYh3RQmzepymZNRXfT0aJPkFHBo=; b=EBgUjX3UTboctT8/Zhgpgt+Fx1hcOyi3PT2qZj5ow7fnd3I7T4Hbz8xFedGETr3hZQ AHBDP8KWsOg+khFD/TZZs/2TbuHXb4xDQuKB7ICcbzrWJPUnG7PFb8wPrVcvAMYBP2ug 1tSdWIh3iZBJ8EY69TXm+DdgYD4/Uie/1dDf4IIm7M4kgy7m16tMr7Rl17J6/qZaLo2A 9GGQi/4lo+N35yu7kZqsnxQk9poXU0sYOLeZzz8I7WUrFm5GNKzHvjzQS/l1n/O9w9wm ORyNqzJWVGn3ACnaoHNcQqBZLE5rGp/e2rUWqwrkKSivavra35/JzMKKdphKgvNrf8Rj RD/w== X-Gm-Message-State: ALoCoQmRln+u+n/wbG1TgYxwD7vtB5ERyIPJNM3J3u2Wt4hyqwiZE+0eHj/LUD2q6e9/gg9GOpH1sSYgLDRHnjgnWbrPD19Mpw== X-Received: by 10.194.114.164 with SMTP id jh4mr112399362wjb.153.1452157860992; Thu, 07 Jan 2016 01:11:00 -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 g3sm99810980wjw.31.2016.01.07.01.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 01:10:59 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/i915: Init power domains early in driver load Date: Thu, 7 Jan 2016 10:10:56 +0100 Message-Id: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.6.4 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. Cc: Ville Syrjälä Cc: Patrik Jakobsson Cc: Imre Deak Cc: Jani Nikula Cc: Meelis Roos Fixes: ac9b8236551d ("drm/i915: Introduce a gmbus power domain") Cc: stable@vger.kernel.org References: http://www.spinics.net/lists/intel-gfx/msg83075.html Signed-off-by: Daniel Vetter Tested-by: Meelis Roos --- drivers/gpu/drm/i915/i915_dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index b4741d121a74..405aba2ca736 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -396,8 +396,6 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_vga_switcheroo; - intel_power_domains_init_hw(dev_priv); - ret = intel_irq_install(dev_priv); if (ret) goto cleanup_gem_stolen; @@ -1025,6 +1023,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,8 +1057,6 @@ 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");