Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'

2 files changed, 10 insertions, 113 deletions

diff --git a/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch b/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch
index 0e82646855bd..7485fcc69f8b 100644
--- a/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch
+++ b/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch
@@ -1,4 +1,4 @@
-From 26fb22ee6b075aacf849c128f54fad07a3b45316 Mon Sep 17 00:00:00 2001
+From 796721d5e0529a952e905497b2d57d2d471799af Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Mon, 29 Mar 2021 14:12:17 +0000
 Subject: [PATCH] Support reading auth token from file descriptor
@@ -14,7 +14,7 @@ This is a quick hack:
  1 file changed, 25 insertions(+), 1 deletion(-)
 
 diff --git a/internal/config/from_env.go b/internal/config/from_env.go
-index 97a5e5b4..f2e758bc 100644
+index 6373f169..1af9dfe6 100644
 --- a/internal/config/from_env.go
 +++ b/internal/config/from_env.go
 @@ -2,13 +2,16 @@ package config
@@ -25,7 +25,7 @@ index 97a5e5b4..f2e758bc 100644
  	"os"
 +	"strconv"
  
- 	"github.com/cli/cli/internal/ghinstance"
+ 	"github.com/cli/cli/v2/internal/ghinstance"
  )
  
  const (
@@ -73,5 +73,5 @@ index 97a5e5b4..f2e758bc 100644
  		os.Getenv(GH_TOKEN) != "" ||
  		os.Getenv(GITHUB_TOKEN) != ""
 -- 
-2.30.0
+2.33.0
 
diff --git a/overlays/patches/linux/eve-backlight.patch b/overlays/patches/linux/eve-backlight.patch
index f10ca7a51ac5..02f6b39b0e5d 100644
--- a/overlays/patches/linux/eve-backlight.patch
+++ b/overlays/patches/linux/eve-backlight.patch
@@ -1,7 +1,7 @@
-From cdae284229da87cd23cf5a59aee0031c5755694c Mon Sep 17 00:00:00 2001
+From bf76d1b99b14e3847f4abef54f7a0bfb505bf0a4 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
+Subject: [PATCH 1/2] Revert "drm/i915/dp: Don't use DPCD backlights that need
  PWM enable/disable"
 
 This reverts commit fe7d52bccab674a22776a2f31236bf4232e85410.
@@ -30,116 +30,13 @@ index 8e9ac9ba1d38..f678499577a6 100644
  		drm_dbg_kms(&i915->drm, "AUX Backlight Control Supported!\n");
  		return true;
 -- 
-2.32.0
+2.33.0
 
 
-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+"
-
-This reverts commit d381baad29b43511a7fc34c64402ef65029ab281.
----
- drivers/gpu/drm/i915/display/intel_bios.c     | 30 ++-----------------
- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 12 ++------
- 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 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,
- 	const struct bdb_lfp_backlight_data *backlight_data;
- 	const struct lfp_backlight_data_entry *entry;
- 	int panel_type = i915->vbt.panel_type;
--	u16 level;
- 
- 	backlight_data = find_section(bdb, BDB_LVDS_BACKLIGHT);
- 	if (!backlight_data)
-@@ -462,39 +461,14 @@ parse_lfp_backlight(struct drm_i915_private *i915,
- 
- 	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;
--		bool scale;
--
--		level = backlight_data->brightness_level[panel_type].level;
--		min_level = backlight_data->brightness_min_level[panel_type].level;
--
--		if (bdb->version >= 236)
--			scale = backlight_data->brightness_precision_bits[panel_type] == 16;
--		else
--			scale = level > 255;
--
--		if (scale)
--			min_level = min_level / 255;
--
--		if (min_level > 255) {
--			drm_warn(&i915->drm, "Brightness min level > 255\n");
--			level = 255;
--		}
--		i915->vbt.backlight.min_brightness = min_level;
--	} else {
--		level = backlight_data->level[panel_type];
--		i915->vbt.backlight.min_brightness = entry->min_brightness;
--	}
--
-+	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",
- 		    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],
- 		    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 dbe24d7e7375..e5fbe4927be5 100644
---- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
-+++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
-@@ -799,7 +799,7 @@ struct lfp_backlight_data_entry {
- 	u8 active_low_pwm:1;
- 	u8 obsolete1:5;
- 	u16 pwm_freq_hz;
--	u8 min_brightness; /* Obsolete from 234+ */
-+	u8 min_brightness;
- 	u8 obsolete2;
- 	u8 obsolete3;
- } __packed;
-@@ -809,19 +809,11 @@ struct lfp_backlight_control_method {
- 	u8 controller:4;
- } __packed;
- 
--struct lfp_brightness_level {
--	u16 level;
--	u16 reserved;
--} __packed;
--
- struct bdb_lfp_backlight_data {
- 	u8 entry_size;
- 	struct lfp_backlight_data_entry data[16];
--	u8 level[16]; /* Obsolete from 234+ */
-+	u8 level[16];
- 	struct lfp_backlight_control_method backlight_control[16];
--	struct lfp_brightness_level brightness_level[16];		/* 234+ */
--	struct lfp_brightness_level brightness_min_level[16];	/* 234+ */
--	u8 brightness_precision_bits[16];						/* 236+ */
- } __packed;
- 
- /*
--- 
-2.32.0
-
-
-From eddb091b7ad4d90b5092a38a92382e4097418e45 Mon Sep 17 00:00:00 2001
+From af00b92f217e559e4f2c5a852a84bc2843d00c3b 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
+Subject: [PATCH 2/2] CHROMIUM: Changes needed for backlight control on Eve-5.4
 
  #1: Port https://crrev.com/c/439873 to the 5.4 tree
  #2: Port https://crrev.com/c/440445 to the 5.4 tree
@@ -424,5 +321,5 @@ index f27eceb82c0f..02b551796476 100644
  #define MEMBER(T, member, ...) T member;
  struct i915_params {
 -- 
-2.32.0
+2.33.0