blob: 91aa2bb56ac105ac4be7b4e9ee412adae3d3704a (
plain)
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
|
From 480e54e78f3df2bbc21f7977d3f55dc5aef5317e Mon Sep 17 00:00:00 2001
From: Awais Belal <awais_belal@mentor.com>
Date: Wed, 13 Jul 2016 15:18:23 -0700
Subject: [PATCH] amdgpu: fix various compilation issues
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
---
drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c | 2 +-
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c b/drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c
index f39499a..e995f9b 100644
--- a/drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c
+++ b/drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c
@@ -3181,7 +3181,7 @@ static void calculate_bandwidth(
bw_int_to_fixed(
2),
vbios->mcifwrmc_urgent_latency),
- results->dmif_burst_time[i][j]),
+ results->dmif_burst_time[results->y_clk_level][results->sclk_level]),
results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])),
results->dispclk),
bw_int_to_fixed(
diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c
index 698a34e..13a1449 100644
--- a/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c
+++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c
@@ -41,7 +41,6 @@
#define CV_SMART_DONGLE_ADDRESS 0x20
/* DVI-HDMI dongle slave address for retrieving dongle signature*/
#define DVI_HDMI_DONGLE_ADDRESS 0x68
-static const int8_t dvi_hdmi_dongle_signature_str[] = "6140063500G";
struct dvi_hdmi_dongle_signature_data {
int8_t vendor[3];/* "AMD" */
uint8_t version[2];
--
2.9.1
|
