From add17bf078c066e681bb75c9d5b98b96ec3bfc27 Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Wed, 17 Feb 2016 15:44:41 -0500 Subject: [PATCH 1395/1565] drm/amd/dal: Minor dm_helper type and include fixup Change-Id: Iad218adf70fde1514b81854390d6bf667bd04587 Signed-off-by: Harry Wentland Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c | 12 ++++++++---- drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c | 4 ++-- drivers/gpu/drm/amd/dal/dc/dm_helpers.h | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c index 97a3206..e414861 100644 --- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c @@ -40,6 +40,8 @@ #include "amdgpu_dm_irq.h" #include "amdgpu_dm_types.h" +#include "dm_helpers.h" + /* dm_helpers_parse_edid_caps * * Parse edid caps @@ -459,12 +461,13 @@ void dm_helpers_dp_mst_stop_top_mgr( #endif } -bool dm_helper_dp_read_dpcd( +bool dm_helpers_dp_read_dpcd( struct dc_context *ctx, const struct dc_link *link, uint32_t address, uint8_t *data, - uint32_t size) { + uint32_t size) +{ struct amdgpu_device *adev = ctx->driver_context; @@ -480,12 +483,13 @@ bool dm_helper_dp_read_dpcd( data, size) > 0; } -bool dm_helper_dp_write_dpcd( +bool dm_helpers_dp_write_dpcd( struct dc_context *ctx, const struct dc_link *link, uint32_t address, const uint8_t *data, - uint32_t size) { + uint32_t size) +{ struct amdgpu_device *adev = ctx->driver_context; struct drm_device *dev = adev->ddev; diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c b/drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c index 04a0c17..f332185 100644 --- a/drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c +++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c @@ -19,7 +19,7 @@ enum dc_status core_link_read_dpcd( uint8_t *data, uint32_t size) { - if (!dm_helper_dp_read_dpcd(link->ctx, + if (!dm_helpers_dp_read_dpcd(link->ctx, &link->public, address, data, size)) return DC_ERROR_UNEXPECTED; @@ -33,7 +33,7 @@ enum dc_status core_link_write_dpcd( const uint8_t *data, uint32_t size) { - if (!dm_helper_dp_write_dpcd(link->ctx, + if (!dm_helpers_dp_write_dpcd(link->ctx, &link->public, address, data, size)) return DC_ERROR_UNEXPECTED; diff --git a/drivers/gpu/drm/amd/dal/dc/dm_helpers.h b/drivers/gpu/drm/amd/dal/dc/dm_helpers.h index faffc16..350dd11 100644 --- a/drivers/gpu/drm/amd/dal/dc/dm_helpers.h +++ b/drivers/gpu/drm/amd/dal/dc/dm_helpers.h @@ -78,7 +78,7 @@ void dm_helpers_dp_mst_stop_top_mgr( /** * OS specific aux read callback. */ -bool dm_helper_dp_read_dpcd( +bool dm_helpers_dp_read_dpcd( struct dc_context *ctx, const struct dc_link *link, uint32_t address, @@ -88,7 +88,7 @@ bool dm_helper_dp_read_dpcd( /** * OS specific aux write callback. */ -bool dm_helper_dp_write_dpcd( +bool dm_helpers_dp_write_dpcd( struct dc_context *ctx, const struct dc_link *link, uint32_t address, -- 1.9.1