Commit 275a991c authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: dev_priv cleanup in i915_gem_gtt.c 



Started with removing INTEL_INFO(dev) and cascaded into a quite
big trickle of function prototype changes. Still, I think it is
for the better.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 4362f4f6

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ static int i915_drm_suspend(struct drm_device *dev) 


	intel_suspend_hw(dev_priv);



	i915_gem_suspend_gtt_mappings(dev);

	i915_gem_suspend_gtt_mappings(dev_priv);



	i915_save_state(dev);

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -4230,7 +4230,7 @@ void i915_gem_resume(struct drm_device *dev) 
	WARN_ON(dev_priv->gt.awake);



	mutex_lock(&dev->struct_mutex);

	i915_gem_restore_gtt_mappings(dev);

	i915_gem_restore_gtt_mappings(dev_priv);



	/* As we didn't flush the kernel context before suspend, we cannot

	 * guarantee that the context image is complete. So let's just reset

drivers/gpu/drm/i915/i915_gem_gtt.c

+125 −123

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_gem_gtt.h

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ typedef uint64_t gen8_ppgtt_pml4e_t; 
#define GEN8_LEGACY_PDPES		4

#define GEN8_PTES			I915_PTES(sizeof(gen8_pte_t))



#define I915_PDPES_PER_PDP(dev) (USES_FULL_48BIT_PPGTT(dev) ?\

#define I915_PDPES_PER_PDP(dev_priv)	(USES_FULL_48BIT_PPGTT(dev_priv) ?\

					GEN8_PML4ES_PER_PML4 : GEN8_LEGACY_PDPES)



#define PPAT_UNCACHED_INDEX		(_PAGE_PWT | _PAGE_PCD)
@@ -512,8 +512,8 @@ static inline void i915_ppgtt_put(struct i915_hw_ppgtt *ppgtt) 
}



void i915_check_and_clear_faults(struct drm_i915_private *dev_priv);

void i915_gem_suspend_gtt_mappings(struct drm_device *dev);

void i915_gem_restore_gtt_mappings(struct drm_device *dev);

void i915_gem_suspend_gtt_mappings(struct drm_i915_private *dev_priv);

void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv);



int __must_check i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,

					    struct sg_table *pages);