OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel...
[uclinux-h8/linux.git]
/
drivers
/
gpu
/
drm
/
drm_irq.c
diff --git
a/drivers/gpu/drm/drm_irq.c
b/drivers/gpu/drm/drm_irq.c
index
4d79dad
..
75647e7
100644
(file)
--- a/
drivers/gpu/drm/drm_irq.c
+++ b/
drivers/gpu/drm/drm_irq.c
@@
-778,7
+778,7
@@
static struct timeval get_drm_timestamp(void)
/**
* drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
/**
* drm_get_last_vbltimestamp - retrieve raw timestamp for the most recent
- * vblank interval
+ *
vblank interval
* @dev: DRM device
* @crtc: which CRTC's vblank timestamp to retrieve
* @tvblank: Pointer to target struct timeval which should receive the timestamp
* @dev: DRM device
* @crtc: which CRTC's vblank timestamp to retrieve
* @tvblank: Pointer to target struct timeval which should receive the timestamp
@@
-933,6
+933,7
@@
void drm_send_vblank_event(struct drm_device *dev, int crtc,
{
struct timeval now;
unsigned int seq;
{
struct timeval now;
unsigned int seq;
+
if (crtc >= 0) {
seq = drm_vblank_count_and_time(dev, crtc, &now);
} else {
if (crtc >= 0) {
seq = drm_vblank_count_and_time(dev, crtc, &now);
} else {
@@
-1422,7
+1423,7
@@
static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
unsigned int seq;
int ret;
unsigned int seq;
int ret;
- e = kzalloc(sizeof
*e
, GFP_KERNEL);
+ e = kzalloc(sizeof
(*e)
, GFP_KERNEL);
if (e == NULL) {
ret = -ENOMEM;
goto err_put;
if (e == NULL) {
ret = -ENOMEM;
goto err_put;
@@
-1431,7
+1432,7
@@
static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
e->pipe = pipe;
e->base.pid = current->pid;
e->event.base.type = DRM_EVENT_VBLANK;
e->pipe = pipe;
e->base.pid = current->pid;
e->event.base.type = DRM_EVENT_VBLANK;
- e->event.base.length = sizeof
e->event
;
+ e->event.base.length = sizeof
(e->event)
;
e->event.user_data = vblwait->request.signal;
e->base.event = &e->event.base;
e->base.file_priv = file_priv;
e->event.user_data = vblwait->request.signal;
e->base.event = &e->event.base;
e->base.file_priv = file_priv;
@@
-1451,12
+1452,12
@@
static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
goto err_unlock;
}
goto err_unlock;
}
- if (file_priv->event_space < sizeof
e->event
) {
+ if (file_priv->event_space < sizeof
(e->event)
) {
ret = -EBUSY;
goto err_unlock;
}
ret = -EBUSY;
goto err_unlock;
}
- file_priv->event_space -= sizeof
e->event
;
+ file_priv->event_space -= sizeof
(e->event)
;
seq = drm_vblank_count_and_time(dev, pipe, &now);
if ((vblwait->request.type & _DRM_VBLANK_NEXTONMISS) &&
seq = drm_vblank_count_and_time(dev, pipe, &now);
if ((vblwait->request.type & _DRM_VBLANK_NEXTONMISS) &&