drm/i915: restore gtt on resume in the drm instead of in intel-gtt.ko (76aaf220) · Commits · 戴 / test

drivers/char/agp/intel-agp.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -828,14 +828,9 @@ static void __devexit agp_intel_remove(struct pci_dev *pdev)
		static int agp_intel_resume(struct pci_dev *pdev)
		{
		struct agp_bridge_data *bridge = pci_get_drvdata(pdev);
		int ret_val;

		bridge->driver->configure();

		ret_val = agp_rebind_memory();
		if (ret_val != 0)
		return ret_val;

		return 0;
		}
		#endif

drivers/gpu/drm/i915/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \
		i915_suspend.o \
		i915_gem.o \
		i915_gem_debug.o \
		i915_gem_gtt.o \
		i915_gem_evict.o \
		i915_gem_tiling.o \
		i915_trace_points.o \

drivers/gpu/drm/i915/i915_drv.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,7 @@ static int i915_drm_thaw(struct drm_device *dev)
		/* KMS EnterVT equivalent */
		if (drm_core_check_feature(dev, DRIVER_MODESET)) {
		mutex_lock(&dev->struct_mutex);
		i915_gem_restore_gtt_mappings(dev);
		dev_priv->mm.suspended = 0;

		error = i915_gem_init_ringbuffer(dev);

drivers/gpu/drm/i915/i915_drv.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1141,6 +1141,9 @@ void i915_gem_detach_phys_object(struct drm_device *dev,
		void i915_gem_free_all_phys_object(struct drm_device *dev);
		void i915_gem_release(struct drm_device * dev, struct drm_file *file_priv);

		/* i915_gem_gtt.c */
		void i915_gem_restore_gtt_mappings(struct drm_device *dev);

		/* i915_gem_evict.c */
		int i915_gem_evict_something(struct drm_device *dev, int min_size,
		unsigned alignment, bool mappable);

drivers/gpu/drm/i915/i915_gem_gtt.c

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright © 2010 Daniel Vetter
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice (including the next
		* paragraph) shall be included in all copies or substantial portions of the
		* Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
		* IN THE SOFTWARE.
		*
		*/

		#include "drmP.h"
		#include "drm.h"
		#include "i915_drm.h"
		#include "i915_drv.h"
		#include "i915_trace.h"
		#include "intel_drv.h"

		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_priv;
		int ret;

		list_for_each_entry(obj_priv,
		&dev_priv->mm.gtt_list,
		gtt_list) {
		/* Hack to force agp to reinsert buffer object. */
		obj_priv->agp_mem->is_bound = false;
		ret = agp_bind_memory(obj_priv->agp_mem, obj_priv->gtt_space->start / PAGE_SIZE);
		BUG_ON(ret != 0);
		}

		/* Be paranoid and flush the chipset cache. */
		intel_gtt_chipset_flush();
		}

Admin message