* [PATCH] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
@ 2017-02-17 13:59 Chris Wilson
2017-02-17 14:07 ` Ville Syrjälä
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Chris Wilson @ 2017-02-17 13:59 UTC (permalink / raw)
To: intel-gfx; +Cc: Mika Kuoppala
Prevent the overflow check from firing on machines with the full 4lvl
page tables, that are not restricted to GEN8_LEGACY_PDES.
Fixes: 894ccebee2b0 ("drm/i915: Micro-optimise gen8_ppgtt_insert_entries()")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 1f281554e4c9..65cadc09b56e 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -854,7 +854,8 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt,
break;
}
- GEM_BUG_ON(pdpe > GEN8_LEGACY_PDPES);
+ GEM_BUG_ON(!i915_vm_is_48bit(&ppgtt->base) &&
+ pdpe > GEN8_LEGACY_PDPES);
pd = pdp->page_directory[pdpe];
pde = 0;
}
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
2017-02-17 13:59 [PATCH] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines Chris Wilson
@ 2017-02-17 14:07 ` Ville Syrjälä
2017-02-17 14:11 ` Chris Wilson
2017-02-17 14:14 ` [PATCH v2] " Chris Wilson
2017-02-17 17:22 ` ✓ Fi.CI.BAT: success for drm/i915: Only apply legacy PDE overflow detection to 3lvl machines (rev2) Patchwork
2 siblings, 1 reply; 7+ messages in thread
From: Ville Syrjälä @ 2017-02-17 14:07 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, Mika Kuoppala
On Fri, Feb 17, 2017 at 01:59:09PM +0000, Chris Wilson wrote:
> Prevent the overflow check from firing on machines with the full 4lvl
> page tables, that are not restricted to GEN8_LEGACY_PDES.
>
> Fixes: 894ccebee2b0 ("drm/i915: Micro-optimise gen8_ppgtt_insert_entries()")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 1f281554e4c9..65cadc09b56e 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -854,7 +854,8 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt,
> break;
> }
>
> - GEM_BUG_ON(pdpe > GEN8_LEGACY_PDPES);
> + GEM_BUG_ON(!i915_vm_is_48bit(&ppgtt->base) &&
> + pdpe > GEN8_LEGACY_PDPES);
Should that be >= ?
> pd = pdp->page_directory[pdpe];
> pde = 0;
> }
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
2017-02-17 14:07 ` Ville Syrjälä
@ 2017-02-17 14:11 ` Chris Wilson
0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2017-02-17 14:11 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, Mika Kuoppala
On Fri, Feb 17, 2017 at 04:07:50PM +0200, Ville Syrjälä wrote:
> On Fri, Feb 17, 2017 at 01:59:09PM +0000, Chris Wilson wrote:
> > Prevent the overflow check from firing on machines with the full 4lvl
> > page tables, that are not restricted to GEN8_LEGACY_PDES.
> >
> > Fixes: 894ccebee2b0 ("drm/i915: Micro-optimise gen8_ppgtt_insert_entries()")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > index 1f281554e4c9..65cadc09b56e 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > @@ -854,7 +854,8 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt,
> > break;
> > }
> >
> > - GEM_BUG_ON(pdpe > GEN8_LEGACY_PDPES);
> > + GEM_BUG_ON(!i915_vm_is_48bit(&ppgtt->base) &&
> > + pdpe > GEN8_LEGACY_PDPES);
>
> Should that be >= ?
Yes, next you'll be fixing the name ;)
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
2017-02-17 13:59 [PATCH] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines Chris Wilson
2017-02-17 14:07 ` Ville Syrjälä
@ 2017-02-17 14:14 ` Chris Wilson
2017-02-20 8:39 ` Mika Kuoppala
2017-02-17 17:22 ` ✓ Fi.CI.BAT: success for drm/i915: Only apply legacy PDE overflow detection to 3lvl machines (rev2) Patchwork
2 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2017-02-17 14:14 UTC (permalink / raw)
To: intel-gfx; +Cc: Mika Kuoppala
Prevent the overflow check from firing on machines with the full 4lvl
page tables, that are not restricted to GEN8_LEGACY_PDES.
v2: Also fix the off-by-one in the compare
Fixes: 894ccebee2b0 ("drm/i915: Micro-optimise gen8_ppgtt_insert_entries()")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 1f281554e4c9..b0ccc9b6c1c5 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -854,7 +854,8 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt,
break;
}
- GEM_BUG_ON(pdpe > GEN8_LEGACY_PDPES);
+ GEM_BUG_ON(!i915_vm_is_48bit(&ppgtt->base) &&
+ pdpe >= GEN8_LEGACY_PDPES);
pd = pdp->page_directory[pdpe];
pde = 0;
}
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Only apply legacy PDE overflow detection to 3lvl machines (rev2)
2017-02-17 13:59 [PATCH] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines Chris Wilson
2017-02-17 14:07 ` Ville Syrjälä
2017-02-17 14:14 ` [PATCH v2] " Chris Wilson
@ 2017-02-17 17:22 ` Patchwork
2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2017-02-17 17:22 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Only apply legacy PDE overflow detection to 3lvl machines (rev2)
URL : https://patchwork.freedesktop.org/series/19845/
State : success
== Summary ==
Series 19845v2 drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
https://patchwork.freedesktop.org/api/1.0/series/19845/revisions/2/mbox/
fi-bdw-5557u total:252 pass:241 dwarn:0 dfail:0 fail:0 skip:11
fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39
fi-bxt-j4205 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19
fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12
fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27
fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31
fi-hsw-4770 total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-hsw-4770r total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-ilk-650 total:252 pass:202 dwarn:0 dfail:0 fail:0 skip:50
fi-ivb-3520m total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-ivb-3770 total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-kbl-7500u total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-skl-6260u total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
fi-skl-6700hq total:252 pass:235 dwarn:0 dfail:0 fail:0 skip:17
fi-skl-6700k total:252 pass:230 dwarn:4 dfail:0 fail:0 skip:18
fi-skl-6770hq total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
fi-snb-2520m total:252 pass:224 dwarn:0 dfail:0 fail:0 skip:28
fi-snb-2600 total:252 pass:223 dwarn:0 dfail:0 fail:0 skip:29
02022d17a5787709617b7897de3906970e2b0721 drm-tip: 2017y-02m-17d-15h-15m-45s UTC integration manifest
1c072c6 drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3882/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
2017-02-17 14:14 ` [PATCH v2] " Chris Wilson
@ 2017-02-20 8:39 ` Mika Kuoppala
2017-02-20 9:44 ` Chris Wilson
0 siblings, 1 reply; 7+ messages in thread
From: Mika Kuoppala @ 2017-02-20 8:39 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Prevent the overflow check from firing on machines with the full 4lvl
> page tables, that are not restricted to GEN8_LEGACY_PDES.
>
> v2: Also fix the off-by-one in the compare
>
> Fixes: 894ccebee2b0 ("drm/i915: Micro-optimise gen8_ppgtt_insert_entries()")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 1f281554e4c9..b0ccc9b6c1c5 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -854,7 +854,8 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt,
> break;
> }
>
> - GEM_BUG_ON(pdpe > GEN8_LEGACY_PDPES);
> + GEM_BUG_ON(!i915_vm_is_48bit(&ppgtt->base) &&
> + pdpe >= GEN8_LEGACY_PDPES);
> pd = pdp->page_directory[pdpe];
> pde = 0;
> }
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines
2017-02-20 8:39 ` Mika Kuoppala
@ 2017-02-20 9:44 ` Chris Wilson
0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2017-02-20 9:44 UTC (permalink / raw)
To: Mika Kuoppala; +Cc: intel-gfx
On Mon, Feb 20, 2017 at 10:39:55AM +0200, Mika Kuoppala wrote:
> Chris Wilson <chris@chris-wilson.co.uk> writes:
>
> > Prevent the overflow check from firing on machines with the full 4lvl
> > page tables, that are not restricted to GEN8_LEGACY_PDES.
> >
> > v2: Also fix the off-by-one in the compare
> >
> > Fixes: 894ccebee2b0 ("drm/i915: Micro-optimise gen8_ppgtt_insert_entries()")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Fixup applied, thanks.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-02-20 9:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-17 13:59 [PATCH] drm/i915: Only apply legacy PDE overflow detection to 3lvl machines Chris Wilson
2017-02-17 14:07 ` Ville Syrjälä
2017-02-17 14:11 ` Chris Wilson
2017-02-17 14:14 ` [PATCH v2] " Chris Wilson
2017-02-20 8:39 ` Mika Kuoppala
2017-02-20 9:44 ` Chris Wilson
2017-02-17 17:22 ` ✓ Fi.CI.BAT: success for drm/i915: Only apply legacy PDE overflow detection to 3lvl machines (rev2) Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.