projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
core
/
engine
/
disp
/
nvd0.c
diff --git
a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
index 019eacd8a68fad2d7d36f4eb80584a25b3badbdf..9ee40042fa3a56115550fca7c57454b6afb3a922 100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
+++ b/
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
@@
-679,7
+679,7
@@
exec_clkcmp(struct nv50_disp_priv *priv, int head, int id,
}
if (outp == 8)
- return
false
;
+ return
conf
;
data = exec_lookup(priv, head, outp, ctrl, dcb, &ver, &hdr, &cnt, &len, &info1);
if (data == 0x0000)