Commit bc517825 authored by Lee Jones's avatar Lee Jones Committed by Alex Deucher
Browse files

drm/amd/display/amdgpu_dm/amdgpu_dm_helpers: Move defines out to where they are actually used 



Fixes the following W=1 kernel build warning(s):

  drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h: At top level:
  drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:143:22:
      warning: ‘SYNAPTICS_DEVICE_ID’ defined but not used [-Wunused-const-variable=]
  drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:140:22:
      warning: ‘DP_VGA_LVDS_CONVERTER_ID_3’ defined but not used [-Wunused-const-variable=]
  drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:138:22:
      warning: ‘DP_VGA_LVDS_CONVERTER_ID_2’ defined but not used [-Wunused-const-variable=]
  drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:133:22:
      warning: ‘DP_SINK_DEVICE_STR_ID_2’ defined but not used [-Wunused-const-variable=]
  drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:132:22:
      warning: ‘DP_SINK_DEVICE_STR_ID_1’ defined but not used [-Wunused-const-variable=]

[snip 400 similar lines brevity]

Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Leo Li <sunpeng.li@amd.com>
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 63d99a34

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 
#include "dm_helpers.h"

#include "ddc_service_types.h"



/* MST Dock */

static const uint8_t SYNAPTICS_DEVICE_ID[] = "SYNA";



/* dm_helpers_parse_edid_caps

 *

 * Parse edid caps

drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 


#define MAX_PIPES 6



static const uint8_t DP_SINK_DEVICE_STR_ID_1[] = {7, 1, 8, 7, 3};

static const uint8_t DP_SINK_DEVICE_STR_ID_2[] = {7, 1, 8, 7, 5};



/*

 * Convert dmcub psr state to dmcu psr state.

 */

drivers/gpu/drm/amd/display/dc/link/link_detection.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
 */

#define LINK_TRAINING_MAX_VERIFY_RETRY 2



static const u8 DP_SINK_BRANCH_DEV_NAME_7580[] = "7580\x80u";



static const uint8_t dp_hdmi_dongle_signature_str[] = "DP-HDMI ADAPTOR";



static enum ddc_transaction_type get_ddc_transaction_type(enum signal_type sink_signal)

drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ 
#include "abm.h"

#define DC_LOGGER_INIT(logger)



/* Travis */

static const uint8_t DP_VGA_LVDS_CONVERTER_ID_2[] = "sivarT";

/* Nutmeg */

static const uint8_t DP_VGA_LVDS_CONVERTER_ID_3[] = "dnomlA";



void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode)

{

	union dpcd_edp_config edp_config_set;

drivers/gpu/drm/amd/display/include/ddc_service_types.h

+0 −13
Original line number Diff line number Diff line
@@ -129,17 +129,4 @@ struct av_sync_data { 
	uint8_t aud_del_ins3;/* DPCD 0002Dh */

};



static const uint8_t DP_SINK_DEVICE_STR_ID_1[] = {7, 1, 8, 7, 3};

static const uint8_t DP_SINK_DEVICE_STR_ID_2[] = {7, 1, 8, 7, 5};



static const u8 DP_SINK_BRANCH_DEV_NAME_7580[] = "7580\x80u";



/*Travis*/

static const uint8_t DP_VGA_LVDS_CONVERTER_ID_2[] = "sivarT";

/*Nutmeg*/

static const uint8_t DP_VGA_LVDS_CONVERTER_ID_3[] = "dnomlA";



/*MST Dock*/

static const uint8_t SYNAPTICS_DEVICE_ID[] = "SYNA";



#endif /* __DAL_DDC_SERVICE_TYPES_H__ */