kernelPatches.eve-backlight: update for Linux 5.14

1 files changed, 13 insertions, 15 deletions

diff --git a/overlays/patches/linux/eve-backlight.patch b/overlays/patches/linux/eve-backlight.patch
index a195c6fc04f5..f10ca7a51ac5 100644
--- a/overlays/patches/linux/eve-backlight.patch
+++ b/overlays/patches/linux/eve-backlight.patch
@@ -1,4 +1,4 @@
-From ebdcad8d8d08443a7be320d3d9ab2b7790817cb6 Mon Sep 17 00:00:00 2001
+From cdae284229da87cd23cf5a59aee0031c5755694c 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 4f8337c7fd2e..87059df17e19 100644
+index 8e9ac9ba1d38..f678499577a6 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)
@@ -29,13 +29,11 @@ index 4f8337c7fd2e..87059df17e19 100644
  	    (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP)) {
  		drm_dbg_kms(&i915->drm, "AUX Backlight Control Supported!\n");
  		return true;
-
-base-commit: 62fb9874f5da54fdb243003b386128037319b219
 -- 
-2.31.1
+2.32.0
 
 
-From 520923d43072973b6d8ae843c1fbc8c2fb5c3fbb Mon Sep 17 00:00:00 2001
+From 6ecb2e6999145215df609d8b9dec39d81b037dc9 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,7 +45,7 @@ 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 3d0c035b5e38..3ac677617d9c 100644
+index aa667fa71158..a14a86637104 100644
 --- a/drivers/gpu/drm/i915/display/intel_bios.c
 +++ b/drivers/gpu/drm/i915/display/intel_bios.c
 @@ -427,7 +427,6 @@ parse_lfp_backlight(struct drm_i915_private *i915,
@@ -135,10 +133,10 @@ index dbe24d7e7375..e5fbe4927be5 100644
  
  /*
 -- 
-2.31.1
+2.32.0
 
 
-From 5917e44a62caeab598b381acb1fe888cda09f3b3 Mon Sep 17 00:00:00 2001
+From eddb091b7ad4d90b5092a38a92382e4097418e45 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 +192,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 87059df17e19..81ae9cf3bb44 100644
+index f678499577a6..edbc0f728d1b 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 +396,7 @@ index 87059df17e19..81ae9cf3bb44 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 0320878d96b0..5a58042302e0 100644
+index e07f4cfea63a..8f27cb4e094f 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,19 +410,19 @@ index 0320878d96b0..5a58042302e0 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 34ebb0662547..fa39c02336a1 100644
+index f27eceb82c0f..02b551796476 100644
 --- a/drivers/gpu/drm/i915/i915_params.h
 +++ b/drivers/gpu/drm/i915/i915_params.h
 @@ -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) \
--	param(bool, enable_gvt, false, 0400)
-+	param(bool, enable_gvt, false, 0400) \
+-	param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0)
++	param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0) \
 +	param(bool, enable_dbc, false, 0600)
  
  #define MEMBER(T, member, ...) T member;
  struct i915_params {
 -- 
-2.31.1
+2.32.0