From patchwork Wed Nov 30 11:35:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9454263 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 2B5996071E for ; Wed, 30 Nov 2016 11:36:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F9C3283E0 for ; Wed, 30 Nov 2016 11:36:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 045562841B; Wed, 30 Nov 2016 11:36:05 +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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B5217283E0 for ; Wed, 30 Nov 2016 11:36:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C49E6E12F; Wed, 30 Nov 2016 11:36:01 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@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 BA6AA6E12F for ; Wed, 30 Nov 2016 11:35:57 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a20so29030085wme.2 for ; Wed, 30 Nov 2016 03:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0HGdUQ+tuDIWOa7xwjADbwBiB4xuppUvIMaIxA1Q/yw=; b=j10g3CeBE8xOa3/NFjxWTgpofy5PA7Rifbc6wtMnFlqiOxsV5Dz2pRanFhJe6XTty1 rYv98szOqmSIicwuaeMmXfl6I+d12EnCT3L4qo+rO0iSy97z49y4wd8IkBOYCMDNuG8n AAsacsXlMoZNyKMn7hHFgxMwHwUS4jgKt4nnXT1CAUbEr6SF50vN73rBw/v0j710MWnC C9YqYSBE6Ydm0q65nNcX7r1xq19pKKK9u1rdcCpe0oAu/0hCHeRyOGCPK+OXMH57LMS4 EMaF8d+mPlSCmV70mZNSx0lRaxLD2tfcu/5NWusDuPRZu2C428OxEpYStYhTlP9eydAP OYwQ== 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; bh=0HGdUQ+tuDIWOa7xwjADbwBiB4xuppUvIMaIxA1Q/yw=; b=Z3EoIZVz73QXS8DTZGjuSOBy1aQl0tXny29hqwGe6FIRqTB8/fnV/KDhCq/IT2unj+ NruNs0bmmvIBxvb+x7bEsvcRnRBSdopGsgG9u7ER0Pvr2N2hOVVIZsqrFMJMqxu/bcDc Lhy6pNCf3k98ruAHO1xlpYPiPGYnsojS/NjE1vY8OhqOEr7M+auF4UpJtMyApW+3hbrh CvwYEtaz+0R6/jZpSDyAihaEaBjRlr4BTedDTAiXZNAqPzu2Ufh33H2p/yevWcz3EM7r W5D0TeDoYHPvv+rVRqoKwdFDNaBnOYjFh9Gh9s7tpjW+S3o3tmRGUasLx3TTv68vA4Yj UmNw== X-Gm-Message-State: AKaTC006z72oF0kSrB+kjdUMxbK0r+rK2hOkoFpZZMxZpb5KB71NUdRUETq49yiffAAkqw== X-Received: by 10.28.141.143 with SMTP id p137mr27109720wmd.5.1480505756273; Wed, 30 Nov 2016 03:35:56 -0800 (PST) Received: from t460p.intel ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id c187sm7471123wmd.13.2016.11.30.03.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Nov 2016 03:35:55 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 30 Nov 2016 11:35:40 +0000 Message-Id: <1480505740-1920-11-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480505740-1920-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1480505740-1920-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 10/10] drm/i915: Make intel_pm_setup take dev_priv 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 From: Tvrtko Ursulin Signed-off-by: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f6331e873735..15a7779ab265 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -829,7 +829,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, /* This must be called before any calls to HAS_PCH_* */ intel_detect_pch(dev_priv); - intel_pm_setup(&dev_priv->drm); + intel_pm_setup(dev_priv); intel_init_dpio(dev_priv); intel_power_domains_init(dev_priv); intel_irq_init(dev_priv); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 460f3742ebd7..1d126c29598f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1724,7 +1724,7 @@ int ilk_wm_max_level(const struct drm_i915_private *dev_priv); void intel_update_watermarks(struct intel_crtc *crtc); void intel_init_pm(struct drm_i915_private *dev_priv); void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv); -void intel_pm_setup(struct drm_device *dev); +void intel_pm_setup(struct drm_i915_private *dev_priv); void intel_gpu_ips_init(struct drm_i915_private *dev_priv); void intel_gpu_ips_teardown(void); void intel_init_gt_powersave(struct drm_i915_private *dev_priv); diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index ca31cdd82ebd..c45ee1732715 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -7955,10 +7955,8 @@ void intel_queue_rps_boost_for_request(struct drm_i915_gem_request *req) queue_work(req->i915->wq, &boost->work); } -void intel_pm_setup(struct drm_device *dev) +void intel_pm_setup(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = to_i915(dev); - mutex_init(&dev_priv->rps.hw_lock); spin_lock_init(&dev_priv->rps.client_lock);