| Message ID | 20230317081718.2650744-21-lee@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rid W=1 warnings from GPU | expand |
Applied. Thanks! Alex On Fri, Mar 17, 2023 at 4:23 AM Lee Jones <lee@kernel.org> wrote: > > 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: Lee Jones <lee@kernel.org> > --- > .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 3 +++ > drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 +++ > .../gpu/drm/amd/display/dc/link/link_detection.c | 2 ++ > .../dc/link/protocols/link_edp_panel_control.c | 5 +++++ > .../gpu/drm/amd/display/include/ddc_service_types.h | 13 ------------- > 5 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > index 9c1e91c2179eb..330ab036c830f 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > @@ -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 > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c > index 19440bdf63449..27b8f3435d86f 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c > @@ -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. > */ > diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c > index 8cfeddfb65c89..9177b146a80a8 100644 > --- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c > +++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c > @@ -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) > diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c > index 93a6bbe954bb7..d895046787bc4 100644 > --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c > +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c > @@ -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; > diff --git a/drivers/gpu/drm/amd/display/include/ddc_service_types.h b/drivers/gpu/drm/amd/display/include/ddc_service_types.h > index 31a12ce79a8e0..f843fc4978552 100644 > --- a/drivers/gpu/drm/amd/display/include/ddc_service_types.h > +++ b/drivers/gpu/drm/amd/display/include/ddc_service_types.h > @@ -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__ */ > -- > 2.40.0.rc1.284.g88254d51c5-goog >
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 9c1e91c2179eb..330ab036c830f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -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 diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c index 19440bdf63449..27b8f3435d86f 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c @@ -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. */ diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c index 8cfeddfb65c89..9177b146a80a8 100644 --- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c +++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c @@ -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) diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c index 93a6bbe954bb7..d895046787bc4 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c @@ -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; diff --git a/drivers/gpu/drm/amd/display/include/ddc_service_types.h b/drivers/gpu/drm/amd/display/include/ddc_service_types.h index 31a12ce79a8e0..f843fc4978552 100644 --- a/drivers/gpu/drm/amd/display/include/ddc_service_types.h +++ b/drivers/gpu/drm/amd/display/include/ddc_service_types.h @@ -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__ */
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: Lee Jones <lee@kernel.org> --- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 3 +++ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 +++ .../gpu/drm/amd/display/dc/link/link_detection.c | 2 ++ .../dc/link/protocols/link_edp_panel_control.c | 5 +++++ .../gpu/drm/amd/display/include/ddc_service_types.h | 13 ------------- 5 files changed, 13 insertions(+), 13 deletions(-)