drm/i915: s/cacheing/caching/
Subsystems (3)
PATCH 1/2 drm/i915: s/cacheing/caching/
From: Ben Widawsky <[email protected]>
--- drivers/gpu/drm/i915/i915_dma.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++++---------- include/drm/i915_drm.h | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +2 -2
@@ -1860,8 +1860,8 @@ struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_PIN , i915_gem_pin_ioctl,DRM_AUTH |DRM_ROOT_ONLY |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_UNPIN , i915_gem_unpin_ioctl,DRM_AUTH |DRM_ROOT_ONLY |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_BUSY , i915_gem_busy_ioctl,DRM_AUTH |DRM_UNLOCKED ), -DRM_IOCTL_DEF_DRV (I915_GEM_SET_CACHEING , i915_gem_set_cacheing_ioctl,DRM_UNLOCKED ), -DRM_IOCTL_DEF_DRV (I915_GEM_GET_CACHEING , i915_gem_get_cacheing_ioctl,DRM_UNLOCKED ), +DRM_IOCTL_DEF_DRV (I915_GEM_SET_CACHING , i915_gem_set_caching_ioctl,DRM_UNLOCKED ), +DRM_IOCTL_DEF_DRV (I915_GEM_GET_CACHING , i915_gem_get_caching_ioctl,DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_THROTTLE , i915_gem_throttle_ioctl,DRM_AUTH |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_ENTERVT , i915_gem_entervt_ioctl,DRM_AUTH |DRM_MASTER |DRM_ROOT_ONLY |DRM_UNLOCKED ), DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
drivers/gpu/drm/i915/i915_drv.h +4 -4
@@ -1285,10 +1285,10 @@ int i915_gem_unpin_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int i915_gem_busy_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); -int i915_gem_get_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); -int i915_gem_set_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int i915_gem_get_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file); +int i915_gem_set_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);int i915_gem_throttle_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
drivers/gpu/drm/i915/i915_gem.c +10 -10
@@ -3015,10 +3015,10 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,return 0 ; } -int i915_gem_get_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int i915_gem_get_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) { -struct drm_i915_gem_cacheing *args = data; +struct drm_i915_gem_caching *args = data;struct drm_i915_gem_object *obj;int ret;
@@ -3032,7 +3032,7 @@ int i915_gem_get_cacheing_ioctl(struct drm_device *dev, void *data, goto unlock; } - args->cacheing = obj->cache_level !=I915_CACHE_NONE ; + args->caching = obj->cache_level !=I915_CACHE_NONE ;drm_gem_object_unreference (&obj->base); unlock:
@@ -3040,10 +3040,10 @@ unlock:return ret; } -int i915_gem_set_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int i915_gem_set_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) { -struct drm_i915_gem_cacheing *args = data; +struct drm_i915_gem_caching *args = data;struct drm_i915_gem_object *obj;enum i915_cache_level level;int ret;
@@ -3052,11 +3052,11 @@ int i915_gem_set_cacheing_ioctl(struct drm_device *dev, void *data,if (ret)return ret; -switch (args->cacheing) { -case I915_CACHEING_NONE : +switch (args->caching) { +case I915_CACHING_NONE : level =I915_CACHE_NONE ;break ; -case I915_CACHEING_CACHED : +case I915_CACHING_CACHED : level =I915_CACHE_LLC ;break ;default :
include/drm/i915_drm.h +10 -10
@@ -203,8 +203,8 @@ typedef struct _drm_i915_sarea {#define DRM_I915_GEM_WAIT 0x2c#define DRM_I915_GEM_CONTEXT_CREATE 0x2d#define DRM_I915_GEM_CONTEXT_DESTROY 0x2e -#define DRM_I915_GEM_SET_CACHEING 0x2f -#define DRM_I915_GEM_GET_CACHEING 0x30 +#define DRM_I915_GEM_SET_CACHING 0x2f +#define DRM_I915_GEM_GET_CACHING 0x30#define DRM_I915_REG_READ 0x31#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
@@ -230,8 +230,8 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_PIN DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)#define DRM_IOCTL_I915_GEM_UNPIN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)#define DRM_IOCTL_I915_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy) -#define DRM_IOCTL_I915_GEM_SET_CACHEING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHEING, struct drm_i915_gem_cacheing) -#define DRM_IOCTL_I915_GEM_GET_CACHEING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHEING, struct drm_i915_gem_cacheing) +#define DRM_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHING, struct drm_i915_gem_caching) +#define DRM_IOCTL_I915_GEM_GET_CACHING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHING, struct drm_i915_gem_caching)#define DRM_IOCTL_I915_GEM_THROTTLE DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE)#define DRM_IOCTL_I915_GEM_ENTERVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT)#define DRM_IOCTL_I915_GEM_LEAVEVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT)
@@ -716,21 +716,21 @@ struct drm_i915_gem_busy {__u32 busy; }; -#define I915_CACHEING_NONE 0 -#define I915_CACHEING_CACHED 1 +#define I915_CACHING_NONE 0 +#define I915_CACHING_CACHED 1 -struct drm_i915_gem_cacheing { +struct drm_i915_gem_caching {/** -* Handle of the buffer to set/get the cacheing level of. */ +* Handle of the buffer to set/get the caching level of. */ __u32 handle;/** * Cacheing level to apply or return value * -* bits0-15 are for generic cacheing control (i.e. the above defined +* bits0-15 are for generic caching control (i.e. the above defined * values). bits16-31 are reserved for platform-specific variations * (e.g. l3$ caching on gen7). */ -__u32 cacheing; +__u32 caching; };#define I915_TILING_NONE 0
Signature · 1 line
1.7.12
PATCH 2/2 drm/i915: Some HSW PTE fixes
Haswell doesn't set GFDT or L3 in the PTE anymore. Also there was an improper mask as the address extension of HSW PTEs decreased from 8 extra bits to 7.
--- drivers/char/agp/intel-gtt.c | 14 +++----------- drivers/gpu/drm/i915/i915_gem_gtt.c | 5 ++++- 2 files changed, 7 insertions(+), 12 deletions(-)
drivers/char/agp/intel-gtt.c +3 -11
@@ -1161,23 +1161,15 @@ 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 */ +else 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 ; +/* hsw has bit10-4 for physical addr bit38-32 */ + addr |= (addr >>28 ) &0x7f0 ;writel (addr | pte_flags, intel_private.gtt + entry); }
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -1
@@ -255,7 +255,10 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,switch (cache_level) {case I915_CACHE_LLC_MLC : - pte_flags |=GEN6_PTE_CACHE_LLC_MLC ; +if (IS_HASWELL (dev)) + pte_flags |=GEN6_PTE_CACHE_LLC ; +else + pte_flags |=GEN6_PTE_CACHE_LLC_MLC ;break ;case I915_CACHE_LLC : pte_flags |=GEN6_PTE_CACHE_LLC ;
Signature · 1 line
1.7.12
Re: [PATCH 2/2] drm/i915: Some HSW PTE fixes
drivers/char/agp/intel-gtt.c static void haswell_write_entry(dma_addr_t addr, unsigned int entry, · line 1163
Quoted 8 lines · On Fri, 21 Sep 2012 17:01:21 -0700 Ben Widawsky <[email protected]> wrote:
drivers/char/agp/intel-gtt.c +0
-0@@ -1161,23 +1161,15 @@ 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 ;
Paulo noticed this is wrong on an internal review. I already have a fixed version on my local tree.
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
Feel free to use:
Quoted 161 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++++---------- include/drm/i915_drm.h | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/i915_dma.c +2
-2@@ -1860,8 +1860,8 @@ struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_PIN , i915_gem_pin_ioctl,DRM_AUTH |DRM_ROOT_ONLY |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_UNPIN , i915_gem_unpin_ioctl,DRM_AUTH |DRM_ROOT_ONLY |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_BUSY , i915_gem_busy_ioctl,DRM_AUTH |DRM_UNLOCKED ), -DRM_IOCTL_DEF_DRV (I915_GEM_SET_CACHEING , i915_gem_set_cacheing_ioctl,DRM_UNLOCKED ), -DRM_IOCTL_DEF_DRV (I915_GEM_GET_CACHEING , i915_gem_get_cacheing_ioctl,DRM_UNLOCKED ), +DRM_IOCTL_DEF_DRV (I915_GEM_SET_CACHING , i915_gem_set_caching_ioctl,DRM_UNLOCKED ), +DRM_IOCTL_DEF_DRV (I915_GEM_GET_CACHING , i915_gem_get_caching_ioctl,DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_THROTTLE , i915_gem_throttle_ioctl,DRM_AUTH |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_ENTERVT , i915_gem_entervt_ioctl,DRM_AUTH |DRM_MASTER |DRM_ROOT_ONLY |DRM_UNLOCKED ), DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),drivers/gpu/drm/i915/i915_drv.h +4
-4@@ -1285,10 +1285,10 @@ int i915_gem_unpin_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int i915_gem_busy_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); -int i915_gem_get_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); -int i915_gem_set_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int i915_gem_get_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file); +int i915_gem_set_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);int i915_gem_throttle_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,drivers/gpu/drm/i915/i915_gem.c +10
-10@@ -3015,10 +3015,10 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,return 0 ; } -int i915_gem_get_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int i915_gem_get_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) { -struct drm_i915_gem_cacheing *args = data; +struct drm_i915_gem_caching *args = data;struct drm_i915_gem_object *obj;int ret;@@ -3032,7 +3032,7 @@ int i915_gem_get_cacheing_ioctl(struct drm_device *dev, void *data, goto unlock; } - args->cacheing = obj->cache_level !=I915_CACHE_NONE ; + args->caching = obj->cache_level !=I915_CACHE_NONE ;drm_gem_object_unreference (&obj->base); unlock:@@ -3040,10 +3040,10 @@ unlock:return ret; } -int i915_gem_set_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int i915_gem_set_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) { -struct drm_i915_gem_cacheing *args = data; +struct drm_i915_gem_caching *args = data;struct drm_i915_gem_object *obj;enum i915_cache_level level;int ret;@@ -3052,11 +3052,11 @@ int i915_gem_set_cacheing_ioctl(struct drm_device *dev, void *data,if (ret)return ret; -switch (args->cacheing) { -case I915_CACHEING_NONE : +switch (args->caching) { +case I915_CACHING_NONE : level =I915_CACHE_NONE ;break ; -case I915_CACHEING_CACHED : +case I915_CACHING_CACHED : level =I915_CACHE_LLC ;break ;default :include/drm/i915_drm.h +10
-11@@ -203,8 +203,8 @@ typedef struct _drm_i915_sarea {#define DRM_I915_GEM_WAIT 0x2c#define DRM_I915_GEM_CONTEXT_CREATE 0x2d#define DRM_I915_GEM_CONTEXT_DESTROY 0x2e -#define DRM_I915_GEM_SET_CACHEING 0x2f -#define DRM_I915_GEM_GET_CACHEING 0x30 +#define DRM_I915_GEM_SET_CACHING 0x2f +#define DRM_I915_GEM_GET_CACHING 0x30#define DRM_I915_REG_READ 0x31#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)@@ -230,8 +230,8 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_PIN DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)#define DRM_IOCTL_I915_GEM_UNPIN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)#define DRM_IOCTL_I915_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy) -#define DRM_IOCTL_I915_GEM_SET_CACHEING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHEING, struct drm_i915_gem_cacheing) -#define DRM_IOCTL_I915_GEM_GET_CACHEING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHEING, struct drm_i915_gem_cacheing) +#define DRM_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHING, struct drm_i915_gem_caching) +#define DRM_IOCTL_I915_GEM_GET_CACHING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHING, struct drm_i915_gem_caching)#define DRM_IOCTL_I915_GEM_THROTTLE DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE)#define DRM_IOCTL_I915_GEM_ENTERVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT)#define DRM_IOCTL_I915_GEM_LEAVEVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT)@@ -716,21 +716,21 @@ struct drm_i915_gem_busy {__u32 busy; }; -#define I915_CACHEING_NONE 0 -#define I915_CACHEING_CACHED 1 +#define I915_CACHING_NONE 0 +#define I915_CACHING_CACHED 1 -struct drm_i915_gem_cacheing { +struct drm_i915_gem_caching {/** -* Handle of the buffer to set/get the cacheing level of. */ +* Handle of the buffer to set/get the caching level of. */ __u32 handle;/** * Cacheing level to apply or return value * -* bits0-15 are for generic cacheing control (i.e. the above defined +* bits0-15 are for generic caching control (i.e. the above defined * values). bits16-31 are reserved for platform-specific variations * (e.g. l3$ caching on gen7). */ -__u32 cacheing; +__u32 caching; };#define I915_TILING_NONE 0 --1.7.12
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br
Quoted 3 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
Signed-off-by Ben Widawsky <[email protected]>
IIrc we're already including this header in shipping libdrm, and we have already users for it ... Have you checked whether this doesn't break anything once copied over to libdrm? Maybe we just need a few #defines for the old names ...
-Daniel
Quoted 158 lines
--- drivers/gpu/drm/i915/i915_dma.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++++---------- include/drm/i915_drm.h | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-)drivers/gpu/drm/i915/i915_dma.c +2
-2@@ -1860,8 +1860,8 @@ struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_PIN , i915_gem_pin_ioctl,DRM_AUTH |DRM_ROOT_ONLY |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_UNPIN , i915_gem_unpin_ioctl,DRM_AUTH |DRM_ROOT_ONLY |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_BUSY , i915_gem_busy_ioctl,DRM_AUTH |DRM_UNLOCKED ), -DRM_IOCTL_DEF_DRV (I915_GEM_SET_CACHEING , i915_gem_set_cacheing_ioctl,DRM_UNLOCKED ), -DRM_IOCTL_DEF_DRV (I915_GEM_GET_CACHEING , i915_gem_get_cacheing_ioctl,DRM_UNLOCKED ), +DRM_IOCTL_DEF_DRV (I915_GEM_SET_CACHING , i915_gem_set_caching_ioctl,DRM_UNLOCKED ), +DRM_IOCTL_DEF_DRV (I915_GEM_GET_CACHING , i915_gem_get_caching_ioctl,DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_THROTTLE , i915_gem_throttle_ioctl,DRM_AUTH |DRM_UNLOCKED ),DRM_IOCTL_DEF_DRV (I915_GEM_ENTERVT , i915_gem_entervt_ioctl,DRM_AUTH |DRM_MASTER |DRM_ROOT_ONLY |DRM_UNLOCKED ), DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),drivers/gpu/drm/i915/i915_drv.h +4
-4@@ -1285,10 +1285,10 @@ int i915_gem_unpin_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int i915_gem_busy_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); -int i915_gem_get_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); -int i915_gem_set_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int i915_gem_get_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file); +int i915_gem_set_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);int i915_gem_throttle_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,drivers/gpu/drm/i915/i915_gem.c +10
-10@@ -3015,10 +3015,10 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj,return 0 ; } -int i915_gem_get_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int i915_gem_get_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) { -struct drm_i915_gem_cacheing *args = data; +struct drm_i915_gem_caching *args = data;struct drm_i915_gem_object *obj;int ret;@@ -3032,7 +3032,7 @@ int i915_gem_get_cacheing_ioctl(struct drm_device *dev, void *data, goto unlock; } - args->cacheing = obj->cache_level !=I915_CACHE_NONE ; + args->caching = obj->cache_level !=I915_CACHE_NONE ;drm_gem_object_unreference (&obj->base); unlock:@@ -3040,10 +3040,10 @@ unlock:return ret; } -int i915_gem_set_cacheing_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int i915_gem_set_caching_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) { -struct drm_i915_gem_cacheing *args = data; +struct drm_i915_gem_caching *args = data;struct drm_i915_gem_object *obj;enum i915_cache_level level;int ret;@@ -3052,11 +3052,11 @@ int i915_gem_set_cacheing_ioctl(struct drm_device *dev, void *data,if (ret)return ret; -switch (args->cacheing) { -case I915_CACHEING_NONE : +switch (args->caching) { +case I915_CACHING_NONE : level =I915_CACHE_NONE ;break ; -case I915_CACHEING_CACHED : +case I915_CACHING_CACHED : level =I915_CACHE_LLC ;break ;default :include/drm/i915_drm.h +10
-11@@ -203,8 +203,8 @@ typedef struct _drm_i915_sarea {#define DRM_I915_GEM_WAIT 0x2c#define DRM_I915_GEM_CONTEXT_CREATE 0x2d#define DRM_I915_GEM_CONTEXT_DESTROY 0x2e -#define DRM_I915_GEM_SET_CACHEING 0x2f -#define DRM_I915_GEM_GET_CACHEING 0x30 +#define DRM_I915_GEM_SET_CACHING 0x2f +#define DRM_I915_GEM_GET_CACHING 0x30#define DRM_I915_REG_READ 0x31#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)@@ -230,8 +230,8 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_PIN DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)#define DRM_IOCTL_I915_GEM_UNPIN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)#define DRM_IOCTL_I915_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy) -#define DRM_IOCTL_I915_GEM_SET_CACHEING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHEING, struct drm_i915_gem_cacheing) -#define DRM_IOCTL_I915_GEM_GET_CACHEING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHEING, struct drm_i915_gem_cacheing) +#define DRM_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_SET_CACHING, struct drm_i915_gem_caching) +#define DRM_IOCTL_I915_GEM_GET_CACHING DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_GET_CACHING, struct drm_i915_gem_caching)#define DRM_IOCTL_I915_GEM_THROTTLE DRM_IO ( DRM_COMMAND_BASE + DRM_I915_GEM_THROTTLE)#define DRM_IOCTL_I915_GEM_ENTERVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT)#define DRM_IOCTL_I915_GEM_LEAVEVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT)@@ -716,21 +716,21 @@ struct drm_i915_gem_busy {__u32 busy; }; -#define I915_CACHEING_NONE 0 -#define I915_CACHEING_CACHED 1 +#define I915_CACHING_NONE 0 +#define I915_CACHING_CACHED 1 -struct drm_i915_gem_cacheing { +struct drm_i915_gem_caching {/** -* Handle of the buffer to set/get the cacheing level of. */ +* Handle of the buffer to set/get the caching level of. */ __u32 handle;/** * Cacheing level to apply or return value * -* bits0-15 are for generic cacheing control (i.e. the above defined +* bits0-15 are for generic caching control (i.e. the above defined * values). bits16-31 are reserved for platform-specific variations * (e.g. l3$ caching on gen7). */ -__u32 cacheing; +__u32 caching; };#define I915_TILING_NONE 0 --1.7.12
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 9 lines · Daniel Vetter
Quoted 3 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
Signed-off-by Ben Widawsky <[email protected]>IIrc we're already including this header in shipping libdrm, and we have already users for it ... Have you checked whether this doesn't break anything once copied over to libdrm? Maybe we just need a few #defines for the old names ...
It doesn't affect the ddx since it is still using its own prototype, and there has yet to be a patch for Mesa to use this knowledge. -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 6 lines · On Tue, 25 Sep 2012 10:43:55 +0100 Chris Wilson <[email protected]>…
Quoted 5 lines · Daniel Vetter
Quoted 3 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
Signed-off-by Ben Widawsky <[email protected]>
Quoted 9 lines
Quoted 4 lines
IIrc we're already including this header in shipping libdrm, and we have already users for it ... Have you checked whether this doesn't break anything once copied over to libdrm? Maybe we just need a few #defines for the old names ...
It doesn't affect the ddx since it is still using its own prototype, and there has yet to be a patch for Mesa to use this knowledge. -Chris
Quickly!
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
Quoted 14 lines · Ben Widawsky
Quoted 11 lines · On Tue, 25 Sep 2012 10:43:55 +0100 Chris Wilson <[email protected]>…
Quoted 9 lines · Daniel Vetter
Quoted 3 lines · Ben Widawsky
From: Ben Widawsky <[email protected]>
Signed-off-by Ben Widawsky <[email protected]>IIrc we're already including this header in shipping libdrm, and we have already users for it ... Have you checked whether this doesn't break anything once copied over to libdrm? Maybe we just need a few #defines for the old names ...
Quoted 6 lines
Quoted 4 lines
It doesn't affect the ddx since it is still using its own prototype, and there has yet to be a patch for Mesa to use this knowledge. -Chris
Quickly!
Done!
I think I'll punt on the hsw pte stuff a bit, prod me on (internal) irc for the reasons ... (and to prove me wrong).
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch