From 4abbc21a2513fd3efcbbd4f33a093a6888921c06 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 9 Jul 2023 12:18:10 +0200 Subject: [PATCH] 5.4-stable patches added patches: drm-i915-initialise-outparam-for-error-return-from-wait_for_register.patch --- ...-error-return-from-wait_for_register.patch | 45 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 46 insertions(+) create mode 100644 queue-5.4/drm-i915-initialise-outparam-for-error-return-from-wait_for_register.patch diff --git a/queue-5.4/drm-i915-initialise-outparam-for-error-return-from-wait_for_register.patch b/queue-5.4/drm-i915-initialise-outparam-for-error-return-from-wait_for_register.patch new file mode 100644 index 00000000000..ed517ccc6f3 --- /dev/null +++ b/queue-5.4/drm-i915-initialise-outparam-for-error-return-from-wait_for_register.patch @@ -0,0 +1,45 @@ +From b79ffa914ede785a721f42d8ee3ce7b8eeede2bb Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 16 Sep 2020 11:50:21 +0100 +Subject: drm/i915: Initialise outparam for error return from wait_for_register +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Chris Wilson + +commit b79ffa914ede785a721f42d8ee3ce7b8eeede2bb upstream. + +Just in case the caller passes in 0 for both slow&fast timeouts, make +sure we initialise the stack value returned. Add an assert so that we +don't make the mistake of passing 0 timeouts for the wait. + +drivers/gpu/drm/i915/intel_uncore.c:2011 __intel_wait_for_register_fw() error: uninitialized symbol 'reg_value'. + +References: 3f649ab728cd ("treewide: Remove uninitialized_var() usage") +Signed-off-by: Chris Wilson +Reviewed-by: José Roberto de Souza +Link: https://patchwork.freedesktop.org/patch/msgid/20200916105022.28316-1-chris@chris-wilson.co.uk +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/i915/intel_uncore.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/intel_uncore.c ++++ b/drivers/gpu/drm/i915/intel_uncore.c +@@ -1926,13 +1926,14 @@ int __intel_wait_for_register_fw(struct + unsigned int slow_timeout_ms, + u32 *out_value) + { +- u32 reg_value; ++ u32 reg_value = 0; + #define done (((reg_value = intel_uncore_read_fw(uncore, reg)) & mask) == value) + int ret; + + /* Catch any overuse of this function */ + might_sleep_if(slow_timeout_ms); + GEM_BUG_ON(fast_timeout_us > 20000); ++ GEM_BUG_ON(!fast_timeout_us && !slow_timeout_ms); + + ret = -ETIMEDOUT; + if (fast_timeout_us && fast_timeout_us <= 20000) diff --git a/queue-5.4/series b/queue-5.4/series index 9dac1185ac7..25e27d63f2f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -4,6 +4,7 @@ x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch video-imsttfb-check-for-ioremap-failures.patch fbdev-imsttfb-fix-use-after-free-bug-in-imsttfb_probe.patch hid-wacom-use-ktime_t-rather-than-int-when-dealing-with-timestamps.patch +drm-i915-initialise-outparam-for-error-return-from-wait_for_register.patch scripts-tags.sh-resolve-gtags-empty-index-generation.patch drm-amdgpu-validate-vm-ioctl-flags.patch bgmac-fix-initial-chip-reset-to-support-bcm5358.patch -- 2.47.3