6.1-stable patches

added patches:
	drm-i915-remove-unused-variable.patch

diff --git a/queue-6.1/drm-i915-allow-switching-away-via-vga-switcheroo-if-uninitialized.patch b/queue-6.1/drm-i915-allow-switching-away-via-vga-switcheroo-if-uninitialized.patch
index e54d54f374fa3b7a3ca8ec377f907a1ed51f9577..11180f2c6565dd364020c6b150c65b8a4a133a23 100644 (file)
--- a/queue-6.1/drm-i915-allow-switching-away-via-vga-switcheroo-if-uninitialized.patch
+++ b/queue-6.1/drm-i915-allow-switching-away-via-vga-switcheroo-if-uninitialized.patch
@@ -53,18 +53,14 @@ Cc: <stable@vger.kernel.org> # v5.14+
 Link: https://patchwork.freedesktop.org/patch/msgid/20230116115425.13484-2-tzimmermann@suse.de
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/gpu/drm/i915/i915_driver.c     |    5 +----
+ drivers/gpu/drm/i915/i915_driver.c     |    3 +--
  drivers/gpu/drm/i915/i915_switcheroo.c |    6 +++++-
- 2 files changed, 6 insertions(+), 5 deletions(-)
+ 2 files changed, 6 insertions(+), 3 deletions(-)
 
 --- a/drivers/gpu/drm/i915/i915_driver.c
 +++ b/drivers/gpu/drm/i915/i915_driver.c
-@@ -1070,12 +1070,9 @@ static int i915_driver_open(struct drm_d
-  */
- static void i915_driver_lastclose(struct drm_device *dev)
- {
--      struct drm_i915_private *i915 = to_i915(dev);
--
+@@ -1074,8 +1074,7 @@ static void i915_driver_lastclose(struct
+ 
        intel_fbdev_restore_mode(dev);
  
 -      if (HAS_DISPLAY(i915))

diff --git a/queue-6.1/drm-i915-remove-unused-variable.patch b/queue-6.1/drm-i915-remove-unused-variable.patch
new file mode 100644 (file)
index 0000000..c604c4c
--- /dev/null
+++ b/queue-6.1/drm-i915-remove-unused-variable.patch
@@ -0,0 +1,33 @@
+From 2293a73ad4f3b6c37c06713ff1b67659d92ef43d Mon Sep 17 00:00:00 2001
+From: Nirmoy Das <nirmoy.das@intel.com>
+Date: Wed, 18 Jan 2023 18:06:24 +0100
+Subject: drm/i915: Remove unused variable
+
+From: Nirmoy Das <nirmoy.das@intel.com>
+
+commit 2293a73ad4f3b6c37c06713ff1b67659d92ef43d upstream.
+
+Removed unused i915 var.
+
+Fixes: a273e95721e9 ("drm/i915: Allow switching away via vga-switcheroo if uninitialized")
+Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
+Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20230118170624.9326-1-nirmoy.das@intel.com
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/i915_driver.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_driver.c
++++ b/drivers/gpu/drm/i915/i915_driver.c
+@@ -1070,8 +1070,6 @@ static int i915_driver_open(struct drm_d
+  */
+ static void i915_driver_lastclose(struct drm_device *dev)
+ {
+-      struct drm_i915_private *i915 = to_i915(dev);
+-
+       intel_fbdev_restore_mode(dev);
+ 
+       vga_switcheroo_process_delayed_switch();

diff --git a/queue-6.1/series b/queue-6.1/series
index d6b72707ce8b235f711d06a9bfcce53ff1704a5b..fcd6d95ddd7fa5ba87e4de67df90975d6a5c3331 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -137,6 +137,7 @@ drm-amdgpu-correct-the-power-calcultion-for-renior-cezanne.patch
 drm-i915-re-disable-rc6p-on-sandy-bridge.patch
 drm-i915-display-check-source-height-is-0.patch
 drm-i915-allow-switching-away-via-vga-switcheroo-if-uninitialized.patch
+drm-i915-remove-unused-variable.patch
 drm-amd-display-fix-set-scaling-doesn-s-work.patch
 drm-amd-display-calculate-output_color_space-after-pixel-encoding-adjustment.patch
 drm-amd-display-fix-color_space_ycbcr2020_type-matrix.patch