Commit f3c58cee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'for-linux-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 

Daniel writes:
A few intel fixes for smaller issues and one revert for an sdv hack which
we've wanted to kill anyway. Plus two drm patches included for your
convenience, both regression fixers for mine own screw-ups.

+ both fixes for stolen mem handling.

* 'for-linux-next' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: clear the stolen fb before resuming
  Revert "drm/i915: Calculate correct stolen size for GEN7+"
  drm/i915: hsw: fix link training for eDP on port-A
  Revert "drm/i915: revert eDP bpp clamping code changes"
  drm: don't check modeset locks in panic handler
  drm/i915: Fix pipe enabled mask for pipe C in WM calculations
  drm/mm: fix dump table BUG
  drm/i915: Always normalize return timeout for wait_timeout_ioctl
parents 307b9c02 1ffc5289

drivers/gpu/drm/drm_crtc.c

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev) 
{

	struct drm_crtc *crtc;



	/* Locking is currently fubar in the panic handler. */

	if (oops_in_progress)

		return;



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

		WARN_ON(!mutex_is_locked(&crtc->mutex));

drivers/gpu/drm/drm_mm.c

+18 −16
Original line number Diff line number Diff line
@@ -755,33 +755,35 @@ void drm_mm_debug_table(struct drm_mm *mm, const char *prefix) 
EXPORT_SYMBOL(drm_mm_debug_table);



#if defined(CONFIG_DEBUG_FS)

int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)

static unsigned long drm_mm_dump_hole(struct seq_file *m, struct drm_mm_node *entry)

{

	struct drm_mm_node *entry;

	unsigned long total_used = 0, total_free = 0, total = 0;

	unsigned long hole_start, hole_end, hole_size;



	hole_start = drm_mm_hole_node_start(&mm->head_node);

	hole_end = drm_mm_hole_node_end(&mm->head_node);

	if (entry->hole_follows) {

		hole_start = drm_mm_hole_node_start(entry);

		hole_end = drm_mm_hole_node_end(entry);

		hole_size = hole_end - hole_start;

	if (hole_size)

		seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: free\n",

				hole_start, hole_end, hole_size);

	total_free += hole_size;

		return hole_size;

	}



	return 0;

}



int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)

{

	struct drm_mm_node *entry;

	unsigned long total_used = 0, total_free = 0, total = 0;



	total_free += drm_mm_dump_hole(m, &mm->head_node);



	drm_mm_for_each_node(entry, mm) {

		seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: used\n",

				entry->start, entry->start + entry->size,

				entry->size);

		total_used += entry->size;

		if (entry->hole_follows) {

			hole_start = drm_mm_hole_node_start(entry);

			hole_end = drm_mm_hole_node_end(entry);

			hole_size = hole_end - hole_start;

			seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: free\n",

					hole_start, hole_end, hole_size);

			total_free += hole_size;

		}

		total_free += drm_mm_dump_hole(m, entry);

	}

	total = total_free + total_used;

drivers/gpu/drm/i915/i915_gem.c

+3 −5
Original line number Diff line number Diff line
@@ -1045,6 +1045,8 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno, 
	if (timeout) {

		struct timespec sleep_time = timespec_sub(now, before);

		*timeout = timespec_sub(*timeout, sleep_time);

		if (!timespec_valid(timeout)) /* i.e. negative time remains */

			set_normalized_timespec(timeout, 0, 0);

	}



	switch (end) {
@@ -1053,8 +1055,6 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno, 
	case -ERESTARTSYS: /* Signal */

		return (int)end;

	case 0: /* Timeout */

		if (timeout)

			set_normalized_timespec(timeout, 0, 0);

		return -ETIME;

	default: /* Completed */

		WARN_ON(end < 0); /* We're not aware of other errors */
@@ -2377,10 +2377,8 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	mutex_unlock(&dev->struct_mutex);



	ret = __wait_seqno(ring, seqno, reset_counter, true, timeout);

	if (timeout) {

		WARN_ON(!timespec_valid(timeout));

	if (timeout)

		args->timeout_ns = timespec_to_ns(timeout);

	}

	return ret;



out:

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −14
Original line number Diff line number Diff line
@@ -709,15 +709,6 @@ static inline size_t gen6_get_stolen_size(u16 snb_gmch_ctl) 
	return snb_gmch_ctl << 25; /* 32 MB units */

}



static inline size_t gen7_get_stolen_size(u16 snb_gmch_ctl)

{

	static const int stolen_decoder[] = {

		0, 0, 0, 0, 0, 32, 48, 64, 128, 256, 96, 160, 224, 352};

	snb_gmch_ctl >>= IVB_GMCH_GMS_SHIFT;

	snb_gmch_ctl &= IVB_GMCH_GMS_MASK;

	return stolen_decoder[snb_gmch_ctl] << 20;

}



static int gen6_gmch_probe(struct drm_device *dev,

			   size_t *gtt_total,

			   size_t *stolen,
@@ -747,11 +738,7 @@ static int gen6_gmch_probe(struct drm_device *dev, 
	pci_read_config_word(dev->pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);

	gtt_size = gen6_get_total_gtt_size(snb_gmch_ctl);



	if (IS_GEN7(dev) && !IS_VALLEYVIEW(dev))

		*stolen = gen7_get_stolen_size(snb_gmch_ctl);

	else

	*stolen = gen6_get_stolen_size(snb_gmch_ctl);



	*gtt_total = (gtt_size / sizeof(gen6_gtt_pte_t)) << PAGE_SHIFT;



	/* For Modern GENs the PTEs and register space are split in the BAR */

drivers/gpu/drm/i915/i915_reg.h

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
#define    SNB_GMCH_GGMS_MASK	0x3

#define    SNB_GMCH_GMS_SHIFT   3 /* Graphics Mode Select */

#define    SNB_GMCH_GMS_MASK    0x1f

#define    IVB_GMCH_GMS_SHIFT   4

#define    IVB_GMCH_GMS_MASK    0xf





/* PCI config space */

CRA Git | Maintained and supported by SUSTech CRA and CCSE