public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: PPGTT vfuncs should take a ppgtt argument

Browse source 
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ben Widawsky 2013-12-06 14:11:06 -08:00 • committed by Daniel Vetter
parent a45d0f6a7f
commit a3d67d2396
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/i915/i915_drv.h
View file

@ -671,7 +671,8 @@ struct i915_hw_ppgtt {
dma_addr_t *pt_dma_addr; dma_addr_t *pt_dma_addr;
dma_addr_t *gen8_pt_dma_addr[4]; 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 { struct i915_ctx_hang_stats {

4
drivers/gpu/drm/i915/i915_gem.c
View file

@ -4404,6 +4404,7 @@ int
i915_gem_init_hw(struct drm_device *dev) i915_gem_init_hw(struct drm_device *dev)
{ {
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
struct i915_hw_ppgtt *ppgtt;
int ret, i; int ret, i;
if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt()) 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) { 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) { if (ret) {
i915_gem_cleanup_aliasing_ppgtt(dev); i915_gem_cleanup_aliasing_ppgtt(dev);
DRM_INFO("PPGTT enable failed. This is not fatal, but unexpected\n"); DRM_INFO("PPGTT enable failed. This is not fatal, but unexpected\n");

8
drivers/gpu/drm/i915/i915_gem_gtt.c
View file

@ -230,11 +230,11 @@ static int gen8_write_pdp(struct intel_ring_buffer *ring, unsigned entry,
return 0; 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 drm_i915_private *dev_priv = dev->dev_private;
struct intel_ring_buffer *ring; struct intel_ring_buffer *ring;
struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
int i, j, ret; int i, j, ret;
/* bit of a hack to find the actual last used pd */ /* 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); 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; drm_i915_private_t *dev_priv = dev->dev_private;
uint32_t pd_offset; uint32_t pd_offset;
struct intel_ring_buffer *ring; struct intel_ring_buffer *ring;
struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
int i; int i;
BUG_ON(ppgtt->pd_offset & 0x3f); BUG_ON(ppgtt->pd_offset & 0x3f);