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

Commit f07823e1 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:
 "Ben was on holidays for a week so a few nouveau regression fixes
  backed up, but they all seem necessary.

  Otherwise one i915 and one gma500 fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  gma500: Fix SDVO turning off randomly
  drm/nv04/disp: fix framebuffer pin refcounting
  drm/nouveau/mc: fix race condition between constructor and request_irq()
  drm/nouveau: fix reclocking on nv40
  drm/nouveau/ltcg: fix allocating memory as free
  drm/nouveau/ltcg: fix ltcg memory initialization after suspend
  drm/nouveau/fb: fix null derefs in nv49 and nv4e init
  drm/i915: Invalidate TLBs for the rings after a reset
parents 41a00f79 4dd17ee9

drivers/gpu/drm/gma500/psb_intel_sdvo.c

+2 −1
Original line number Diff line number Diff line
@@ -500,7 +500,8 @@ static bool psb_intel_sdvo_read_response(struct psb_intel_sdvo *psb_intel_sdvo, 
				  &status))

		goto log_fail;



	while (status == SDVO_CMD_STATUS_PENDING && retry--) {

	while ((status == SDVO_CMD_STATUS_PENDING ||

		status == SDVO_CMD_STATUS_TARGET_NOT_SPECIFIED) && retry--) {

		udelay(15);

		if (!psb_intel_sdvo_read_byte(psb_intel_sdvo,

					  SDVO_I2C_CMD_STATUS,

drivers/gpu/drm/i915/i915_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -752,6 +752,8 @@ 
					will not assert AGPBUSY# and will only

					be delivered when out of C3. */

#define   INSTPM_FORCE_ORDERING				(1<<7) /* GEN6+ */

#define   INSTPM_TLB_INVALIDATE	(1<<9)

#define   INSTPM_SYNC_FLUSH	(1<<5)

#define ACTHD	        0x020c8

#define FW_BLC		0x020d8

#define FW_BLC2		0x020dc

drivers/gpu/drm/i915/intel_ringbuffer.c

+12 −0
Original line number Diff line number Diff line
@@ -968,6 +968,18 @@ void intel_ring_setup_status_page(struct intel_ring_buffer *ring) 


	I915_WRITE(mmio, (u32)ring->status_page.gfx_addr);

	POSTING_READ(mmio);



	/* Flush the TLB for this page */

	if (INTEL_INFO(dev)->gen >= 6) {

		u32 reg = RING_INSTPM(ring->mmio_base);

		I915_WRITE(reg,

			   _MASKED_BIT_ENABLE(INSTPM_TLB_INVALIDATE |

					      INSTPM_SYNC_FLUSH));

		if (wait_for((I915_READ(reg) & INSTPM_SYNC_FLUSH) == 0,

			     1000))

			DRM_ERROR("%s: wait for SyncFlush to complete for TLB invalidation timed out\n",

				  ring->name);

	}

}



static int

drivers/gpu/drm/nouveau/core/core/mm.c

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ nouveau_mm_head(struct nouveau_mm *mm, u8 type, u32 size_max, u32 size_min, 
	u32 splitoff;

	u32 s, e;



	BUG_ON(!type);



	list_for_each_entry(this, &mm->free, fl_entry) {

		e = this->offset + this->length;

		s = this->offset;
@@ -162,6 +164,8 @@ nouveau_mm_tail(struct nouveau_mm *mm, u8 type, u32 size_max, u32 size_min, 
	struct nouveau_mm_node *prev, *this, *next;

	u32 mask = align - 1;



	BUG_ON(!type);



	list_for_each_entry_reverse(this, &mm->free, fl_entry) {

		u32 e = this->offset + this->length;

		u32 s = this->offset;

drivers/gpu/drm/nouveau/core/include/subdev/mc.h

+4 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ nouveau_mc(void *obj) 
	return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_MC];

}



#define nouveau_mc_create(p,e,o,d)                                             \

	nouveau_mc_create_((p), (e), (o), sizeof(**d), (void **)d)

#define nouveau_mc_create(p,e,o,m,d)                                           \

	nouveau_mc_create_((p), (e), (o), (m), sizeof(**d), (void **)d)

#define nouveau_mc_destroy(p) ({                                               \

	struct nouveau_mc *pmc = (p); _nouveau_mc_dtor(nv_object(pmc));        \

})
@@ -33,7 +33,8 @@ nouveau_mc(void *obj) 
})



int  nouveau_mc_create_(struct nouveau_object *, struct nouveau_object *,

			struct nouveau_oclass *, int, void **);

			struct nouveau_oclass *, const struct nouveau_mc_intr *,

			int, void **);

void _nouveau_mc_dtor(struct nouveau_object *);

int  _nouveau_mc_init(struct nouveau_object *);

int  _nouveau_mc_fini(struct nouveau_object *, bool);