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

Commit 6a932d88 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: don't get/put PC8 when getting/putting power wells 



Because we already get/put runtime PM every time we get/put any power
domain, and now PC8 and runtime PM are the same thing.

With this, we can also now kill the hsw_{en,dis}able_package_c8
functions.

v2: - Rebase.
v3: - Rebase.
v4: - Rebase.

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d361ae26

drivers/gpu/drm/i915/intel_display.c

+0 −20
Original line number Diff line number Diff line
@@ -7073,26 +7073,6 @@ void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv) 
	dev_priv->pc8.enabled = false;

}



void hsw_enable_package_c8(struct drm_i915_private *dev_priv)

{

	if (!HAS_PC8(dev_priv->dev))

		return;



	mutex_lock(&dev_priv->pc8.lock);

	intel_runtime_pm_put(dev_priv);

	mutex_unlock(&dev_priv->pc8.lock);

}



void hsw_disable_package_c8(struct drm_i915_private *dev_priv)

{

	if (!HAS_PC8(dev_priv->dev))

		return;



	mutex_lock(&dev_priv->pc8.lock);

	intel_runtime_pm_get(dev_priv);

	mutex_unlock(&dev_priv->pc8.lock);

}



static void haswell_modeset_global_resources(struct drm_device *dev)

{

	modeset_update_crtc_power_domains(dev);

drivers/gpu/drm/i915/intel_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -727,8 +727,6 @@ unsigned long intel_gen4_compute_page_offset(int *x, int *y, 
void intel_display_handle_reset(struct drm_device *dev);

void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv);

void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv);

void hsw_enable_package_c8(struct drm_i915_private *dev_priv);

void hsw_disable_package_c8(struct drm_i915_private *dev_priv);

void intel_dp_get_m_n(struct intel_crtc *crtc,

		      struct intel_crtc_config *pipe_config);

int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n);

drivers/gpu/drm/i915/intel_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -5391,7 +5391,6 @@ static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv, 
static void hsw_power_well_enable(struct drm_i915_private *dev_priv,

				  struct i915_power_well *power_well)

{

	hsw_disable_package_c8(dev_priv);

	hsw_set_power_well(dev_priv, power_well, true);

}
@@ -5399,7 +5398,6 @@ static void hsw_power_well_disable(struct drm_i915_private *dev_priv, 
				   struct i915_power_well *power_well)

{

	hsw_set_power_well(dev_priv, power_well, false);

	hsw_enable_package_c8(dev_priv);

}



static void i9xx_always_on_power_well_noop(struct drm_i915_private *dev_priv,