tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/bxt-stage1' into drm-intel-next-queued

Browse Source 
Separate topic branch for bxt didn't work out since we needed to
refactor the gmbus code a bit to make it look decent. So backmerge.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter
2015-04-14 14:00:56 +02:00
parent 30154650b8 c776eb2edf
commit c5fe557dde
365 changed files with 13156 additions and 2839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/uapi/drm/radeon_drm.h
+4
View File
@@ -1034,6 +1034,10 @@ struct drm_radeon_cs {
#define RADEON_INFO_VRAM_USAGE 0x1e
#define RADEON_INFO_GTT_USAGE 0x1f
#define RADEON_INFO_ACTIVE_CU_COUNT 0x20
#define RADEON_INFO_CURRENT_GPU_TEMP 0x21
#define RADEON_INFO_CURRENT_GPU_SCLK 0x22
#define RADEON_INFO_CURRENT_GPU_MCLK 0x23
#define RADEON_INFO_READ_REG 0x24
struct drm_radeon_info {
uint32_t request;
include/uapi/drm/tegra_drm.h
+2 -1
View File
@@ -36,7 +36,8 @@ struct drm_tegra_gem_create {
struct drm_tegra_gem_mmap {
__u32 handle;
__u32 offset;
__u32 pad;
__u64 offset;
};
struct drm_tegra_syncpt_read {