From 4103b53e7910d780ee65cce9d8f32f5156e74fee Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 31 May 2021 08:57:42 +0200 Subject: [PATCH] 5.10-stable patches added patches: i915-fix-build-warning-in-intel_dp_get_link_status.patch --- ...-warning-in-intel_dp_get_link_status.patch | 42 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-5.10/i915-fix-build-warning-in-intel_dp_get_link_status.patch diff --git a/queue-5.10/i915-fix-build-warning-in-intel_dp_get_link_status.patch b/queue-5.10/i915-fix-build-warning-in-intel_dp_get_link_status.patch new file mode 100644 index 00000000000..b661b3bc968 --- /dev/null +++ b/queue-5.10/i915-fix-build-warning-in-intel_dp_get_link_status.patch @@ -0,0 +1,42 @@ +From foo@baz Mon May 31 08:35:11 AM CEST 2021 +Date: Mon, 31 May 2021 08:35:11 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: i915: fix build warning in intel_dp_get_link_status() + +From: Greg Kroah-Hartman + +There is a build warning using gcc-11 showing a mis-match in the .h and .c +definitions of intel_dp_get_link_status(): + CC [M] drivers/gpu/drm/i915/display/intel_dp.o +drivers/gpu/drm/i915/display/intel_dp.c:4139:56: warning: argument 2 of type ‘u8[6]’ {aka ‘unsigned char[6]’} with mismatched bound [-Warray-parameter=] + 4139 | intel_dp_get_link_status(struct intel_dp *intel_dp, u8 link_status[DP_LINK_STATUS_SIZE]) + | ~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from drivers/gpu/drm/i915/display/intel_dp.c:51: +drivers/gpu/drm/i915/display/intel_dp.h:105:57: note: previously declared as ‘u8 *’ {aka ‘unsigned char *’} + 105 | intel_dp_get_link_status(struct intel_dp *intel_dp, u8 *link_status); + | ~~~~^~~~~~~~~~~ + +This was fixed accidentally commit b30edfd8d0b4 ("drm/i915: Switch to LTTPR +non-transparent mode link training") by getting rid of the function entirely, +but that is not a viable backport for a stable kernel, so just fix up the +function definition to remove the build warning entirely. There is no +functional change for this, and it fixes up one of the last 'make allmodconfig' +build warnings when using gcc-11 on this kernel tree. + +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/display/intel_dp.c ++++ b/drivers/gpu/drm/i915/display/intel_dp.c +@@ -4136,7 +4136,7 @@ static void chv_dp_post_pll_disable(stru + * link status information + */ + bool +-intel_dp_get_link_status(struct intel_dp *intel_dp, u8 link_status[DP_LINK_STATUS_SIZE]) ++intel_dp_get_link_status(struct intel_dp *intel_dp, u8 *link_status) + { + return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status, + DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; diff --git a/queue-5.10/series b/queue-5.10/series index 95153105ac1..e245db24154 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -240,3 +240,4 @@ mips-alchemy-xxs1500-add-gpio-au1000.h-header-file.patch mips-ralink-export-rt_sysc_membase-for-rt2880_wdt.c.patch net-zero-initialize-tc-skb-extension-on-allocation.patch net-mvpp2-add-buffer-header-handling-in-rx.patch +i915-fix-build-warning-in-intel_dp_get_link_status.patch -- 2.47.3