diff mbox

drm/i915: enable PPGTT on VLV

Message ID 1401399201-1888-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes May 29, 2014, 9:33 p.m. UTC
Working for real this time.  i915_ppgtt_info has all sorts of good stuff
in it and X is running nicely on top.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/i915_drv.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Daniel Vetter June 2, 2014, 8:46 a.m. UTC | #1
On Thu, May 29, 2014 at 02:33:21PM -0700, Jesse Barnes wrote:
> Working for real this time.  i915_ppgtt_info has all sorts of good stuff
> in it and X is running nicely on top.
> 
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Maintainer-nitpick: Please don't forget the patch changelog ...
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_drv.h | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index bea9ab40..8631fb3 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1936,10 +1936,8 @@ struct drm_i915_cmd_table {
>  #define I915_NEED_GFX_HWS(dev)	(INTEL_INFO(dev)->need_gfx_hws)
>  
>  #define HAS_HW_CONTEXTS(dev)	(INTEL_INFO(dev)->gen >= 6)
> -#define HAS_ALIASING_PPGTT(dev)	(INTEL_INFO(dev)->gen >= 6 && \
> -				 (!IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)))
> -#define HAS_PPGTT(dev)		(INTEL_INFO(dev)->gen >= 7 \
> -				 && !IS_GEN8(dev))
> +#define HAS_ALIASING_PPGTT(dev)	(INTEL_INFO(dev)->gen >= 6)
> +#define HAS_PPGTT(dev)		(INTEL_INFO(dev)->gen >= 7 && !IS_GEN8(dev))
>  #define USES_PPGTT(dev)		intel_enable_ppgtt(dev, false)
>  #define USES_FULL_PPGTT(dev)	intel_enable_ppgtt(dev, true)
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjälä June 2, 2014, 11:09 a.m. UTC | #2
On Thu, May 29, 2014 at 02:33:21PM -0700, Jesse Barnes wrote:
> Working for real this time.  i915_ppgtt_info has all sorts of good stuff
> in it and X is running nicely on top.
> 
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

So it wasn't just my vlv where it appears to work. That's nice.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_drv.h | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index bea9ab40..8631fb3 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1936,10 +1936,8 @@ struct drm_i915_cmd_table {
>  #define I915_NEED_GFX_HWS(dev)	(INTEL_INFO(dev)->need_gfx_hws)
>  
>  #define HAS_HW_CONTEXTS(dev)	(INTEL_INFO(dev)->gen >= 6)
> -#define HAS_ALIASING_PPGTT(dev)	(INTEL_INFO(dev)->gen >= 6 && \
> -				 (!IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)))
> -#define HAS_PPGTT(dev)		(INTEL_INFO(dev)->gen >= 7 \
> -				 && !IS_GEN8(dev))
> +#define HAS_ALIASING_PPGTT(dev)	(INTEL_INFO(dev)->gen >= 6)
> +#define HAS_PPGTT(dev)		(INTEL_INFO(dev)->gen >= 7 && !IS_GEN8(dev))
>  #define USES_PPGTT(dev)		intel_enable_ppgtt(dev, false)
>  #define USES_FULL_PPGTT(dev)	intel_enable_ppgtt(dev, true)
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter June 2, 2014, 3:33 p.m. UTC | #3
On Mon, Jun 02, 2014 at 02:09:06PM +0300, Ville Syrjälä wrote:
> On Thu, May 29, 2014 at 02:33:21PM -0700, Jesse Barnes wrote:
> > Working for real this time.  i915_ppgtt_info has all sorts of good stuff
> > in it and X is running nicely on top.
> > 
> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> So it wasn't just my vlv where it appears to work. That's nice.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
Daniel Vetter June 6, 2014, 6:22 a.m. UTC | #4
On Mon, Jun 02, 2014 at 05:33:26PM +0200, Daniel Vetter wrote:
> On Mon, Jun 02, 2014 at 02:09:06PM +0300, Ville Syrjälä wrote:
> > On Thu, May 29, 2014 at 02:33:21PM -0700, Jesse Barnes wrote:
> > > Working for real this time.  i915_ppgtt_info has all sorts of good stuff
> > > in it and X is running nicely on top.
> > > 
> > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> > 
> > So it wasn't just my vlv where it appears to work. That's nice.
> > 
> > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Queued for -next, thanks for the patch.

https://bugs.freedesktop.org/show_bug.cgi?id=79670

There's more that are suspect.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index bea9ab40..8631fb3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1936,10 +1936,8 @@  struct drm_i915_cmd_table {
 #define I915_NEED_GFX_HWS(dev)	(INTEL_INFO(dev)->need_gfx_hws)
 
 #define HAS_HW_CONTEXTS(dev)	(INTEL_INFO(dev)->gen >= 6)
-#define HAS_ALIASING_PPGTT(dev)	(INTEL_INFO(dev)->gen >= 6 && \
-				 (!IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)))
-#define HAS_PPGTT(dev)		(INTEL_INFO(dev)->gen >= 7 \
-				 && !IS_GEN8(dev))
+#define HAS_ALIASING_PPGTT(dev)	(INTEL_INFO(dev)->gen >= 6)
+#define HAS_PPGTT(dev)		(INTEL_INFO(dev)->gen >= 7 && !IS_GEN8(dev))
 #define USES_PPGTT(dev)		intel_enable_ppgtt(dev, false)
 #define USES_FULL_PPGTT(dev)	intel_enable_ppgtt(dev, true)