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

Commit 44cec740 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: dont save/restore VGA state for kms 



The only thing we really care about that it is off. To do so, reuse
the recently created i915_redisable_vga function, which is already
used to put obnoxious firmware into check on lid reopening.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d8157a36

drivers/gpu/drm/i915/i915_drv.h

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

extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);

extern void intel_modeset_setup_hw_state(struct drm_device *dev,

extern void intel_modeset_setup_hw_state(struct drm_device *dev,

					 bool force_restore);

					 bool force_restore);

extern void i915_redisable_vga(struct drm_device *dev);

extern bool intel_fbc_enabled(struct drm_device *dev);

extern bool intel_fbc_enabled(struct drm_device *dev);

extern void intel_disable_fbc(struct drm_device *dev);

extern void intel_disable_fbc(struct drm_device *dev);

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

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

drivers/gpu/drm/i915/i915_suspend.c

+26 −22
Original line number Original line Diff line number Diff line
@@ -69,6 +69,15 @@ static void i915_save_vga(struct drm_device *dev) 
	int i;

	int i;

	u16 cr_index, cr_data, st01;

	u16 cr_index, cr_data, st01;





	/* VGA state */

	dev_priv->regfile.saveVGA0 = I915_READ(VGA0);

	dev_priv->regfile.saveVGA1 = I915_READ(VGA1);

	dev_priv->regfile.saveVGA_PD = I915_READ(VGA_PD);

	if (HAS_PCH_SPLIT(dev))

		dev_priv->regfile.saveVGACNTRL = I915_READ(CPU_VGACNTRL);

	else

		dev_priv->regfile.saveVGACNTRL = I915_READ(VGACNTRL);



	/* VGA color palette registers */

	/* VGA color palette registers */

	dev_priv->regfile.saveDACMASK = I915_READ8(VGA_DACMASK);

	dev_priv->regfile.saveDACMASK = I915_READ8(VGA_DACMASK);
@@ -127,6 +136,18 @@ static void i915_restore_vga(struct drm_device *dev) 
	int i;

	int i;

	u16 cr_index, cr_data, st01;

	u16 cr_index, cr_data, st01;





	/* VGA state */

	if (HAS_PCH_SPLIT(dev))

		I915_WRITE(CPU_VGACNTRL, dev_priv->regfile.saveVGACNTRL);

	else

		I915_WRITE(VGACNTRL, dev_priv->regfile.saveVGACNTRL);



	I915_WRITE(VGA0, dev_priv->regfile.saveVGA0);

	I915_WRITE(VGA1, dev_priv->regfile.saveVGA1);

	I915_WRITE(VGA_PD, dev_priv->regfile.saveVGA_PD);

	POSTING_READ(VGA_PD);

	udelay(150);



	/* MSR bits */

	/* MSR bits */

	I915_WRITE8(VGA_MSR_WRITE, dev_priv->regfile.saveMSR);

	I915_WRITE8(VGA_MSR_WRITE, dev_priv->regfile.saveMSR);

	if (dev_priv->regfile.saveMSR & VGA_MSR_CGA_MODE) {

	if (dev_priv->regfile.saveMSR & VGA_MSR_CGA_MODE) {
@@ -251,15 +272,7 @@ static void i915_save_display(struct drm_device *dev) 
		}

		}

	}

	}





	/* VGA state */

	if (!drm_core_check_feature(dev, DRIVER_MODESET))

	dev_priv->regfile.saveVGA0 = I915_READ(VGA0);

	dev_priv->regfile.saveVGA1 = I915_READ(VGA1);

	dev_priv->regfile.saveVGA_PD = I915_READ(VGA_PD);

	if (HAS_PCH_SPLIT(dev))

		dev_priv->regfile.saveVGACNTRL = I915_READ(CPU_VGACNTRL);

	else

		dev_priv->regfile.saveVGACNTRL = I915_READ(VGACNTRL);



		i915_save_vga(dev);

		i915_save_vga(dev);

}

}
@@ -334,19 +347,10 @@ static void i915_restore_display(struct drm_device *dev) 
			I915_WRITE(FBC_CONTROL, dev_priv->regfile.saveFBC_CONTROL);

			I915_WRITE(FBC_CONTROL, dev_priv->regfile.saveFBC_CONTROL);

		}

		}

	}

	}

	/* VGA state */

	if (!drm_core_check_feature(dev, DRIVER_MODESET))

	if (HAS_PCH_SPLIT(dev))

		I915_WRITE(CPU_VGACNTRL, dev_priv->regfile.saveVGACNTRL);

	else

		I915_WRITE(VGACNTRL, dev_priv->regfile.saveVGACNTRL);



	I915_WRITE(VGA0, dev_priv->regfile.saveVGA0);

	I915_WRITE(VGA1, dev_priv->regfile.saveVGA1);

	I915_WRITE(VGA_PD, dev_priv->regfile.saveVGA_PD);

	POSTING_READ(VGA_PD);

	udelay(150);



		i915_restore_vga(dev);

		i915_restore_vga(dev);

	else

		i915_redisable_vga(dev);

}

}





int i915_save_state(struct drm_device *dev)

int i915_save_state(struct drm_device *dev)

drivers/gpu/drm/i915/intel_display.c

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

	 * the crtc fixup. */

}

}





static void i915_redisable_vga(struct drm_device *dev)

void i915_redisable_vga(struct drm_device *dev)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 vga_reg;

	u32 vga_reg;