summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2020-02-27 05:31:03 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2020-02-27 05:31:03 +0000
commitcac27cad5eb28538e62c18db17f7eaafefc1f8af (patch)
treeba0592d8151fed3c4c6b6affed31da8ad3831919 /sys/dev/pci/drm
parente9c72ba0feb465630d0b4a8c50c0bf05946db130 (diff)
drm/amd/display: fixup DML dependencies
From Jun Lei 3f2a2c738bbb3a456bc2225ec77175095877a441 in linux 4.19.y/4.19.106 34ad0230062c39cdcba564d16d122c0fb467a7d6 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm')
-rw-r--r--sys/dev/pci/drm/amd/display/dc/dml/dml_common_defs.c2
-rw-r--r--sys/dev/pci/drm/amd/display/dc/dml/dml_inline_defs.h2
-rw-r--r--sys/dev/pci/drm/amd/display/dc/inc/dcn_calc_math.h (renamed from sys/dev/pci/drm/amd/display/dc/calcs/dcn_calc_math.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/dml/dml_common_defs.c b/sys/dev/pci/drm/amd/display/dc/dml/dml_common_defs.c
index b953b02a151..723af0b2dda 100644
--- a/sys/dev/pci/drm/amd/display/dc/dml/dml_common_defs.c
+++ b/sys/dev/pci/drm/amd/display/dc/dml/dml_common_defs.c
@@ -24,7 +24,7 @@
*/
#include "dml_common_defs.h"
-#include "../calcs/dcn_calc_math.h"
+#include "dcn_calc_math.h"
#include "dml_inline_defs.h"
diff --git a/sys/dev/pci/drm/amd/display/dc/dml/dml_inline_defs.h b/sys/dev/pci/drm/amd/display/dc/dml/dml_inline_defs.h
index e8ce08567cd..e4f595a3038 100644
--- a/sys/dev/pci/drm/amd/display/dc/dml/dml_inline_defs.h
+++ b/sys/dev/pci/drm/amd/display/dc/dml/dml_inline_defs.h
@@ -27,7 +27,7 @@
#define __DML_INLINE_DEFS_H__
#include "dml_common_defs.h"
-#include "../calcs/dcn_calc_math.h"
+#include "dcn_calc_math.h"
#include "dml_logger.h"
static inline double dml_min(double a, double b)
diff --git a/sys/dev/pci/drm/amd/display/dc/calcs/dcn_calc_math.h b/sys/dev/pci/drm/amd/display/dc/inc/dcn_calc_math.h
index f46ab0e24ca..f46ab0e24ca 100644
--- a/sys/dev/pci/drm/amd/display/dc/calcs/dcn_calc_math.h
+++ b/sys/dev/pci/drm/amd/display/dc/inc/dcn_calc_math.h