| Message ID | 20201113134938.4004947-4-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | f631eae5259b86de9c0da331647a1d0905c22ce0 |
| Headers | show |
| Series | [01/40] drm/amd/include/vega10_ip_offset: Mark _BASE structs as __maybe_unused | expand |
On Fri, Nov 13, 2020 at 8:50 AM Lee Jones <lee.jones@linaro.org> wrote: > > This patch fixes >200 warnings. > > Fixes the following W=1 kernel build warning(s): > > from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:31: > drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:126:22: warning: ‘DP_DVI_CONVERTER_ID_5’ defined but not used [-Wunused-const-variable=] > 126 | static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; > | ^~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:125:22: warning: ‘DP_DVI_CONVERTER_ID_4’ defined but not used [-Wunused-const-variable=] > 125 | static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; > | ^~~~~~~~~~~~~~~~~~~~~ > > Cc: Harry Wentland <harry.wentland@amd.com> > Cc: Leo Li <sunpeng.li@amd.com> > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 4 ++++ > drivers/gpu/drm/amd/display/include/ddc_service_types.h | 4 ---- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c > index 54beda4d4e85d..c5936e0643606 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c > @@ -37,6 +37,10 @@ > #include "dc_link_ddc.h" > #include "dce/dce_aux.h" > > +/*DP to Dual link DVI converter*/ > +static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; > +static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; > + > #define AUX_POWER_UP_WA_DELAY 500 > #define I2C_OVER_AUX_DEFER_WA_DELAY 70 > #define I2C_OVER_AUX_DEFER_WA_DELAY_1MS 1 > 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 b453ce5a9bfdb..4de59b66bb1a3 100644 > --- a/drivers/gpu/drm/amd/display/include/ddc_service_types.h > +++ b/drivers/gpu/drm/amd/display/include/ddc_service_types.h > @@ -117,8 +117,4 @@ struct av_sync_data { > uint8_t aud_del_ins3;/* DPCD 0002Dh */ > }; > > -/*DP to Dual link DVI converter*/ > -static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; > -static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; > - > #endif /* __DAL_DDC_SERVICE_TYPES_H__ */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c index 54beda4d4e85d..c5936e0643606 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c @@ -37,6 +37,10 @@ #include "dc_link_ddc.h" #include "dce/dce_aux.h" +/*DP to Dual link DVI converter*/ +static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; +static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; + #define AUX_POWER_UP_WA_DELAY 500 #define I2C_OVER_AUX_DEFER_WA_DELAY 70 #define I2C_OVER_AUX_DEFER_WA_DELAY_1MS 1 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 b453ce5a9bfdb..4de59b66bb1a3 100644 --- a/drivers/gpu/drm/amd/display/include/ddc_service_types.h +++ b/drivers/gpu/drm/amd/display/include/ddc_service_types.h @@ -117,8 +117,4 @@ struct av_sync_data { uint8_t aud_del_ins3;/* DPCD 0002Dh */ }; -/*DP to Dual link DVI converter*/ -static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; -static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; - #endif /* __DAL_DDC_SERVICE_TYPES_H__ */
This patch fixes >200 warnings. Fixes the following W=1 kernel build warning(s): from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:31: drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:126:22: warning: ‘DP_DVI_CONVERTER_ID_5’ defined but not used [-Wunused-const-variable=] 126 | static const uint8_t DP_DVI_CONVERTER_ID_5[] = "3393N2"; | ^~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../display/include/ddc_service_types.h:125:22: warning: ‘DP_DVI_CONVERTER_ID_4’ defined but not used [-Wunused-const-variable=] 125 | static const uint8_t DP_DVI_CONVERTER_ID_4[] = "m2DVIa"; | ^~~~~~~~~~~~~~~~~~~~~ Cc: Harry Wentland <harry.wentland@amd.com> Cc: Leo Li <sunpeng.li@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 4 ++++ drivers/gpu/drm/amd/display/include/ddc_service_types.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)