1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
From 3afc89c92318cd0f663353e784cd5106e1e929d8 Mon Sep 17 00:00:00 2001
From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Fri, 13 Oct 2017 12:53:38 -0400
Subject: [PATCH 2602/4131] drm/amd/display: change dml numdpp var to uint
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
---
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 14 +++++++-------
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
index 117ec11..ffd1d8d 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -1158,7 +1158,7 @@ static bool CalculatePrefetchSchedule(
else if (PageTableLevels == 3)
*Tno_bw = UrgentExtraLatency;
else
- Tno_bw = 0;
+ *Tno_bw = 0;
} else if (DCCEnable)
*Tno_bw = LineTime;
else
@@ -4721,14 +4721,14 @@ static void ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_
&& mode_lib->vba.SwathWidthYSingleDPP[k]
<= mode_lib->vba.MaximumSwathWidth[k]
&& mode_lib->vba.ODMCombineEnablePerState[i][k] == false) {
- mode_lib->vba.NoOfDPP[i][k] = 1.0;
+ mode_lib->vba.NoOfDPP[i][k] = 1;
mode_lib->vba.RequiredDPPCLK[i][k] =
mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
* (1.0
+ mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading
/ 100.0);
} else {
- mode_lib->vba.NoOfDPP[i][k] = 2.0;
+ mode_lib->vba.NoOfDPP[i][k] = 2;
mode_lib->vba.RequiredDPPCLK[i][k] =
mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
* (1.0
@@ -4790,14 +4790,14 @@ static void ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_
<= mode_lib->vba.MaximumSwathWidth[k]
&& mode_lib->vba.ODMCombineEnablePerState[i][k]
== false) {
- mode_lib->vba.NoOfDPP[i][k] = 1.0;
+ mode_lib->vba.NoOfDPP[i][k] = 1;
mode_lib->vba.RequiredDPPCLK[i][k] =
mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
* (1.0
+ mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading
/ 100.0);
} else {
- mode_lib->vba.NoOfDPP[i][k] = 2.0;
+ mode_lib->vba.NoOfDPP[i][k] = 2;
mode_lib->vba.RequiredDPPCLK[i][k] =
mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
* (1.0
@@ -4833,14 +4833,14 @@ static void ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_
mode_lib->vba.ODMCombineEnablePerState[i][k] = false;
if (mode_lib->vba.SwathWidthYSingleDPP[k]
<= mode_lib->vba.MaximumSwathWidth[k]) {
- mode_lib->vba.NoOfDPP[i][k] = 1.0;
+ mode_lib->vba.NoOfDPP[i][k] = 1;
mode_lib->vba.RequiredDPPCLK[i][k] =
mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
* (1.0
+ mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading
/ 100.0);
} else {
- mode_lib->vba.NoOfDPP[i][k] = 2.0;
+ mode_lib->vba.NoOfDPP[i][k] = 2;
mode_lib->vba.RequiredDPPCLK[i][k] =
mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
* (1.0
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
index 63ad4a7..4b8c1b9 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
@@ -489,7 +489,7 @@ struct vba_vars_st {
double CursorBufferSize;
double CursorChunkSize;
unsigned int Mode;
- double NoOfDPP[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
+ unsigned int NoOfDPP[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
double OutputLinkDPLanes[DC__NUM_DPP__MAX];
double SwathWidthYPerState[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
double SwathHeightYPerState[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
--
2.7.4
|
