xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: Merge tag 'v3.3-rc7' into drm-core-next

Browse Source 
Merge the fixes so far into core-next, needed to test
intel driver.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
This commit is contained in:
Dave Airlie
2012-03-15 10:24:32 +00:00
parent c3c50e8b65 fde7d9049e
commit 8229c885fe
1162 changed files with 9080 additions and 47082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/radeon/r600d.h
View File

@@ -850,6 +850,7 @@
#define PACKET3_STRMOUT_BUFFER_UPDATE 0x34
#define PACKET3_INDIRECT_BUFFER_MP 0x38
#define PACKET3_MEM_SEMAPHORE 0x39
# define PACKET3_SEM_WAIT_ON_SIGNAL (0x1 << 12)
# define PACKET3_SEM_SEL_SIGNAL (0x6 << 29)
# define PACKET3_SEM_SEL_WAIT (0x7 << 29)
#define PACKET3_MPEG_INDEX 0x3A