diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
tree | e2b9804379a6aab3d2471898d257fe5590feb70c /include/drm | |
parent | c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 (diff) | |
parent | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (diff) | |
download | kernel_samsung_tuna-e624ae8e0d4243e71daedce7570e91290438eaca.zip kernel_samsung_tuna-e624ae8e0d4243e71daedce7570e91290438eaca.tar.gz kernel_samsung_tuna-e624ae8e0d4243e71daedce7570e91290438eaca.tar.bz2 |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/nouveau_drm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h index 01a7141..bc5590b 100644 --- a/include/drm/nouveau_drm.h +++ b/include/drm/nouveau_drm.h @@ -80,6 +80,7 @@ struct drm_nouveau_gpuobj_free { #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 #define NOUVEAU_GETPARAM_PTIMER_TIME 14 +#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 struct drm_nouveau_getparam { uint64_t param; uint64_t value; @@ -95,6 +96,12 @@ struct drm_nouveau_setparam { #define NOUVEAU_GEM_DOMAIN_GART (1 << 2) #define NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3) +#define NOUVEAU_GEM_TILE_LAYOUT_MASK 0x0000ff00 +#define NOUVEAU_GEM_TILE_16BPP 0x00000001 +#define NOUVEAU_GEM_TILE_32BPP 0x00000002 +#define NOUVEAU_GEM_TILE_ZETA 0x00000004 +#define NOUVEAU_GEM_TILE_NONCONTIG 0x00000008 + struct drm_nouveau_gem_info { uint32_t handle; uint32_t domain; |