* [PATCH] drm/i915/bdw: Restore PPAT on thaw
@ 2014-03-18 23:09 Ben Widawsky
2014-03-19 0:33 ` Ausmus, James
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ben Widawsky @ 2014-03-18 23:09 UTC (permalink / raw)
To: Intel GFX
Apparently it is wiped out from under us, and we get some really fun
caching artifacts upon resume (it seems to be WB for all types by
default).
Reported-by: James Ausmus <james.ausmus@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index bd016e2..1b45a04 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -30,6 +30,8 @@
#include "i915_trace.h"
#include "intel_drv.h"
+static void gen8_setup_private_ppat(struct drm_i915_private *dev_priv);
+
bool intel_enable_ppgtt(struct drm_device *dev, bool full)
{
if (i915.enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))
@@ -1371,8 +1373,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
}
- if (INTEL_INFO(dev)->gen >= 8)
+ if (INTEL_INFO(dev)->gen >= 8) {
+ gen8_setup_private_ppat(dev_priv);
return;
+ }
list_for_each_entry(vm, &dev_priv->vm_list, global_link) {
/* TODO: Perhaps it shouldn't be gen6 specific */
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/bdw: Restore PPAT on thaw
2014-03-18 23:09 [PATCH] drm/i915/bdw: Restore PPAT on thaw Ben Widawsky
@ 2014-03-19 0:33 ` Ausmus, James
2014-03-19 6:57 ` Chris Wilson
2014-03-19 8:39 ` Timo Aaltonen
2 siblings, 0 replies; 5+ messages in thread
From: Ausmus, James @ 2014-03-19 0:33 UTC (permalink / raw)
To: Ben Widawsky; +Cc: Intel GFX
On Tue, Mar 18, 2014 at 4:09 PM, Ben Widawsky
<benjamin.widawsky@intel.com> wrote:
> Apparently it is wiped out from under us, and we get some really fun
> caching artifacts upon resume (it seems to be WB for all types by
> default).
>
> Reported-by: James Ausmus <james.ausmus@intel.com>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Tested-by: James Ausmus <james.ausmus@intel.com>
Works for me backported on to both a 3.14-rc3 w/ ChromeOS sauce and a
vanilla 3.14-rc6. Thanks!
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index bd016e2..1b45a04 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -30,6 +30,8 @@
> #include "i915_trace.h"
> #include "intel_drv.h"
>
> +static void gen8_setup_private_ppat(struct drm_i915_private *dev_priv);
> +
> bool intel_enable_ppgtt(struct drm_device *dev, bool full)
> {
> if (i915.enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))
> @@ -1371,8 +1373,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
> }
>
>
> - if (INTEL_INFO(dev)->gen >= 8)
> + if (INTEL_INFO(dev)->gen >= 8) {
> + gen8_setup_private_ppat(dev_priv);
> return;
> + }
>
> list_for_each_entry(vm, &dev_priv->vm_list, global_link) {
> /* TODO: Perhaps it shouldn't be gen6 specific */
> --
> 1.9.0
>
--
James Ausmus
Sr. Software Engineer
SSG-OTC ChromeOS Integration
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/bdw: Restore PPAT on thaw
2014-03-18 23:09 [PATCH] drm/i915/bdw: Restore PPAT on thaw Ben Widawsky
2014-03-19 0:33 ` Ausmus, James
@ 2014-03-19 6:57 ` Chris Wilson
2014-03-19 8:39 ` Timo Aaltonen
2 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2014-03-19 6:57 UTC (permalink / raw)
To: Ben Widawsky; +Cc: Intel GFX
On Tue, Mar 18, 2014 at 04:09:37PM -0700, Ben Widawsky wrote:
> Apparently it is wiped out from under us, and we get some really fun
> caching artifacts upon resume (it seems to be WB for all types by
> default).
>
> Reported-by: James Ausmus <james.ausmus@intel.com>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Perhaps related to https://bugs.freedesktop.org/show_bug.cgi?id=76113 ?
-Chris
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index bd016e2..1b45a04 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -30,6 +30,8 @@
> #include "i915_trace.h"
> #include "intel_drv.h"
>
> +static void gen8_setup_private_ppat(struct drm_i915_private *dev_priv);
> +
> bool intel_enable_ppgtt(struct drm_device *dev, bool full)
> {
> if (i915.enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))
> @@ -1371,8 +1373,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
> }
>
>
> - if (INTEL_INFO(dev)->gen >= 8)
> + if (INTEL_INFO(dev)->gen >= 8) {
> + gen8_setup_private_ppat(dev_priv);
> return;
> + }
>
> list_for_each_entry(vm, &dev_priv->vm_list, global_link) {
> /* TODO: Perhaps it shouldn't be gen6 specific */
> --
> 1.9.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/bdw: Restore PPAT on thaw
2014-03-18 23:09 [PATCH] drm/i915/bdw: Restore PPAT on thaw Ben Widawsky
2014-03-19 0:33 ` Ausmus, James
2014-03-19 6:57 ` Chris Wilson
@ 2014-03-19 8:39 ` Timo Aaltonen
2014-03-19 8:47 ` Daniel Vetter
2 siblings, 1 reply; 5+ messages in thread
From: Timo Aaltonen @ 2014-03-19 8:39 UTC (permalink / raw)
To: Ben Widawsky, Intel GFX
On 19.03.2014 01:09, Ben Widawsky wrote:
> Apparently it is wiped out from under us, and we get some really fun
> caching artifacts upon resume (it seems to be WB for all types by
> default).
>
> Reported-by: James Ausmus <james.ausmus@intel.com>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Excellent!
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76113
Tested-by: Timo Aaltonen <timo.aaltonen@canonical.com>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index bd016e2..1b45a04 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -30,6 +30,8 @@
> #include "i915_trace.h"
> #include "intel_drv.h"
>
> +static void gen8_setup_private_ppat(struct drm_i915_private *dev_priv);
> +
> bool intel_enable_ppgtt(struct drm_device *dev, bool full)
> {
> if (i915.enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))
> @@ -1371,8 +1373,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
> }
>
>
> - if (INTEL_INFO(dev)->gen >= 8)
> + if (INTEL_INFO(dev)->gen >= 8) {
> + gen8_setup_private_ppat(dev_priv);
> return;
> + }
>
> list_for_each_entry(vm, &dev_priv->vm_list, global_link) {
> /* TODO: Perhaps it shouldn't be gen6 specific */
>
--
timo.aaltonen@canonical.com
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/bdw: Restore PPAT on thaw
2014-03-19 8:39 ` Timo Aaltonen
@ 2014-03-19 8:47 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2014-03-19 8:47 UTC (permalink / raw)
To: Timo Aaltonen; +Cc: Intel GFX, Ben Widawsky
On Wed, Mar 19, 2014 at 10:39:03AM +0200, Timo Aaltonen wrote:
> On 19.03.2014 01:09, Ben Widawsky wrote:
> > Apparently it is wiped out from under us, and we get some really fun
> > caching artifacts upon resume (it seems to be WB for all types by
> > default).
> >
> > Reported-by: James Ausmus <james.ausmus@intel.com>
> > Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
>
> Excellent!
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76113
> Tested-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Also Cc: stable@vger.kernel.org
Queued for -next, thanks for the patch.
-Daniel
>
> > ---
> > drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > index bd016e2..1b45a04 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > @@ -30,6 +30,8 @@
> > #include "i915_trace.h"
> > #include "intel_drv.h"
> >
> > +static void gen8_setup_private_ppat(struct drm_i915_private *dev_priv);
> > +
> > bool intel_enable_ppgtt(struct drm_device *dev, bool full)
> > {
> > if (i915.enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))
> > @@ -1371,8 +1373,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
> > }
> >
> >
> > - if (INTEL_INFO(dev)->gen >= 8)
> > + if (INTEL_INFO(dev)->gen >= 8) {
> > + gen8_setup_private_ppat(dev_priv);
> > return;
> > + }
> >
> > list_for_each_entry(vm, &dev_priv->vm_list, global_link) {
> > /* TODO: Perhaps it shouldn't be gen6 specific */
> >
>
>
> --
> timo.aaltonen@canonical.com
> _______________________________________________
> 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] 5+ messages in thread
end of thread, other threads:[~2014-03-19 8:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-18 23:09 [PATCH] drm/i915/bdw: Restore PPAT on thaw Ben Widawsky
2014-03-19 0:33 ` Ausmus, James
2014-03-19 6:57 ` Chris Wilson
2014-03-19 8:39 ` Timo Aaltonen
2014-03-19 8:47 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox