drm/i915: fix hsw uncached pte
Subsystems (3)
PATCH 1/1 drm/i915: fix hsw uncached pte
From: Daniel Vetter <[email protected]>
They've changed it ... for no apparent reason. Meh.
--- drivers/char/agp/intel-agp.h | 1 + drivers/char/agp/intel-gtt.c | 107 ++++++++++++++++++++++++------------ drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 1 + 4 files changed, 77 insertions(+), 37 deletions(-)
Applies to -fixes.
drivers/char/agp/intel-agp.h +1 -0
@@ -64,6 +64,7 @@#define I830_PTE_SYSTEM_CACHED 0x00000006/* GT PTE cache control fields */ #define GEN6_PTE_UNCACHED 0x00000002 +#define HSW_PTE_UNCACHED 0x00000000#define GEN6_PTE_LLC 0x00000004#define GEN6_PTE_LLC_MLC 0x00000006#define GEN6_PTE_GFDT 0x00000008
drivers/char/agp/intel-gtt.c +71 -36
166 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -1
@@ -261,7 +261,10 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, pte_flags |=GEN6_PTE_CACHE_LLC ;break ;case I915_CACHE_NONE : - pte_flags |=GEN6_PTE_UNCACHED ; +if (IS_HASWELL (dev)) + pte_flags |=HSW_PTE_UNCACHED ; +else + pte_flags |=GEN6_PTE_UNCACHED ;break ;default :BUG ();
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -115,6 +115,7 @@#define GEN6_PTE_VALID (1 << 0)#define GEN6_PTE_UNCACHED (1 << 1) +#define HSW_PTE_UNCACHED (0)#define GEN6_PTE_CACHE_LLC (2 << 1)#define GEN6_PTE_CACHE_LLC_MLC (3 << 1)#define GEN6_PTE_CACHE_BITS (3 << 1)
Signature · 1 line
1.7.11.2
Jani Nikula
maintainerQuoted 31 lines · Paulo Zanoni
From: Daniel Vetter <[email protected]>
They've changed it ... for no apparent reason. Meh.
Signed-off-by Daniel Vetter <[email protected]>--- drivers/char/agp/intel-agp.h | 1 + drivers/char/agp/intel-gtt.c | 107 ++++++++++++++++++++++++------------ drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 1 + 4 files changed, 77 insertions(+), 37 deletions(-)Applies to -fixes.
drivers/char/agp/intel-agp.h +1
-0@@ -64,6 +64,7 @@#define I830_PTE_SYSTEM_CACHED 0x00000006/* GT PTE cache control fields */ #define GEN6_PTE_UNCACHED 0x00000002 +#define HSW_PTE_UNCACHED 0x00000000#define GEN6_PTE_LLC 0x00000004#define GEN6_PTE_LLC_MLC 0x00000006#define GEN6_PTE_GFDT 0x00000008drivers/char/agp/intel-gtt.c +0
-0
drivers/char/agp/intel-gtt.c struct intel_gtt_driver { · line 47
Quoted 4 lines
drivers/char/agp/intel-gtt.c +1
-0@@ -44,6 +44,7 @@ struct intel_gtt_driver { unsigned int is_g33 : 1; unsigned int is_pineview : 1; unsigned int is_ironlake : 1; + unsigned int is_hsw : 1;
This bit is set in haswell_gtt_driver, but it's not referenced anywhere, is it? Why do you add it? Am I missing something?
BR,
Jani.
Quoted 200 lines
drivers/char/agp/intel-gtt.c +70
-36unsigned int has_pgtbl_enable : 1; unsigned int dma_mask_size : 8;/* Chipset specific GTT setup */ @@ -1156,6 +1157,30 @@ static bool gen6_check_flags(unsigned int flags)return true; } +static void haswell_write_entry (dma_addr_t addr,unsigned int entry, +unsigned int flags) +{ +unsigned int type_mask = flags & ~AGP_USER_CACHED_MEMORY_GFDT ; +unsigned int gfdt = flags &AGP_USER_CACHED_MEMORY_GFDT ; +u32 pte_flags; + +if (type_mask ==AGP_USER_MEMORY ) + pte_flags =HSW_PTE_UNCACHED |I810_PTE_VALID ; +else if (type_mask ==AGP_USER_CACHED_MEMORY_LLC_MLC ) { + pte_flags =GEN6_PTE_LLC_MLC |I810_PTE_VALID ; +if (gfdt) + pte_flags |=GEN6_PTE_GFDT ; + }else {/* set 'normal'/'cached' to LLC by default */ + pte_flags =GEN6_PTE_LLC |I810_PTE_VALID ; +if (gfdt) + pte_flags |=GEN6_PTE_GFDT ; + } + +/* gen6 has bit11-4 for physical addr bit39-32 */ + addr |= (addr >>28 ) &0xff0 ; +writel (addr | pte_flags, intel_private.gtt + entry); +} +static void gen6_write_entry (dma_addr_t addr,unsigned int entry,unsigned int flags) {@@ -1382,6 +1407,16 @@ static const struct intel_gtt_driver sandybridge_gtt_driver = { .check_flags = gen6_check_flags, .chipset_flush = i9xx_chipset_flush, }; +static const struct intel_gtt_driver haswell_gtt_driver = { + .gen =6 , + .setup = i9xx_setup, + .cleanup = gen6_cleanup, + .write_entry = haswell_write_entry, + .dma_mask_size =40 , + .is_hsw =1 , + .check_flags = gen6_check_flags, + .chipset_flush = i9xx_chipset_flush, +};static const struct intel_gtt_driver valleyview_gtt_driver = { .gen =7 , .setup = i9xx_setup,@@ -1499,77 +1534,77 @@ static const struct intel_gtt_driver_description { {PCI_DEVICE_ID_INTEL_VALLEYVIEW_IG , "ValleyView", &valleyview_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_D_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_M_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_S_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT1_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_PLUS_IG, - "Haswell", &sandybridge_gtt_driver }, + "Haswell", &haswell_gtt_driver }, { 0, NULL, NULL } };drivers/gpu/drm/i915/i915_gem_gtt.c +4
-1@@ -261,7 +261,10 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, pte_flags |=GEN6_PTE_CACHE_LLC ;break ;case I915_CACHE_NONE : - pte_flags |=GEN6_PTE_UNCACHED ; +if (IS_HASWELL (dev)) + pte_flags |=HSW_PTE_UNCACHED ; +else + pte_flags |=GEN6_PTE_UNCACHED ;break ;default :BUG ();drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -115,6 +115,7 @@#define GEN6_PTE_VALID (1 << 0)#define GEN6_PTE_UNCACHED (1 << 1) +#define HSW_PTE_UNCACHED (0)#define GEN6_PTE_CACHE_LLC (2 << 1)#define GEN6_PTE_CACHE_LLC_MLC (3 << 1)#define GEN6_PTE_CACHE_BITS (3 << 1)Signature · 6 lines
1.7.11.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: fix hsw uncached pte
In reply to Paulo ZanoniFrom: Daniel Vetter <[email protected]>
They've changed it ... for no apparent reason. Meh.
V2: remove unused 'is_hsw' field.
--- drivers/char/agp/intel-agp.h | 1 + drivers/char/agp/intel-gtt.c | 105 +++++++++++++++++++++++------------ drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 1 + 4 files changed, 75 insertions(+), 37 deletions(-)
drivers/char/agp/intel-agp.h +1 -0
@@ -64,6 +64,7 @@#define I830_PTE_SYSTEM_CACHED 0x00000006/* GT PTE cache control fields */ #define GEN6_PTE_UNCACHED 0x00000002 +#define HSW_PTE_UNCACHED 0x00000000#define GEN6_PTE_LLC 0x00000004#define GEN6_PTE_LLC_MLC 0x00000006#define GEN6_PTE_GFDT 0x00000008
drivers/char/agp/intel-gtt.c +69 -36
158 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -1
@@ -261,7 +261,10 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, pte_flags |=GEN6_PTE_CACHE_LLC ;break ;case I915_CACHE_NONE : - pte_flags |=GEN6_PTE_UNCACHED ; +if (IS_HASWELL (dev)) + pte_flags |=HSW_PTE_UNCACHED ; +else + pte_flags |=GEN6_PTE_UNCACHED ;break ;default :BUG ();
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -115,6 +115,7 @@#define GEN6_PTE_VALID (1 << 0)#define GEN6_PTE_UNCACHED (1 << 1) +#define HSW_PTE_UNCACHED (0)#define GEN6_PTE_CACHE_LLC (2 << 1)#define GEN6_PTE_CACHE_LLC_MLC (3 << 1)#define GEN6_PTE_CACHE_BITS (3 << 1)
Signature · 1 line
1.7.10.4
Daniel Vetter
AppliedQuoted 8 lines · Paulo Zanoni
From: Daniel Vetter <[email protected]>
They've changed it ... for no apparent reason. Meh.
V2: remove unused '
is_hsw' field.Signed-off-by Daniel Vetter <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>
Picked up for -fixes, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Mail: [email protected] Mobile: +41 (0)79 365 57 48
Quoted 1 line · Paulo Zanoni
+#define
HSW_PTE_UNCACHED0x00000000
Are you sure this value should be zero? It seems pretty unlikely to me.
Signature · 1 line
[email protected]
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx