public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Remove context pointer from ppgtt struct
@ 2014-07-30 11:25 Michel Thierry
  2014-07-30 11:59 ` Daniel Vetter
  2014-07-30 14:21 ` Michel Thierry
  0 siblings, 2 replies; 6+ messages in thread
From: Michel Thierry @ 2014-07-30 11:25 UTC (permalink / raw)
  To: intel-gfx; +Cc: Daniel Vetter

After new vma/ppgtt lifetime rules, the ppgtt can outlive the context
it was created for.

- Renamed create_vm_for_ctx to i915_ppgtt_create as ctx/ppgtt are no
longer referenced.
- Updated per_file_stats to cope with this change.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c     | 6 +++---
 drivers/gpu/drm/i915/i915_gem_context.c | 5 ++---
 drivers/gpu/drm/i915/i915_gem_gtt.h     | 2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 96612a5..35c0f09 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -322,7 +322,7 @@ static int per_file_stats(int id, void *ptr, void *data)
 
 	if (USES_FULL_PPGTT(obj->base.dev)) {
 		list_for_each_entry(vma, &obj->vma_list, vma_link) {
-			struct i915_hw_ppgtt *ppgtt;
+			struct intel_context *ctx;
 
 			if (!drm_mm_node_allocated(&vma->node))
 				continue;
@@ -332,8 +332,8 @@ static int per_file_stats(int id, void *ptr, void *data)
 				continue;
 			}
 
-			ppgtt = container_of(vma->vm, struct i915_hw_ppgtt, base);
-			if (ppgtt->ctx && ppgtt->ctx->file_priv != stats->file_priv)
+			ctx = container_of(vma->vm, struct intel_context, vm);
+			if (ctx && ctx->file_priv != stats->file_priv)
 				continue;
 
 			if (obj->ring) /* XXX per-vma statistic */
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 3e7cb50..43da325 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -210,7 +210,7 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size)
 }
 
 static struct i915_hw_ppgtt *
-create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
+i915_ppgtt_create(struct drm_device *dev)
 {
 	struct i915_hw_ppgtt *ppgtt;
 	int ret;
@@ -225,7 +225,6 @@ create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
 		return ERR_PTR(ret);
 	}
 
-	ppgtt->ctx = ctx;
 	return ppgtt;
 }
 
@@ -315,7 +314,7 @@ i915_gem_create_context(struct drm_device *dev,
 	}
 
 	if (create_vm) {
-		struct i915_hw_ppgtt *ppgtt = create_vm_for_ctx(dev, ctx);
+		struct i915_hw_ppgtt *ppgtt = i915_ppgtt_create(dev);
 
 		if (IS_ERR_OR_NULL(ppgtt)) {
 			DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n",
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 8d6f7c1..dd70b0f 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -258,8 +258,6 @@ struct i915_hw_ppgtt {
 		dma_addr_t *gen8_pt_dma_addr[4];
 	};
 
-	struct intel_context *ctx;
-
 	int (*enable)(struct i915_hw_ppgtt *ppgtt);
 	int (*switch_mm)(struct i915_hw_ppgtt *ppgtt,
 			 struct intel_engine_cs *ring,
-- 
2.0.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Remove context pointer from ppgtt struct
  2014-07-30 11:25 [PATCH] drm/i915: Remove context pointer from ppgtt struct Michel Thierry
@ 2014-07-30 11:59 ` Daniel Vetter
  2014-07-30 14:20   ` Thierry, Michel
  2014-07-30 14:21 ` Michel Thierry
  1 sibling, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2014-07-30 11:59 UTC (permalink / raw)
  To: Michel Thierry; +Cc: Daniel Vetter, intel-gfx

On Wed, Jul 30, 2014 at 12:25:20PM +0100, Michel Thierry wrote:
> After new vma/ppgtt lifetime rules, the ppgtt can outlive the context
> it was created for.
> 
> - Renamed create_vm_for_ctx to i915_ppgtt_create as ctx/ppgtt are no
> longer referenced.
> - Updated per_file_stats to cope with this change.
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c     | 6 +++---
>  drivers/gpu/drm/i915/i915_gem_context.c | 5 ++---
>  drivers/gpu/drm/i915/i915_gem_gtt.h     | 2 --
>  3 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 96612a5..35c0f09 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -322,7 +322,7 @@ static int per_file_stats(int id, void *ptr, void *data)
>  
>  	if (USES_FULL_PPGTT(obj->base.dev)) {
>  		list_for_each_entry(vma, &obj->vma_list, vma_link) {
> -			struct i915_hw_ppgtt *ppgtt;
> +			struct intel_context *ctx;
>  
>  			if (!drm_mm_node_allocated(&vma->node))
>  				continue;
> @@ -332,8 +332,8 @@ static int per_file_stats(int id, void *ptr, void *data)
>  				continue;
>  			}
>  
> -			ppgtt = container_of(vma->vm, struct i915_hw_ppgtt, base);
> -			if (ppgtt->ctx && ppgtt->ctx->file_priv != stats->file_priv)
> +			ctx = container_of(vma->vm, struct intel_context, vm);

That doesn't really work.
-Daniel

> +			if (ctx && ctx->file_priv != stats->file_priv)
>  				continue;
>  
>  			if (obj->ring) /* XXX per-vma statistic */
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 3e7cb50..43da325 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -210,7 +210,7 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size)
>  }
>  
>  static struct i915_hw_ppgtt *
> -create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
> +i915_ppgtt_create(struct drm_device *dev)
>  {
>  	struct i915_hw_ppgtt *ppgtt;
>  	int ret;
> @@ -225,7 +225,6 @@ create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
>  		return ERR_PTR(ret);
>  	}
>  
> -	ppgtt->ctx = ctx;
>  	return ppgtt;
>  }
>  
> @@ -315,7 +314,7 @@ i915_gem_create_context(struct drm_device *dev,
>  	}
>  
>  	if (create_vm) {
> -		struct i915_hw_ppgtt *ppgtt = create_vm_for_ctx(dev, ctx);
> +		struct i915_hw_ppgtt *ppgtt = i915_ppgtt_create(dev);
>  
>  		if (IS_ERR_OR_NULL(ppgtt)) {
>  			DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n",
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index 8d6f7c1..dd70b0f 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -258,8 +258,6 @@ struct i915_hw_ppgtt {
>  		dma_addr_t *gen8_pt_dma_addr[4];
>  	};
>  
> -	struct intel_context *ctx;
> -
>  	int (*enable)(struct i915_hw_ppgtt *ppgtt);
>  	int (*switch_mm)(struct i915_hw_ppgtt *ppgtt,
>  			 struct intel_engine_cs *ring,
> -- 
> 2.0.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Remove context pointer from ppgtt struct
  2014-07-30 11:59 ` Daniel Vetter
@ 2014-07-30 14:20   ` Thierry, Michel
  0 siblings, 0 replies; 6+ messages in thread
From: Thierry, Michel @ 2014-07-30 14:20 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: intel-gfx@lists.freedesktop.org


[-- Attachment #1.1: Type: text/plain, Size: 3943 bytes --]



> -----Original Message-----
> From: Daniel Vetter [mailto:daniel.vetter@ffwll.ch] On Behalf Of Daniel
> Vetter
> Sent: Wednesday, July 30, 2014 12:59 PM
> To: Thierry, Michel
> Cc: intel-gfx@lists.freedesktop.org; Daniel Vetter
> Subject: Re: [Intel-gfx] [PATCH] drm/i915: Remove context pointer from
> ppgtt struct
> 
> On Wed, Jul 30, 2014 at 12:25:20PM +0100, Michel Thierry wrote:
> > After new vma/ppgtt lifetime rules, the ppgtt can outlive the context
> > it was created for.
> >
> > - Renamed create_vm_for_ctx to i915_ppgtt_create as ctx/ppgtt are no
> > longer referenced.
> > - Updated per_file_stats to cope with this change.
> >
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_debugfs.c     | 6 +++---
> >  drivers/gpu/drm/i915/i915_gem_context.c | 5 ++---
> >  drivers/gpu/drm/i915/i915_gem_gtt.h     | 2 --
> >  3 files changed, 5 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
> b/drivers/gpu/drm/i915/i915_debugfs.c
> > index 96612a5..35c0f09 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -322,7 +322,7 @@ static int per_file_stats(int id, void *ptr, void
*data)
> >
> >  	if (USES_FULL_PPGTT(obj->base.dev)) {
> >  		list_for_each_entry(vma, &obj->vma_list, vma_link) {
> > -			struct i915_hw_ppgtt *ppgtt;
> > +			struct intel_context *ctx;
> >
> >  			if (!drm_mm_node_allocated(&vma->node))
> >  				continue;
> > @@ -332,8 +332,8 @@ static int per_file_stats(int id, void *ptr, void
*data)
> >  				continue;
> >  			}
> >
> > -			ppgtt = container_of(vma->vm, struct
> i915_hw_ppgtt, base);
> > -			if (ppgtt->ctx && ppgtt->ctx->file_priv != stats-
> >file_priv)
> > +			ctx = container_of(vma->vm, struct intel_context,
> vm);
> 
> That doesn't really work.
> -Daniel

Indeed, sorry about that. I'm sending v2. 

> 
> > +			if (ctx && ctx->file_priv != stats->file_priv)
> >  				continue;
> >
> >  			if (obj->ring) /* XXX per-vma statistic */
> > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c
> b/drivers/gpu/drm/i915/i915_gem_context.c
> > index 3e7cb50..43da325 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_context.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> > @@ -210,7 +210,7 @@ i915_gem_alloc_context_obj(struct drm_device
> *dev, size_t size)
> >  }
> >
> >  static struct i915_hw_ppgtt *
> > -create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
> > +i915_ppgtt_create(struct drm_device *dev)
> >  {
> >  	struct i915_hw_ppgtt *ppgtt;
> >  	int ret;
> > @@ -225,7 +225,6 @@ create_vm_for_ctx(struct drm_device *dev, struct
> intel_context *ctx)
> >  		return ERR_PTR(ret);
> >  	}
> >
> > -	ppgtt->ctx = ctx;
> >  	return ppgtt;
> >  }
> >
> > @@ -315,7 +314,7 @@ i915_gem_create_context(struct drm_device *dev,
> >  	}
> >
> >  	if (create_vm) {
> > -		struct i915_hw_ppgtt *ppgtt = create_vm_for_ctx(dev, ctx);
> > +		struct i915_hw_ppgtt *ppgtt = i915_ppgtt_create(dev);
> >
> >  		if (IS_ERR_OR_NULL(ppgtt)) {
> >  			DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n",
> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h
> b/drivers/gpu/drm/i915/i915_gem_gtt.h
> > index 8d6f7c1..dd70b0f 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> > @@ -258,8 +258,6 @@ struct i915_hw_ppgtt {
> >  		dma_addr_t *gen8_pt_dma_addr[4];
> >  	};
> >
> > -	struct intel_context *ctx;
> > -
> >  	int (*enable)(struct i915_hw_ppgtt *ppgtt);
> >  	int (*switch_mm)(struct i915_hw_ppgtt *ppgtt,
> >  			 struct intel_engine_cs *ring,
> > --
> > 2.0.3
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

[-- Attachment #1.2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 6656 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] drm/i915: Remove context pointer from ppgtt struct
  2014-07-30 11:25 [PATCH] drm/i915: Remove context pointer from ppgtt struct Michel Thierry
  2014-07-30 11:59 ` Daniel Vetter
@ 2014-07-30 14:21 ` Michel Thierry
  2014-07-30 15:52   ` Daniel Vetter
  1 sibling, 1 reply; 6+ messages in thread
From: Michel Thierry @ 2014-07-30 14:21 UTC (permalink / raw)
  To: intel-gfx; +Cc: Daniel Vetter

After new vma/ppgtt lifetime rules, the ppgtt can outlive the context
it was created for.

- Renamed create_vm_for_ctx to i915_ppgtt_create as ctx/ppgtt are no
longer referenced.
- Updated per_file_stats to cope with this change.

v2: Get the right context for this ppgtt.
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c     | 25 ++++++++++++++++++++++++-
 drivers/gpu/drm/i915/i915_gem_context.c |  5 ++---
 drivers/gpu/drm/i915/i915_gem_gtt.h     |  2 --
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 9e737b7..0f34d6a 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -308,6 +308,27 @@ struct file_stats {
 	size_t active, inactive;
 };
 
+static struct intel_context *
+i915_get_ppgtt_context(struct drm_i915_file_private *file_priv,
+		struct i915_hw_ppgtt *ppgtt)
+{
+	struct drm_i915_private *dev_priv = file_priv->dev_priv;
+	struct intel_context *ctx;
+	struct i915_hw_ppgtt *ctx_ppgtt;
+
+	list_for_each_entry(ctx, &dev_priv->context_list, link) {
+			if (ctx->legacy_hw_ctx.rcs_state == NULL)
+				continue;
+			else {
+				ctx_ppgtt = ctx_to_ppgtt(ctx);
+				if (ppgtt == ctx_ppgtt)
+					return ctx;
+			}
+	}
+
+	return NULL;
+}
+
 static int per_file_stats(int id, void *ptr, void *data)
 {
 	struct drm_i915_gem_object *obj = ptr;
@@ -322,6 +343,7 @@ static int per_file_stats(int id, void *ptr, void *data)
 
 	if (USES_FULL_PPGTT(obj->base.dev)) {
 		list_for_each_entry(vma, &obj->vma_list, vma_link) {
+			struct intel_context *ctx;
 			struct i915_hw_ppgtt *ppgtt;
 
 			if (!drm_mm_node_allocated(&vma->node))
@@ -333,7 +355,8 @@ static int per_file_stats(int id, void *ptr, void *data)
 			}
 
 			ppgtt = container_of(vma->vm, struct i915_hw_ppgtt, base);
-			if (ppgtt->ctx && ppgtt->ctx->file_priv != stats->file_priv)
+			ctx = i915_get_ppgtt_context(stats->file_priv, ppgtt);
+			if (ctx && ctx->file_priv != stats->file_priv)
 				continue;
 
 			if (obj->ring) /* XXX per-vma statistic */
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 4cfb03a..0d741f2 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -182,7 +182,7 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size)
 }
 
 static struct i915_hw_ppgtt *
-create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
+i915_ppgtt_create(struct drm_device *dev)
 {
 	struct i915_hw_ppgtt *ppgtt;
 	int ret;
@@ -197,7 +197,6 @@ create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
 		return ERR_PTR(ret);
 	}
 
-	ppgtt->ctx = ctx;
 	return ppgtt;
 }
 
@@ -287,7 +286,7 @@ i915_gem_create_context(struct drm_device *dev,
 	}
 
 	if (create_vm) {
-		struct i915_hw_ppgtt *ppgtt = create_vm_for_ctx(dev, ctx);
+		struct i915_hw_ppgtt *ppgtt = i915_ppgtt_create(dev);
 
 		if (IS_ERR_OR_NULL(ppgtt)) {
 			DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n",
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 57d4013..b8806e9 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -258,8 +258,6 @@ struct i915_hw_ppgtt {
 		dma_addr_t *gen8_pt_dma_addr[4];
 	};
 
-	struct intel_context *ctx;
-
 	int (*enable)(struct i915_hw_ppgtt *ppgtt);
 	int (*switch_mm)(struct i915_hw_ppgtt *ppgtt,
 			 struct intel_engine_cs *ring,
-- 
2.0.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Remove context pointer from ppgtt struct
  2014-07-30 14:21 ` Michel Thierry
@ 2014-07-30 15:52   ` Daniel Vetter
  2014-07-31  8:21     ` Daniel Vetter
  0 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2014-07-30 15:52 UTC (permalink / raw)
  To: Michel Thierry; +Cc: Daniel Vetter, intel-gfx

On Wed, Jul 30, 2014 at 03:21:54PM +0100, Michel Thierry wrote:
> After new vma/ppgtt lifetime rules, the ppgtt can outlive the context
> it was created for.
> 
> - Renamed create_vm_for_ctx to i915_ppgtt_create as ctx/ppgtt are no
> longer referenced.
> - Updated per_file_stats to cope with this change.
> 
> v2: Get the right context for this ppgtt.
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c     | 25 ++++++++++++++++++++++++-
>  drivers/gpu/drm/i915/i915_gem_context.c |  5 ++---
>  drivers/gpu/drm/i915/i915_gem_gtt.h     |  2 --
>  3 files changed, 26 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 9e737b7..0f34d6a 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -308,6 +308,27 @@ struct file_stats {
>  	size_t active, inactive;
>  };
>  
> +static struct intel_context *
> +i915_get_ppgtt_context(struct drm_i915_file_private *file_priv,
> +		struct i915_hw_ppgtt *ppgtt)
> +{
> +	struct drm_i915_private *dev_priv = file_priv->dev_priv;
> +	struct intel_context *ctx;
> +	struct i915_hw_ppgtt *ctx_ppgtt;
> +
> +	list_for_each_entry(ctx, &dev_priv->context_list, link) {
> +			if (ctx->legacy_hw_ctx.rcs_state == NULL)
> +				continue;
> +			else {
> +				ctx_ppgtt = ctx_to_ppgtt(ctx);

More cans of worms: You can't actually do that because we don't actually
store a ppgtt in ctx->vm, at least not always. That should be replaceable
with a ctx->ppgtt pointer, but there's more.

I think I'll take a look at this myself and do some untangling ...
-Daniel

> +				if (ppgtt == ctx_ppgtt)
> +					return ctx;
> +			}
> +	}
> +
> +	return NULL;
> +}
> +
>  static int per_file_stats(int id, void *ptr, void *data)
>  {
>  	struct drm_i915_gem_object *obj = ptr;
> @@ -322,6 +343,7 @@ static int per_file_stats(int id, void *ptr, void *data)
>  
>  	if (USES_FULL_PPGTT(obj->base.dev)) {
>  		list_for_each_entry(vma, &obj->vma_list, vma_link) {
> +			struct intel_context *ctx;
>  			struct i915_hw_ppgtt *ppgtt;
>  
>  			if (!drm_mm_node_allocated(&vma->node))
> @@ -333,7 +355,8 @@ static int per_file_stats(int id, void *ptr, void *data)
>  			}
>  
>  			ppgtt = container_of(vma->vm, struct i915_hw_ppgtt, base);
> -			if (ppgtt->ctx && ppgtt->ctx->file_priv != stats->file_priv)
> +			ctx = i915_get_ppgtt_context(stats->file_priv, ppgtt);
> +			if (ctx && ctx->file_priv != stats->file_priv)
>  				continue;
>  
>  			if (obj->ring) /* XXX per-vma statistic */
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 4cfb03a..0d741f2 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -182,7 +182,7 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size)
>  }
>  
>  static struct i915_hw_ppgtt *
> -create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
> +i915_ppgtt_create(struct drm_device *dev)
>  {
>  	struct i915_hw_ppgtt *ppgtt;
>  	int ret;
> @@ -197,7 +197,6 @@ create_vm_for_ctx(struct drm_device *dev, struct intel_context *ctx)
>  		return ERR_PTR(ret);
>  	}
>  
> -	ppgtt->ctx = ctx;
>  	return ppgtt;
>  }
>  
> @@ -287,7 +286,7 @@ i915_gem_create_context(struct drm_device *dev,
>  	}
>  
>  	if (create_vm) {
> -		struct i915_hw_ppgtt *ppgtt = create_vm_for_ctx(dev, ctx);
> +		struct i915_hw_ppgtt *ppgtt = i915_ppgtt_create(dev);
>  
>  		if (IS_ERR_OR_NULL(ppgtt)) {
>  			DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n",
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index 57d4013..b8806e9 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -258,8 +258,6 @@ struct i915_hw_ppgtt {
>  		dma_addr_t *gen8_pt_dma_addr[4];
>  	};
>  
> -	struct intel_context *ctx;
> -
>  	int (*enable)(struct i915_hw_ppgtt *ppgtt);
>  	int (*switch_mm)(struct i915_hw_ppgtt *ppgtt,
>  			 struct intel_engine_cs *ring,
> -- 
> 2.0.3
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Remove context pointer from ppgtt struct
  2014-07-30 15:52   ` Daniel Vetter
@ 2014-07-31  8:21     ` Daniel Vetter
  0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2014-07-31  8:21 UTC (permalink / raw)
  To: Michel Thierry; +Cc: Daniel Vetter, intel-gfx

On Wed, Jul 30, 2014 at 5:52 PM, Daniel Vetter <daniel@ffwll.ch> wrote:
> I think I'll take a look at this myself and do some untangling ...

Ok, I've taken a look and also spotted an issue in your patch. I've
submitted the patches to intel-gfx and also uploaded them to

http://cgit.freedesktop.org/~danvet/drm/log/?h=ctx-cleanup

Can you please review them all?

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-31  8:21 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-30 11:25 [PATCH] drm/i915: Remove context pointer from ppgtt struct Michel Thierry
2014-07-30 11:59 ` Daniel Vetter
2014-07-30 14:20   ` Thierry, Michel
2014-07-30 14:21 ` Michel Thierry
2014-07-30 15:52   ` Daniel Vetter
2014-07-31  8:21     ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox