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

Commit 04098753 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: use power domain api to check vga power state 



This way we can reuse the check on other platforms too. Also factor out
a version of the function that doesn't check if the power is on, we'll
need to call this from within the power domain framework.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e13192f6

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -2520,6 +2520,7 @@ extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); 
extern void intel_modeset_setup_hw_state(struct drm_device *dev,

					 bool force_restore);

extern void i915_redisable_vga(struct drm_device *dev);

extern void i915_redisable_vga_power_on(struct drm_device *dev);

extern bool intel_fbc_enabled(struct drm_device *dev);

extern void intel_disable_fbc(struct drm_device *dev);

extern bool ironlake_set_drps(struct drm_device *dev, u8 val);

drivers/gpu/drm/i915/intel_display.c

+13 −7
Original line number Diff line number Diff line
@@ -11232,11 +11232,21 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) 
	 * the crtc fixup. */

}



void i915_redisable_vga(struct drm_device *dev)

void i915_redisable_vga_power_on(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 vga_reg = i915_vgacntrl_reg(dev);



	if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {

		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");

		i915_disable_vga(dev);

	}

}



void i915_redisable_vga(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;



	/* This function can be called both from intel_modeset_setup_hw_state or

	 * at a very early point in our resume sequence, where the power well

	 * structures are not yet restored. Since this function is at a very
@@ -11244,14 +11254,10 @@ void i915_redisable_vga(struct drm_device *dev) 
	 * level, just check if the power well is enabled instead of trying to

	 * follow the "don't touch the power well if we don't need it" policy

	 * the rest of the driver uses. */

	if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) &&

	    (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED) == 0)

	if (!intel_display_power_enabled(dev_priv, POWER_DOMAIN_VGA))

		return;



	if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {

		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");

		i915_disable_vga(dev);

	}

	i915_redisable_vga_power_on(dev);

}



static void intel_modeset_readout_hw_state(struct drm_device *dev)