Commit 1fd1c624 authored by Eric Anholt's avatar Eric Anholt
Browse files

drm/i915: Save/restore cursor state on suspend/resume. 



This may fix cursor corruption in X on resume, which would persist until
the cursor was hidden and then shown again.

V2: Also include the cursor control regs.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 0e7ddf7e

drivers/gpu/drm/i915/i915_drv.h

+8 −0
Original line number Diff line number Diff line
@@ -285,6 +285,13 @@ typedef struct drm_i915_private { 
	u8 saveDACMASK;

	u8 saveCR[37];

	uint64_t saveFENCE[16];

	u32 saveCURACNTR;

	u32 saveCURAPOS;

	u32 saveCURABASE;

	u32 saveCURBCNTR;

	u32 saveCURBPOS;

	u32 saveCURBBASE;

	u32 saveCURSIZE;



	struct {

		struct drm_mm gtt_space;
@@ -642,6 +649,7 @@ void i915_gem_detach_phys_object(struct drm_device *dev, 
void i915_gem_free_all_phys_object(struct drm_device *dev);

int i915_gem_object_get_pages(struct drm_gem_object *obj);

void i915_gem_object_put_pages(struct drm_gem_object *obj);

void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);



/* i915_gem_tiling.c */

void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);

drivers/gpu/drm/i915/i915_suspend.c

+20 −0
Original line number Diff line number Diff line
@@ -295,6 +295,16 @@ int i915_save_state(struct drm_device *dev) 
	i915_save_palette(dev, PIPE_B);

	dev_priv->savePIPEBSTAT = I915_READ(PIPEBSTAT);



	/* Cursor state */

	dev_priv->saveCURACNTR = I915_READ(CURACNTR);

	dev_priv->saveCURAPOS = I915_READ(CURAPOS);

	dev_priv->saveCURABASE = I915_READ(CURABASE);

	dev_priv->saveCURBCNTR = I915_READ(CURBCNTR);

	dev_priv->saveCURBPOS = I915_READ(CURBPOS);

	dev_priv->saveCURBBASE = I915_READ(CURBBASE);

	if (!IS_I9XX(dev))

		dev_priv->saveCURSIZE = I915_READ(CURSIZE);



	/* CRT state */

	dev_priv->saveADPA = I915_READ(ADPA);
@@ -480,6 +490,16 @@ int i915_restore_state(struct drm_device *dev) 
	I915_WRITE(DSPBCNTR, dev_priv->saveDSPBCNTR);

	I915_WRITE(DSPBADDR, I915_READ(DSPBADDR));



	/* Cursor state */

	I915_WRITE(CURAPOS, dev_priv->saveCURAPOS);

	I915_WRITE(CURACNTR, dev_priv->saveCURACNTR);

	I915_WRITE(CURABASE, dev_priv->saveCURABASE);

	I915_WRITE(CURBPOS, dev_priv->saveCURBPOS);

	I915_WRITE(CURBCNTR, dev_priv->saveCURBCNTR);

	I915_WRITE(CURBBASE, dev_priv->saveCURBBASE);

	if (!IS_I9XX(dev))

		I915_WRITE(CURSIZE, dev_priv->saveCURSIZE);



	/* CRT state */

	I915_WRITE(ADPA, dev_priv->saveADPA);

CRA Git | Maintained and supported by SUSTech CRA and CCSE