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

Commit 80ad99da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Nothing too major or scary.

  One i915 regression fix, nouveau has a tmds regression fix, along with
  a regression fix for the runtime pm code for optimus laptops not
  restoring the display hw correctly"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: make sure display hardware is reinitialised on runtime resume
  drm/nouveau: punt fbcon resume out to a workqueue
  drm/nouveau: fix regression on original nv50 board
  drm/nv50/disp: fix dpms regression on certain boards
  drm/i915: Flush the PTEs after updating them before suspend
parents 58586869 eee0815d

drivers/gpu/drm/i915/i915_gem_gtt.c

+13 −1
Original line number Diff line number Diff line
@@ -1310,6 +1310,16 @@ void i915_check_and_clear_faults(struct drm_device *dev) 
	POSTING_READ(RING_FAULT_REG(&dev_priv->ring[RCS]));

}



static void i915_ggtt_flush(struct drm_i915_private *dev_priv)

{

	if (INTEL_INFO(dev_priv->dev)->gen < 6) {

		intel_gtt_chipset_flush();

	} else {

		I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);

		POSTING_READ(GFX_FLSH_CNTL_GEN6);

	}

}



void i915_gem_suspend_gtt_mappings(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1326,6 +1336,8 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev) 
				       dev_priv->gtt.base.start,

				       dev_priv->gtt.base.total,

				       true);



	i915_ggtt_flush(dev_priv);

}



void i915_gem_restore_gtt_mappings(struct drm_device *dev)
@@ -1378,7 +1390,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev) 
		gen6_write_pdes(container_of(vm, struct i915_hw_ppgtt, base));

	}



	i915_gem_chipset_flush(dev);

	i915_ggtt_flush(dev_priv);

}



int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj)

drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

+2 −1
Original line number Diff line number Diff line
@@ -1763,9 +1763,10 @@ nv50_disp_intr_unk40_0_tmds(struct nv50_disp_priv *priv, struct dcb_output *outp 
	const int   or = ffs(outp->or) - 1;

	const u32 loff = (or * 0x800) + (link * 0x80);

	const u16 mask = (outp->sorconf.link << 6) | outp->or;

	struct dcb_output match;

	u8  ver, hdr;



	if (dcb_outp_match(bios, DCB_OUTPUT_DP, mask, &ver, &hdr, outp))

	if (dcb_outp_match(bios, DCB_OUTPUT_DP, mask, &ver, &hdr, &match))

		nv_mask(priv, 0x61c10c + loff, 0x00000001, 0x00000000);

}

drivers/gpu/drm/nouveau/nouveau_chan.c

+6 −1
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) 
	struct nouveau_software_chan *swch;

	struct nv_dma_v0 args = {};

	int ret, i;

	bool save;



	nvif_object_map(chan->object);
@@ -386,7 +387,11 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) 
	}



	/* initialise synchronisation */

	return nouveau_fence(chan->drm)->context_new(chan);

	save = cli->base.super;

	cli->base.super = true; /* hack until fencenv50 fixed */

	ret = nouveau_fence(chan->drm)->context_new(chan);

	cli->base.super = save;

	return ret;

}



int

drivers/gpu/drm/nouveau/nouveau_display.c

+11 −12
Original line number Diff line number Diff line
@@ -550,14 +550,12 @@ nouveau_display_destroy(struct drm_device *dev) 
}



int

nouveau_display_suspend(struct drm_device *dev)

nouveau_display_suspend(struct drm_device *dev, bool runtime)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct drm_crtc *crtc;



	nouveau_display_fini(dev);



	NV_INFO(drm, "unpinning framebuffer(s)...\n");

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		struct nouveau_framebuffer *nouveau_fb;
@@ -579,12 +577,13 @@ nouveau_display_suspend(struct drm_device *dev) 
}



void

nouveau_display_repin(struct drm_device *dev)

nouveau_display_resume(struct drm_device *dev, bool runtime)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct drm_crtc *crtc;

	int ret;

	int ret, head;



	/* re-pin fb/cursors */

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		struct nouveau_framebuffer *nouveau_fb;
@@ -606,13 +605,6 @@ nouveau_display_repin(struct drm_device *dev) 
		if (ret)

			NV_ERROR(drm, "Could not pin/map cursor.\n");

	}

}



void

nouveau_display_resume(struct drm_device *dev)

{

	struct drm_crtc *crtc;

	int head;



	nouveau_display_init(dev);
@@ -627,6 +619,13 @@ nouveau_display_resume(struct drm_device *dev) 
	for (head = 0; head < dev->mode_config.num_crtc; head++)

		drm_vblank_on(dev, head);



	/* This should ensure we don't hit a locking problem when someone

	 * wakes us up via a connector.  We should never go into suspend

	 * while the display is on anyways.

	 */

	if (runtime)

		return;



	drm_helper_resume_force_mode(dev);



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

drivers/gpu/drm/nouveau/nouveau_display.h

+2 −3
Original line number Diff line number Diff line
@@ -63,9 +63,8 @@ int nouveau_display_create(struct drm_device *dev); 
void nouveau_display_destroy(struct drm_device *dev);

int  nouveau_display_init(struct drm_device *dev);

void nouveau_display_fini(struct drm_device *dev);

int  nouveau_display_suspend(struct drm_device *dev);

void nouveau_display_repin(struct drm_device *dev);

void nouveau_display_resume(struct drm_device *dev);

int  nouveau_display_suspend(struct drm_device *dev, bool runtime);

void nouveau_display_resume(struct drm_device *dev, bool runtime);

int  nouveau_display_vblank_enable(struct drm_device *, int);

void nouveau_display_vblank_disable(struct drm_device *, int);

int  nouveau_display_scanoutpos(struct drm_device *, int, unsigned int,