Commit 0b5e8db6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'anholt/drm-intel-next' into drm-linus 

Pull more Intel changes in, especially one to init the GTT properly
parents 7b0a9e83 4f8d619c

drivers/char/agp/intel-agp.c

+6 −1
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static struct _intel_private { 
	 * popup and for the GTT.

	 */

	int gtt_entries;			/* i830+ */

	int gtt_total_size;

	union {

		void __iomem *i9xx_flush_page;

		void *i8xx_flush_page;
@@ -1153,7 +1154,7 @@ static int intel_i915_configure(void) 
	readl(intel_private.registers+I810_PGETBL_CTL);	/* PCI Posting. */



	if (agp_bridge->driver->needs_scratch_page) {

		for (i = intel_private.gtt_entries; i < current_size->num_entries; i++) {

		for (i = intel_private.gtt_entries; i < intel_private.gtt_total_size; i++) {

			writel(agp_bridge->scratch_page, intel_private.gtt+i);

		}

		readl(intel_private.gtt+i-1);	/* PCI Posting. */
@@ -1308,6 +1309,8 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) 
	if (!intel_private.gtt)

		return -ENOMEM;



	intel_private.gtt_total_size = gtt_map_size / 4;



	temp &= 0xfff80000;



	intel_private.registers = ioremap(temp, 128 * 4096);
@@ -1395,6 +1398,8 @@ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge) 
	if (!intel_private.gtt)

		return -ENOMEM;



	intel_private.gtt_total_size = gtt_size / 4;



	intel_private.registers = ioremap(temp, 128 * 4096);

	if (!intel_private.registers) {

		iounmap(intel_private.gtt);

drivers/gpu/drm/i915/i915_debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -97,13 +97,14 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) 
	{

		struct drm_gem_object *obj = obj_priv->obj;



		seq_printf(m, "    %p: %s %8zd %08x %08x %d %s",

		seq_printf(m, "    %p: %s %8zd %08x %08x %d%s%s",

			   obj,

			   get_pin_flag(obj_priv),

			   obj->size,

			   obj->read_domains, obj->write_domain,

			   obj_priv->last_rendering_seqno,

			   obj_priv->dirty ? "dirty" : "");

			   obj_priv->dirty ? " dirty" : "",

			   obj_priv->madv == I915_MADV_DONTNEED ? " purgeable" : "");



		if (obj->name)

			seq_printf(m, " (name: %d)", obj->name);

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -383,8 +383,6 @@ typedef struct drm_i915_private { 
	u32 saveFDI_RXA_IMR;

	u32 saveFDI_RXB_IMR;

	u32 saveCACHE_MODE_0;

	u32 saveD_STATE;

	u32 saveDSPCLK_GATE_D;

	u32 saveMI_ARB_STATE;

	u32 saveSWF0[16];

	u32 saveSWF1[16];

drivers/gpu/drm/i915/i915_gem.c

+1 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj) 
	list->hash.key = list->file_offset_node->start;

	if (drm_ht_insert_item(&mm->offset_hash, &list->hash)) {

		DRM_ERROR("failed to add to map hash\n");

		ret = -ENOMEM;

		goto out_free_mm;

	}

drivers/gpu/drm/i915/i915_irq.c

+0 −1
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ static void i915_handle_error(struct drm_device *dev, bool wedged) 
		/*

		 * Wakeup waiting processes so they don't hang

		 */

		printk("i915: Waking up sleeping processes\n");

		DRM_WAKEUP(&dev_priv->irq_queue);

	}