kernelPatches.eve-backlight: update for Linux 5.13

1 files changed, 27 insertions, 27 deletions

diff --git a/overlays/patches/linux/eve-backlight.patch b/overlays/patches/linux/eve-backlight.patch
index c6dce0c263c9..a195c6fc04f5 100644
--- a/overlays/patches/linux/eve-backlight.patch
+++ b/overlays/patches/linux/eve-backlight.patch
@@ -1,4 +1,4 @@
-From ed683c4365aa64e49ffdbdc7518cbee49fff6d9c Mon Sep 17 00:00:00 2001
+From ebdcad8d8d08443a7be320d3d9ab2b7790817cb6 Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Thu, 24 Jun 2021 00:46:26 +0000
 Subject: [PATCH 1/3] Revert "drm/i915/dp: Don't use DPCD backlights that need
@@ -10,7 +10,7 @@ This reverts commit fe7d52bccab674a22776a2f31236bf4232e85410.
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
-index 4f8337c7fd2e0..87059df17e196 100644
+index 4f8337c7fd2e..87059df17e19 100644
 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
 +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
 @@ -586,14 +586,9 @@ intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector)
@@ -30,12 +30,12 @@ index 4f8337c7fd2e0..87059df17e196 100644
  		drm_dbg_kms(&i915->drm, "AUX Backlight Control Supported!\n");
  		return true;
 
-base-commit: 9f4ad9e425a1d3b6a34617b8ea226d56a119a717
+base-commit: 62fb9874f5da54fdb243003b386128037319b219
 -- 
 2.31.1
 
 
-From 0bf263810adb88e3101bf1f2090fc562909d4e6c Mon Sep 17 00:00:00 2001
+From 520923d43072973b6d8ae843c1fbc8c2fb5c3fbb Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Sun, 25 Apr 2021 08:19:45 +0000
 Subject: [PATCH 2/3] Revert "drm/i915/vbt: Fix backlight parsing for VBT 234+"
@@ -47,21 +47,21 @@ This reverts commit d381baad29b43511a7fc34c64402ef65029ab281.
  2 files changed, 4 insertions(+), 38 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
-index 987cf509337f2..e4e440c0e9aac 100644
+index 3d0c035b5e38..3ac677617d9c 100644
 --- a/drivers/gpu/drm/i915/display/intel_bios.c
 +++ b/drivers/gpu/drm/i915/display/intel_bios.c
-@@ -425,7 +425,6 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv,
+@@ -427,7 +427,6 @@ parse_lfp_backlight(struct drm_i915_private *i915,
  	const struct bdb_lfp_backlight_data *backlight_data;
  	const struct lfp_backlight_data_entry *entry;
- 	int panel_type = dev_priv->vbt.panel_type;
+ 	int panel_type = i915->vbt.panel_type;
 -	u16 level;
  
  	backlight_data = find_section(bdb, BDB_LVDS_BACKLIGHT);
  	if (!backlight_data)
-@@ -460,39 +459,14 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv,
+@@ -462,39 +461,14 @@ parse_lfp_backlight(struct drm_i915_private *i915,
  
- 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
- 	dev_priv->vbt.backlight.active_low_pwm = entry->active_low_pwm;
+ 	i915->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
+ 	i915->vbt.backlight.active_low_pwm = entry->active_low_pwm;
 -
 -	if (bdb->version >= 234) {
 -		u16 min_level;
@@ -79,32 +79,32 @@ index 987cf509337f2..e4e440c0e9aac 100644
 -			min_level = min_level / 255;
 -
 -		if (min_level > 255) {
--			drm_warn(&dev_priv->drm, "Brightness min level > 255\n");
+-			drm_warn(&i915->drm, "Brightness min level > 255\n");
 -			level = 255;
 -		}
--		dev_priv->vbt.backlight.min_brightness = min_level;
+-		i915->vbt.backlight.min_brightness = min_level;
 -	} else {
 -		level = backlight_data->level[panel_type];
--		dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
+-		i915->vbt.backlight.min_brightness = entry->min_brightness;
 -	}
 -
-+	dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
- 	drm_dbg_kms(&dev_priv->drm,
++	i915->vbt.backlight.min_brightness = entry->min_brightness;
+ 	drm_dbg_kms(&i915->drm,
  		    "VBT backlight PWM modulation frequency %u Hz, "
  		    "active %s, min brightness %u, level %u, controller %u\n",
- 		    dev_priv->vbt.backlight.pwm_freq_hz,
- 		    dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
- 		    dev_priv->vbt.backlight.min_brightness,
+ 		    i915->vbt.backlight.pwm_freq_hz,
+ 		    i915->vbt.backlight.active_low_pwm ? "low" : "high",
+ 		    i915->vbt.backlight.min_brightness,
 -		    level,
 +		    backlight_data->level[panel_type],
- 		    dev_priv->vbt.backlight.controller);
+ 		    i915->vbt.backlight.controller);
  }
  
 diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
-index 187ec573de59d..880a965c3b9a5 100644
+index dbe24d7e7375..e5fbe4927be5 100644
 --- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
 +++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
-@@ -784,7 +784,7 @@ struct lfp_backlight_data_entry {
+@@ -799,7 +799,7 @@ struct lfp_backlight_data_entry {
  	u8 active_low_pwm:1;
  	u8 obsolete1:5;
  	u16 pwm_freq_hz;
@@ -113,7 +113,7 @@ index 187ec573de59d..880a965c3b9a5 100644
  	u8 obsolete2;
  	u8 obsolete3;
  } __packed;
-@@ -794,19 +794,11 @@ struct lfp_backlight_control_method {
+@@ -809,19 +809,11 @@ struct lfp_backlight_control_method {
  	u8 controller:4;
  } __packed;
  
@@ -138,7 +138,7 @@ index 187ec573de59d..880a965c3b9a5 100644
 2.31.1
 
 
-From 53604e87914a96a9bb75b4f381720148b62b98da Mon Sep 17 00:00:00 2001
+From 5917e44a62caeab598b381acb1fe888cda09f3b3 Mon Sep 17 00:00:00 2001
 From: Kevin Chowski <chowski@google.com>
 Date: Sat, 8 Aug 2020 15:40:51 -0600
 Subject: [PATCH 3/3] CHROMIUM: Changes needed for backlight control on Eve-5.4
@@ -194,7 +194,7 @@ Signed-off-by: Guenter Roeck <groeck@chromium.org>
  3 files changed, 139 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
-index 87059df17e196..81ae9cf3bb44f 100644
+index 87059df17e19..81ae9cf3bb44 100644
 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
 +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
 @@ -385,10 +385,16 @@ static bool intel_dp_aux_vesa_set_pwm_freq(struct intel_connector *connector)
@@ -398,7 +398,7 @@ index 87059df17e196..81ae9cf3bb44f 100644
  		drm_dbg_kms(dev, "Using VESA eDP backlight controls\n");
  		panel->backlight.funcs = &intel_dp_vesa_bl_funcs;
 diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
-index 6939634e56ed6..a2d31699b96a4 100644
+index 0320878d96b0..5a58042302e0 100644
 --- a/drivers/gpu/drm/i915/i915_params.c
 +++ b/drivers/gpu/drm/i915/i915_params.c
 @@ -187,6 +187,9 @@ i915_param_named(enable_dpcd_backlight, int, 0400,
@@ -412,10 +412,10 @@ index 6939634e56ed6..a2d31699b96a4 100644
  i915_param_named(enable_gvt, bool, 0400,
  	"Enable support for Intel GVT-g graphics virtualization host support(default:false)");
 diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
-index f031966af5b70..545b4a193e1d3 100644
+index 34ebb0662547..fa39c02336a1 100644
 --- a/drivers/gpu/drm/i915/i915_params.h
 +++ b/drivers/gpu/drm/i915/i915_params.h
-@@ -81,7 +81,8 @@ struct drm_printer;
+@@ -82,7 +82,8 @@ struct drm_printer;
  	param(bool, verbose_state_checks, true, 0) \
  	param(bool, nuclear_pageflip, false, 0400) \
  	param(bool, enable_dp_mst, true, 0600) \