Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 192aa181 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make intel_pm_setup take dev_priv 



Function actually wants dev_priv so give it to it.

v2: Commit message. (Joonas Lahtinen)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480601805-14391-2-git-send-email-tvrtko.ursulin@linux.intel.com
parent af6dc742

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,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);

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/intel_pm.c

+1 −3
Original line number Diff line number Diff line
@@ -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);