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
|
From a7e23cff3a154547d78ffeae4bd9afdee39025f5 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 11 Oct 2017 12:42:30 -0400
Subject: [PATCH 2393/4131] drm/amd/display/dc: drop dm_delay_in_microseconds
Use udelay directly.
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 4 ++--
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 4 ++--
drivers/gpu/drm/amd/display/dc/dm_services.h | 3 ---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
index 3427fb5..b30319f 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c
@@ -127,7 +127,7 @@ bool edp_receiver_ready_T9(struct dc_link *link)
break;
if (result != DC_OK)
break;
- dm_delay_in_microseconds(link->ctx, 100); //MAx T9
+ udelay(100); //MAx T9
} while (++tries < 50);
return result;
}
@@ -271,7 +271,7 @@ void dp_retrain_link_dp_test(struct dc_link *link,
pipes[i].stream->sink->link != NULL &&
pipes[i].stream_res.stream_enc != NULL &&
pipes[i].stream->sink->link == link) {
- dm_delay_in_microseconds(link->ctx, 100);
+ udelay(100);
pipes[i].stream_res.stream_enc->funcs->dp_blank(
pipes[i].stream_res.stream_enc);
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
index 313f61b..002db8c 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
@@ -137,7 +137,7 @@ static void dce_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)
if (psr_state == 0)
break;
}
- dm_delay_in_microseconds(dmcu->ctx, 10);
+ udelay(10);
}
}
}
@@ -378,7 +378,7 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)
if (psr_state == 0)
break;
}
- dm_delay_in_microseconds(dmcu->ctx, 500);
+ udelay(500);
}
/* assert if max retry hit */
diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h
index 8ab0af6..e94da74 100644
--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
@@ -445,9 +445,6 @@ bool dm_read_persistent_data(struct dc_context *ctx,
unsigned int size,
struct persistent_data_flag *flag);
-void dm_delay_in_microseconds
- (struct dc_context *ctx, unsigned int microSeconds);
-
bool dm_query_extended_brightness_caps
(struct dc_context *ctx, enum dm_acpi_display_type display,
struct dm_acpi_atif_backlight_caps *pCaps);
--
2.7.4
|
