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 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
display
/
include
/
dal_types.h
diff --git
a/drivers/gpu/drm/amd/display/include/dal_types.h
b/drivers/gpu/drm/amd/display/include/dal_types.h
index fa543965feb51b373e1c5f6a44ec7f6452547b1f..5b1f8cef0c229c2a228bc2ce59a12358a04f7be7 100644
(file)
--- a/
drivers/gpu/drm/amd/display/include/dal_types.h
+++ b/
drivers/gpu/drm/amd/display/include/dal_types.h
@@
-40,6
+40,9
@@
enum dce_version {
DCE_VERSION_10_0,
DCE_VERSION_11_0,
DCE_VERSION_11_2,
+#if defined(CONFIG_DRM_AMD_DC_VEGAM)
+ DCE_VERSION_11_22,
+#endif
DCE_VERSION_12_0,
DCE_VERSION_MAX,
DCN_VERSION_1_0,