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

Commit bee4a186 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915,agp/intel: Do not clear stolen entries 



We can only utilize the stolen portion of the GTT if we are in sole
charge of the hardware. This is only true if using GEM and KMS,
otherwise VESA continues to access stolen memory.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Reported-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Tested-by: default avatarJiri Olsa <jolsa@redhat.com>
Tested-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 934f992c

drivers/char/agp/intel-gtt.c

+9 −10
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static struct _intel_private { 
	phys_addr_t gma_bus_addr;

	u32 PGETBL_save;

	u32 __iomem *gtt;		/* I915G */

	bool clear_fake_agp; /* on first access via agp, fill with scratch */

	int num_dcache_entries;

	union {

		void __iomem *i9xx_flush_page;
@@ -869,21 +870,12 @@ static int intel_fake_agp_free_gatt_table(struct agp_bridge_data *bridge) 


static int intel_fake_agp_configure(void)

{

	int i;



	if (!intel_enable_gtt())

	    return -EIO;



	intel_private.clear_fake_agp = true;

	agp_bridge->gart_bus_addr = intel_private.gma_bus_addr;



	for (i = 0; i < intel_private.base.gtt_total_entries; i++) {

		intel_private.driver->write_entry(intel_private.scratch_page_dma,

						  i, 0);

	}

	readl(intel_private.gtt+i-1);	/* PCI Posting. */



	global_cache_flush();



	return 0;

}
@@ -945,6 +937,13 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem, 
{

	int ret = -EINVAL;



	if (intel_private.clear_fake_agp) {

		int start = intel_private.base.stolen_size / PAGE_SIZE;

		int end = intel_private.base.gtt_mappable_entries;

		intel_gtt_clear_range(start, end - start);

		intel_private.clear_fake_agp = false;

	}



	if (INTEL_GTT_GEN == 1 && type == AGP_DCACHE_MEMORY)

		return i810_insert_dcache_entries(mem, pg_start, type);

drivers/gpu/drm/i915/i915_drv.h

+4 −1
Original line number Diff line number Diff line
@@ -543,8 +543,11 @@ typedef struct drm_i915_private { 
		/** List of all objects in gtt_space. Used to restore gtt

		 * mappings on resume */

		struct list_head gtt_list;

		/** End of mappable part of GTT */



		/** Usable portion of the GTT for GEM */

		unsigned long gtt_start;

		unsigned long gtt_mappable_end;

		unsigned long gtt_end;



		struct io_mapping *gtt_mapping;

		int gtt_mtrr;

drivers/gpu/drm/i915/i915_gem.c

+7 −3
Original line number Diff line number Diff line
@@ -140,12 +140,16 @@ void i915_gem_do_init(struct drm_device *dev, 
{

	drm_i915_private_t *dev_priv = dev->dev_private;



	drm_mm_init(&dev_priv->mm.gtt_space, start,

		    end - start);

	drm_mm_init(&dev_priv->mm.gtt_space, start, end - start);



	dev_priv->mm.gtt_start = start;

	dev_priv->mm.gtt_mappable_end = mappable_end;

	dev_priv->mm.gtt_end = end;

	dev_priv->mm.gtt_total = end - start;

	dev_priv->mm.mappable_gtt_total = min(end, mappable_end) - start;

	dev_priv->mm.gtt_mappable_end = mappable_end;



	/* Take over this portion of the GTT */

	intel_gtt_clear_range(start / PAGE_SIZE, (end-start) / PAGE_SIZE);

}



int

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj;



	/* First fill our portion of the GTT with scratch pages */

	intel_gtt_clear_range(dev_priv->mm.gtt_start / PAGE_SIZE,

			      (dev_priv->mm.gtt_end - dev_priv->mm.gtt_start) / PAGE_SIZE);



	list_for_each_entry(obj, &dev_priv->mm.gtt_list, gtt_list) {

		i915_gem_clflush_object(obj);