summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-10-11 12:42:30 -0400
committerDave Airlie <airlied@redhat.com>2017-10-17 10:43:05 +1000
commit4770b18493b3d9fe1f8913e69ec5134b103d5788 (patch)
tree32e02557dcb0dc5c1f777b9a3a7095016e105faf /drivers/gpu/drm
parent8db02ca3410b0668d520c0c5d7ba0e7e3eaa811a (diff)
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>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c4
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c4
-rw-r--r--drivers/gpu/drm/amd/display/dc/dm_services.h3
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 616431e25b79..5f815cab94b5 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 @@ static 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 f9873cad40e0..3691c7498d08 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 8166027d2d83..a11991c382de 100644
--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
@@ -404,9 +404,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);