History

Merge 4.5-rc2 into usb-next

We want the USB fixes in here as well.

Greg Kroah-Hartman committed 10 years ago

Commit 4f97f8f2 parents 0e781c2 36f90b0267 files · +3988 −1770Browse files

Showing the changes to include/uapi (1 of 267 files). Show all

Unified · Split

include/uapi/drm/etnaviv_drm.h+3−0
@@ -48,6 +48,8 @@ struct drm_etnaviv_timespec { · 47 unmodified lines
4848 #define ETNAVIV_PARAM_GPU_FEATURES_2 0x05
4949 #define ETNAVIV_PARAM_GPU_FEATURES_3 0x06
5050 #define ETNAVIV_PARAM_GPU_FEATURES_4 0x07
51+#define ETNAVIV_PARAM_GPU_FEATURES_5 0x08
52+#define ETNAVIV_PARAM_GPU_FEATURES_6 0x09
5153
5254 #define ETNAVIV_PARAM_GPU_STREAM_COUNT 0x10
5355 #define ETNAVIV_PARAM_GPU_REGISTER_MAX 0x11
@@ -59,6 +61,7 @@ struct drm_etnaviv_timespec { · 5 unmodified lines
5961 #define ETNAVIV_PARAM_GPU_BUFFER_SIZE 0x17
6062 #define ETNAVIV_PARAM_GPU_INSTRUCTION_COUNT 0x18
6163 #define ETNAVIV_PARAM_GPU_NUM_CONSTANTS 0x19
64+#define ETNAVIV_PARAM_GPU_NUM_VARYINGS 0x1a
6265
6366 #define ETNA_MAX_PIPES 4
6467

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t