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

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

Merge tag 'drm-intel-next-2013-07-12' of... 

Merge tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

 Highlights:
- follow-up refactoring after the shared dpll rework that landed in 3.11
- oddball prep cleanups from Ben for ppgtt
- encoder->get_config state tracking infrastructure from Jesse
- used by the experimental fastboot support from Jesse (disabled by
  default)
- make the error state file official and add it to our sysfs interface
  (Mika)
- drm_mm prep changes from Ben, prepares to embedd the drm_mm_node (which
  will be used by the vma rework later on)
- interrupt handling rework, follow up cleanups to the VECS enabling, hpd
  storm handling and fifo underrun reporting.
- Big pile of smaller cleanups, code improvements and related stuff.

* tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm-intel: (72 commits)
  drm/i915: clear DPLL reg when disabling i9xx dplls
  drm/i915: Fix up cpt pixel multiplier enable sequence
  drm/i915: clean up vlv ->pre_pll_enable and pll enable sequence
  drm/i915: move error state to own compilation unit
  drm/i915: Don't attempt to read an unitialized stack value
  drm/i915: Use for_each_pipe() when possible
  drm/i915: don't enable PM_VEBOX_CS_ERROR_INTERRUPT
  drm/i915: unify ring irq refcounts (again)
  drm/i915: kill dev_priv->rps.lock
  drm/i915: queue work outside spinlock in hsw_pm_irq_handler
  drm/i915: streamline hsw_pm_irq_handler
  drm/i915: irq handlers don't need interrupt-safe spinlocks
  drm/i915: kill lpt pch transcoder->crtc mapping code for fifo underruns
  drm/i915: improve GEN7_ERR_INT clearing for fifo underrun reporting
  drm/i915: improve SERR_INT clearing for fifo underrun reporting
  drm/i915: extract ibx_display_interrupt_update
  drm/i915: remove unused members from drm_i915_private
  drm/i915: don't frob mm.suspended when not using ums
  drm/i915: Fix VLV DP RBR/HDMI/DAC PLL LPF coefficients
  drm/i915: WARN if the bios reserved range is bigger than stolen size
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
parents ee114b97 50b44a44

drivers/gpu/drm/drm_mm.c

+13 −18
Original line number Diff line number Diff line
@@ -147,33 +147,27 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node, 
	}

}



struct drm_mm_node *drm_mm_create_block(struct drm_mm *mm,

					unsigned long start,

					unsigned long size,

					bool atomic)

int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node)

{

	struct drm_mm_node *hole, *node;

	unsigned long end = start + size;

	struct drm_mm_node *hole;

	unsigned long end = node->start + node->size;

	unsigned long hole_start;

	unsigned long hole_end;



	BUG_ON(node == NULL);



	/* Find the relevant hole to add our node to */

	drm_mm_for_each_hole(hole, mm, hole_start, hole_end) {

		if (hole_start > start || hole_end < end)

		if (hole_start > node->start || hole_end < end)

			continue;



		node = drm_mm_kmalloc(mm, atomic);

		if (unlikely(node == NULL))

			return NULL;



		node->start = start;

		node->size = size;

		node->mm = mm;

		node->allocated = 1;



		INIT_LIST_HEAD(&node->hole_stack);

		list_add(&node->node_list, &hole->node_list);



		if (start == hole_start) {

		if (node->start == hole_start) {

			hole->hole_follows = 0;

			list_del_init(&hole->hole_stack);

		}
@@ -184,13 +178,14 @@ struct drm_mm_node *drm_mm_create_block(struct drm_mm *mm, 
			node->hole_follows = 1;

		}



		return node;

		return 0;

	}



	WARN(1, "no hole found for block 0x%lx + 0x%lx\n", start, size);

	return NULL;

	WARN(1, "no hole found for node 0x%lx + 0x%lx\n",

	     node->start, node->size);

	return -ENOSPC;

}

EXPORT_SYMBOL(drm_mm_create_block);

EXPORT_SYMBOL(drm_mm_reserve_node);



struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node,

					     unsigned long size,

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
ccflags-y := -Iinclude/drm

i915-y := i915_drv.o i915_dma.o i915_irq.o \

	  i915_debugfs.o \

	  i915_gpu_error.o \

          i915_suspend.o \

	  i915_gem.o \

	  i915_gem_context.o \