projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-2015-02-14' of git://anongit.freedesktop.org/drm-intel...
[cascardo/linux.git]
/
include
/
drm
/
drm_crtc.h
diff --git
a/include/drm/drm_crtc.h
b/include/drm/drm_crtc.h
index
920e21a
..
b1465d6
100644
(file)
--- a/
include/drm/drm_crtc.h
+++ b/
include/drm/drm_crtc.h
@@
-202,6
+202,7
@@
struct drm_framebuffer {
const struct drm_framebuffer_funcs *funcs;
unsigned int pitches[4];
unsigned int offsets[4];
const struct drm_framebuffer_funcs *funcs;
unsigned int pitches[4];
unsigned int offsets[4];
+ uint64_t modifier[4];
unsigned int width;
unsigned int height;
/* depth can be 15 or 16 */
unsigned int width;
unsigned int height;
/* depth can be 15 or 16 */
@@
-1155,6
+1156,9
@@
struct drm_mode_config {
/* whether async page flip is supported or not */
bool async_page_flip;
/* whether async page flip is supported or not */
bool async_page_flip;
+ /* whether the driver supports fb modifiers */
+ bool allow_fb_modifiers;
+
/* cursor size */
uint32_t cursor_width, cursor_height;
};
/* cursor size */
uint32_t cursor_width, cursor_height;
};