Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5368 → Rev 5068

/contrib/sdk/sources/libdrm/xf86drmMode.h
File deleted
/contrib/sdk/sources/libdrm/include/drm/drm.h
652,26 → 652,24
#define SRV_DRM_GEM_OPEN 25
#define SRV_I915_GEM_PIN 26
#define SRV_I915_GEM_UNPIN 27
#define SRV_I915_GEM_GET_CACHING 28
#define SRV_I915_GEM_SET_CACHING 29
#define SRV_I915_GEM_PWRITE 30
#define SRV_I915_GEM_BUSY 31
#define SRV_I915_GEM_SET_DOMAIN 32
#define SRV_I915_GEM_MMAP 33
#define SRV_I915_GEM_SET_TILING 34
#define SRV_I915_GEM_GET_TILING 35
#define SRV_I915_GEM_GET_APERTURE 36
#define SRV_I915_GEM_MMAP_GTT 37
#define SRV_I915_GEM_THROTTLE 38
#define SRV_I915_GEM_EXECBUFFER2 39
#define SRV_I915_GEM_WAIT 40
#define SRV_I915_GEM_CONTEXT_CREATE 41
#define SRV_I915_GEM_CONTEXT_DESTROY 42
#define SRV_I915_REG_READ 43
#define SRV_I915_GEM_SET_CACHING 28
#define SRV_I915_GEM_PWRITE 29
#define SRV_I915_GEM_BUSY 30
#define SRV_I915_GEM_SET_DOMAIN 31
#define SRV_I915_GEM_MMAP 32
#define SRV_I915_GEM_SET_TILING 33
#define SRV_I915_GEM_GET_TILING 34
#define SRV_I915_GEM_GET_APERTURE 35
#define SRV_I915_GEM_MMAP_GTT 36
#define SRV_I915_GEM_THROTTLE 37
#define SRV_I915_GEM_EXECBUFFER2 38
#define SRV_I915_GEM_WAIT 39
#define SRV_I915_GEM_CONTEXT_CREATE 40
#define SRV_I915_GEM_CONTEXT_DESTROY 41
#define SRV_I915_REG_READ 42
 
#define SRV_FBINFO 44
#define SRV_MASK_UPDATE 45
#define SRV_MASK_UPDATE_EX 46
#define SRV_FBINFO 43
#define SRV_MASK_UPDATE 44
 
 
 
/contrib/sdk/sources/libdrm/include/drm/i915_drm.h
249,7 → 249,7
#define DRM_IOCTL_I915_GEM_UNPIN SRV_I915_GEM_UNPIN
#define DRM_IOCTL_I915_GEM_BUSY SRV_I915_GEM_BUSY
#define DRM_IOCTL_I915_GEM_SET_CACHEING SRV_I915_GEM_SET_CACHING
#define DRM_IOCTL_I915_GEM_GET_CACHEING SRV_I915_GEM_GET_CACHING
#define DRM_IOCTL_I915_GEM_GET_CACHEING
#define DRM_IOCTL_I915_GEM_THROTTLE SRV_I915_GEM_THROTTLE
#define DRM_IOCTL_I915_GEM_ENTERVT
#define DRM_IOCTL_I915_GEM_LEAVEVT
339,7 → 339,6
#define I915_PARAM_HAS_EXEC_HANDLE_LUT 26
#define I915_PARAM_HAS_WT 27
#define I915_PARAM_CMD_PARSER_VERSION 28
#define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
 
typedef struct drm_i915_getparam {
int param;
876,12 → 875,6
* mmap mapping.
*/
__u32 swizzle_mode;
 
/**
* Returned address bit 6 swizzling required for CPU access through
* mmap mapping whilst bound.
*/
__u32 phys_swizzle_mode;
};
 
struct drm_i915_gem_get_aperture {
/contrib/sdk/sources/libdrm/intel/intel_decode.c
File deleted
/contrib/sdk/sources/libdrm/intel/intel_bufmgr_gem.c
74,12 → 74,14
 
#if 0
#define DBG(...) do { \
if (bufmgr_gem->bufmgr.debug) \
fprintf(stderr, __VA_ARGS__); \
} while (0)
#else
#define DBG(...)
#endif
 
//#define DBG(...) fprintf(stderr, __VA_ARGS__)
#define DBG(...)
 
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
typedef struct _drm_intel_bo_gem drm_intel_bo_gem;