Commit 7645b19d authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915: extract intel_display_power.h/c from intel_runtime_pm.h/c 



Keep all the device-level PM management in intel_runtime_pm.h/c and move
all the display specific bits into their own file. Also add the new
header to Makefile.header-test.

Apart from the giant code move, the only difference is with the
intel_runtime_<get/put>_raw() functions, which are now exposed in the
header. The _put() version is also not conditionally compiled anymore
since it is ok to always pass the wakeref taken from the _get() to
__intel_runtime_pm_put (it is -1 if tracking is disabled).

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190531222409.9177-2-daniele.ceraolospurio@intel.com
parent 912348b6

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ i915-y += intel_audio.o \ 
	  intel_combo_phy.o \

	  intel_connector.o \

	  intel_display.o \

	  intel_display_power.o \

	  intel_dpio_phy.o \

	  intel_dpll_mgr.o \

	  intel_fbc.o \

drivers/gpu/drm/i915/Makefile.header-test

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ header_test := \ 
	intel_crt.h \

	intel_csr.h \

	intel_ddi.h \

	intel_display_power.h \

	intel_dp.h \

	intel_dp_aux_backlight.h \

	intel_dp_link_training.h \

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#include "intel_bios.h"

#include "intel_device_info.h"

#include "intel_display.h"

#include "intel_display_power.h"

#include "intel_dpll_mgr.h"

#include "intel_frontbuffer.h"

#include "intel_opregion.h"

drivers/gpu/drm/i915/intel_display_power.c

0 → 100644
+4611 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/intel_display_power.h

0 → 100644
+96 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2019 Intel Corporation

 */



#ifndef __INTEL_DISPLAY_POWER_H__

#define __INTEL_DISPLAY_POWER_H__



#include "intel_display.h"

#include "intel_runtime_pm.h"



struct drm_i915_private;

struct intel_encoder;



void skl_enable_dc6(struct drm_i915_private *dev_priv);

void gen9_sanitize_dc_state(struct drm_i915_private *dev_priv);

void bxt_enable_dc9(struct drm_i915_private *dev_priv);

void bxt_disable_dc9(struct drm_i915_private *dev_priv);

void gen9_enable_dc5(struct drm_i915_private *dev_priv);



int intel_power_domains_init(struct drm_i915_private *dev_priv);

void intel_power_domains_cleanup(struct drm_i915_private *dev_priv);

void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume);

void intel_power_domains_fini_hw(struct drm_i915_private *dev_priv);

void icl_display_core_init(struct drm_i915_private *dev_priv, bool resume);

void icl_display_core_uninit(struct drm_i915_private *dev_priv);

void intel_power_domains_enable(struct drm_i915_private *dev_priv);

void intel_power_domains_disable(struct drm_i915_private *dev_priv);

void intel_power_domains_suspend(struct drm_i915_private *dev_priv,

				 enum i915_drm_suspend_mode);

void intel_power_domains_resume(struct drm_i915_private *dev_priv);

void hsw_enable_pc8(struct drm_i915_private *dev_priv);

void hsw_disable_pc8(struct drm_i915_private *dev_priv);

void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume);

void bxt_display_core_uninit(struct drm_i915_private *dev_priv);



const char *

intel_display_power_domain_str(enum intel_display_power_domain domain);



bool intel_display_power_is_enabled(struct drm_i915_private *dev_priv,

				    enum intel_display_power_domain domain);

bool __intel_display_power_is_enabled(struct drm_i915_private *dev_priv,

				      enum intel_display_power_domain domain);

intel_wakeref_t intel_display_power_get(struct drm_i915_private *dev_priv,

					enum intel_display_power_domain domain);

intel_wakeref_t

intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv,

				   enum intel_display_power_domain domain);

void intel_display_power_put_unchecked(struct drm_i915_private *dev_priv,

				       enum intel_display_power_domain domain);

void __intel_display_power_put_async(struct drm_i915_private *i915,

				     enum intel_display_power_domain domain,

				     intel_wakeref_t wakeref);

void intel_display_power_flush_work(struct drm_i915_private *i915);

#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM)

void intel_display_power_put(struct drm_i915_private *dev_priv,

			     enum intel_display_power_domain domain,

			     intel_wakeref_t wakeref);

static inline void

intel_display_power_put_async(struct drm_i915_private *i915,

			      enum intel_display_power_domain domain,

			      intel_wakeref_t wakeref)

{

	__intel_display_power_put_async(i915, domain, wakeref);

}

#else

static inline void

intel_display_power_put(struct drm_i915_private *i915,

			enum intel_display_power_domain domain,

			intel_wakeref_t wakeref)

{

	intel_display_power_put_unchecked(i915, domain);

}



static inline void

intel_display_power_put_async(struct drm_i915_private *i915,

			      enum intel_display_power_domain domain,

			      intel_wakeref_t wakeref)

{

	__intel_display_power_put_async(i915, domain, -1);

}

#endif



#define with_intel_display_power(i915, domain, wf) \

	for ((wf) = intel_display_power_get((i915), (domain)); (wf); \

	     intel_display_power_put_async((i915), (domain), (wf)), (wf) = 0)



void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,

			    u8 req_slices);



void chv_phy_powergate_lanes(struct intel_encoder *encoder,

			     bool override, unsigned int mask);

bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,

			  enum dpio_channel ch, bool override);



#endif /* __INTEL_DISPLAY_POWER_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE