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

Commit a3d67d23 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: PPGTT vfuncs should take a ppgtt argument 



Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a45d0f6a

drivers/gpu/drm/i915/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -671,7 +671,8 @@ struct i915_hw_ppgtt { 
		dma_addr_t *pt_dma_addr;

		dma_addr_t *gen8_pt_dma_addr[4];

	};

	int (*enable)(struct drm_device *dev);



	int (*enable)(struct i915_hw_ppgtt *ppgtt);

};



struct i915_ctx_hang_stats {

drivers/gpu/drm/i915/i915_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -4404,6 +4404,7 @@ int 
i915_gem_init_hw(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct i915_hw_ppgtt *ppgtt;

	int ret, i;



	if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())
@@ -4446,7 +4447,8 @@ i915_gem_init_hw(struct drm_device *dev) 
	}



	if (dev_priv->mm.aliasing_ppgtt) {

		ret = dev_priv->mm.aliasing_ppgtt->enable(dev);

		ppgtt = dev_priv->mm.aliasing_ppgtt;

		ret = ppgtt->enable(ppgtt);

		if (ret) {

			i915_gem_cleanup_aliasing_ppgtt(dev);

			DRM_INFO("PPGTT enable failed. This is not fatal, but unexpected\n");

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −4
Original line number Diff line number Diff line
@@ -230,11 +230,11 @@ static int gen8_write_pdp(struct intel_ring_buffer *ring, unsigned entry, 
	return 0;

}



static int gen8_ppgtt_enable(struct drm_device *dev)

static int gen8_ppgtt_enable(struct i915_hw_ppgtt *ppgtt)

{

	struct drm_device *dev = ppgtt->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring;

	struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;

	int i, j, ret;



	/* bit of a hack to find the actual last used pd */
@@ -491,12 +491,12 @@ static void gen6_write_pdes(struct i915_hw_ppgtt *ppgtt) 
	readl(pd_addr);

}



static int gen6_ppgtt_enable(struct drm_device *dev)

static int gen6_ppgtt_enable(struct i915_hw_ppgtt *ppgtt)

{

	struct drm_device *dev = ppgtt->base.dev;

	drm_i915_private_t *dev_priv = dev->dev_private;

	uint32_t pd_offset;

	struct intel_ring_buffer *ring;

	struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;

	int i;



	BUG_ON(ppgtt->pd_offset & 0x3f);