projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
670c044
)
gma500: fix ioctl confict
author
Kirill A. Shutemov
<
[email protected]
>
Thu, 8 Mar 2012 16:04:47 +0000
(16:04 +0000)
committer
Dave Airlie
<
[email protected]
>
Sat, 10 Mar 2012 13:06:04 +0000
(13:06 +0000)
Move DRM_GMA_GET_PIPE_FROM_CRTC_ID to 0x08 to avoid confict with
DRM_GMA_GEM_MMAP.
Signed-off-by: Kirill A. Shutemov <
[email protected]
>
Signed-off-by: Alan Cox <
[email protected]
>
Signed-off-by: Dave Airlie <
[email protected]
>
include/drm/gma_drm.h
patch
|
blob
|
history
diff --git
a/include/drm/gma_drm.h
b/include/drm/gma_drm.h
index 113686785717cbf8358b01888182634fc014152e..884613ee00ad88bd6d60a2393d4021c70ac97551 100644
(file)
--- a/
include/drm/gma_drm.h
+++ b/
include/drm/gma_drm.h
@@
-83,9
+83,9
@@
struct drm_psb_gem_mmap {
#define DRM_GMA_GAMMA 0x04 /* Set gamma table */
#define DRM_GMA_ADB 0x05 /* Get backlight */
#define DRM_GMA_DPST_BL 0x06 /* Set backlight */
-#define DRM_GMA_GET_PIPE_FROM_CRTC_ID 0x1 /* CRTC to physical pipe# */
#define DRM_GMA_MODE_OPERATION 0x07 /* Mode validation/DC set */
#define PSB_MODE_OPERATION_MODE_VALID 0x01
+#define DRM_GMA_GET_PIPE_FROM_CRTC_ID 0x08 /* CRTC to physical pipe# */
#endif