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 branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[uclinux-h8/linux.git]
/
drivers
/
gpu
/
drm
/
omapdrm
/
omap_dmm_tiler.c
diff --git
a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index
f2daad8
..
7841970
100644
(file)
--- a/
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@
-285,7
+285,7
@@
static int dmm_txn_commit(struct dmm_txn *txn, bool wait)
if (wait) {
if (!wait_for_completion_timeout(&engine->compl,
- msecs_to_jiffies(1))) {
+ msecs_to_jiffies(1
00
))) {
dev_err(dmm->dev, "timed out waiting for done\n");
ret = -ETIMEDOUT;
}