git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
display
/
dc
/
inc
/
core_status.h
diff --git
a/drivers/gpu/drm/amd/display/dc/inc/core_status.h
b/drivers/gpu/drm/amd/display/dc/inc/core_status.h
index 94fc31080fdad1faa14fd4de8c13db8e6ccc2bcc..2e61a22ef4b258dd50c9832f43058bf3bab9b290 100644
(file)
--- a/
drivers/gpu/drm/amd/display/dc/inc/core_status.h
+++ b/
drivers/gpu/drm/amd/display/dc/inc/core_status.h
@@
-30,7
+30,7
@@
enum dc_status {
DC_OK = 1,
DC_NO_CONTROLLER_RESOURCE = 2,
- DC_NO_STREAM_EN
G
_RESOURCE = 3,
+ DC_NO_STREAM_EN
C
_RESOURCE = 3,
DC_NO_CLOCK_SOURCE_RESOURCE = 4,
DC_FAIL_CONTROLLER_VALIDATE = 5,
DC_FAIL_ENC_VALIDATE = 6,