projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
drivers
/
staging
/
imx-drm
/
ipuv3-crtc.c
diff --git
a/drivers/staging/imx-drm/ipuv3-crtc.c
b/drivers/staging/imx-drm/ipuv3-crtc.c
index
bae0e2e
..
6fd37a7
100644
(file)
--- a/
drivers/staging/imx-drm/ipuv3-crtc.c
+++ b/
drivers/staging/imx-drm/ipuv3-crtc.c
@@
-129,7
+129,8
@@
static void ipu_crtc_dpms(struct drm_crtc *crtc, int mode)
static int ipu_page_flip(struct drm_crtc *crtc,
struct drm_framebuffer *fb,
- struct drm_pending_vblank_event *event)
+ struct drm_pending_vblank_event *event,
+ uint32_t page_flip_flags)
{
struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
int ret;