Update to 5.10.6

Update patches to v5 version from Lyude

1 files changed, 363 insertions, 0 deletions

diff --git a/0001-drm-i915-refactor-panel-backlight-control-functions..patch b/0001-drm-i915-refactor-panel-backlight-control-functions..patch
new file mode 100644
index 000000000000..98ed8d6bfd08
--- /dev/null
+++ b/0001-drm-i915-refactor-panel-backlight-control-functions..patch
@@ -0,0 +1,363 @@
+From 9bfe1f9a243769aa8b225f948df388d7de36a593 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Tue, 1 Dec 2020 07:09:45 +1000
+Subject: [PATCH 01/10] drm/i915: refactor panel backlight control functions.
+ (v2)
+
+This moves the functions into static const instead of having
+funcs and data in the same struct.
+
+It leaves the power callback alone, as it is used in a different
+manner.
+
+v2: leave power callback alone (Jani)
+
+Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20201130210945.31850-1-airlied@gmail.com
+---
+ .../drm/i915/display/intel_display_types.h    |  20 ++-
+ .../drm/i915/display/intel_dp_aux_backlight.c |  14 +-
+ .../i915/display/intel_dsi_dcs_backlight.c    |  14 +-
+ drivers/gpu/drm/i915/display/intel_panel.c    | 153 +++++++++++-------
+ 4 files changed, 127 insertions(+), 74 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
+index 3d4bf9b6a0a2..0e5d158f1691 100644
+--- a/drivers/gpu/drm/i915/display/intel_display_types.h
++++ b/drivers/gpu/drm/i915/display/intel_display_types.h
+@@ -205,6 +205,17 @@ struct intel_encoder {
+ 	const struct drm_connector *audio_connector;
+ };
+ 
++struct intel_panel_bl_funcs {
++	/* Connector and platform specific backlight functions */
++	int (*setup)(struct intel_connector *connector, enum pipe pipe);
++	u32 (*get)(struct intel_connector *connector);
++	void (*set)(const struct drm_connector_state *conn_state, u32 level);
++	void (*disable)(const struct drm_connector_state *conn_state);
++	void (*enable)(const struct intel_crtc_state *crtc_state,
++		       const struct drm_connector_state *conn_state);
++	u32 (*hz_to_pwm)(struct intel_connector *connector, u32 hz);
++};
++
+ struct intel_panel {
+ 	struct drm_display_mode *fixed_mode;
+ 	struct drm_display_mode *downclock_mode;
+@@ -231,14 +242,7 @@ struct intel_panel {
+ 
+ 		struct backlight_device *device;
+ 
+-		/* Connector and platform specific backlight functions */
+-		int (*setup)(struct intel_connector *connector, enum pipe pipe);
+-		u32 (*get)(struct intel_connector *connector);
+-		void (*set)(const struct drm_connector_state *conn_state, u32 level);
+-		void (*disable)(const struct drm_connector_state *conn_state);
+-		void (*enable)(const struct intel_crtc_state *crtc_state,
+-			       const struct drm_connector_state *conn_state);
+-		u32 (*hz_to_pwm)(struct intel_connector *connector, u32 hz);
++		const struct intel_panel_bl_funcs *funcs;
+ 		void (*power)(struct intel_connector *, bool enable);
+ 	} backlight;
+ };
+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 036f504ac7db..b2f713e7da6b 100644
+--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
++++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+@@ -351,6 +351,14 @@ intel_dp_aux_display_control_capable(struct intel_connector *connector)
+ 	return false;
+ }
+ 
++static const struct intel_panel_bl_funcs intel_dp_bl_funcs = {
++	.setup = intel_dp_aux_setup_backlight,
++	.enable = intel_dp_aux_enable_backlight,
++	.disable = intel_dp_aux_disable_backlight,
++	.set = intel_dp_aux_set_backlight,
++	.get = intel_dp_aux_get_backlight,
++};
++
+ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)
+ {
+ 	struct intel_panel *panel = &intel_connector->panel;
+@@ -380,11 +388,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)
+ 		return -ENODEV;
+ 	}
+ 
+-	panel->backlight.setup = intel_dp_aux_setup_backlight;
+-	panel->backlight.enable = intel_dp_aux_enable_backlight;
+-	panel->backlight.disable = intel_dp_aux_disable_backlight;
+-	panel->backlight.set = intel_dp_aux_set_backlight;
+-	panel->backlight.get = intel_dp_aux_get_backlight;
++	panel->backlight.funcs = &intel_dp_bl_funcs;
+ 
+ 	return 0;
+ }
+diff --git a/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c b/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
+index b53c50372918..5c508d51f526 100644
+--- a/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
++++ b/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
+@@ -156,6 +156,14 @@ static int dcs_setup_backlight(struct intel_connector *connector,
+ 	return 0;
+ }
+ 
++static const struct intel_panel_bl_funcs dcs_bl_funcs = {
++	.setup = dcs_setup_backlight,
++	.enable = dcs_enable_backlight,
++	.disable = dcs_disable_backlight,
++	.set = dcs_set_backlight,
++	.get = dcs_get_backlight,
++};
++
+ int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector)
+ {
+ 	struct drm_device *dev = intel_connector->base.dev;
+@@ -169,11 +177,7 @@ int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector)
+ 	if (drm_WARN_ON(dev, encoder->type != INTEL_OUTPUT_DSI))
+ 		return -EINVAL;
+ 
+-	panel->backlight.setup = dcs_setup_backlight;
+-	panel->backlight.enable = dcs_enable_backlight;
+-	panel->backlight.disable = dcs_disable_backlight;
+-	panel->backlight.set = dcs_set_backlight;
+-	panel->backlight.get = dcs_get_backlight;
++	panel->backlight.funcs = &dcs_bl_funcs;
+ 
+ 	return 0;
+ }
+diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
+index 9f23bac0d792..36b7693453ae 100644
+--- a/drivers/gpu/drm/i915/display/intel_panel.c
++++ b/drivers/gpu/drm/i915/display/intel_panel.c
+@@ -684,7 +684,7 @@ intel_panel_actually_set_backlight(const struct drm_connector_state *conn_state,
+ 	drm_dbg_kms(&i915->drm, "set backlight PWM = %d\n", level);
+ 
+ 	level = intel_panel_compute_brightness(connector, level);
+-	panel->backlight.set(conn_state, level);
++	panel->backlight.funcs->set(conn_state, level);
+ }
+ 
+ /* set backlight brightness to level in range [0..max], assuming hw min is
+@@ -870,7 +870,7 @@ void intel_panel_disable_backlight(const struct drm_connector_state *old_conn_st
+ 	if (panel->backlight.device)
+ 		panel->backlight.device->props.power = FB_BLANK_POWERDOWN;
+ 	panel->backlight.enabled = false;
+-	panel->backlight.disable(old_conn_state);
++	panel->backlight.funcs->disable(old_conn_state);
+ 
+ 	mutex_unlock(&dev_priv->backlight_lock);
+ }
+@@ -1198,7 +1198,7 @@ static void __intel_panel_enable_backlight(const struct intel_crtc_state *crtc_s
+ 						 panel->backlight.device->props.max_brightness);
+ 	}
+ 
+-	panel->backlight.enable(crtc_state, conn_state);
++	panel->backlight.funcs->enable(crtc_state, conn_state);
+ 	panel->backlight.enabled = true;
+ 	if (panel->backlight.device)
+ 		panel->backlight.device->props.power = FB_BLANK_UNBLANK;
+@@ -1234,7 +1234,7 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)
+ 	mutex_lock(&dev_priv->backlight_lock);
+ 
+ 	if (panel->backlight.enabled) {
+-		val = panel->backlight.get(connector);
++		val = panel->backlight.funcs->get(connector);
+ 		val = intel_panel_compute_brightness(connector, val);
+ 	}
+ 
+@@ -1567,13 +1567,13 @@ static u32 get_backlight_max_vbt(struct intel_connector *connector)
+ 	u16 pwm_freq_hz = get_vbt_pwm_freq(dev_priv);
+ 	u32 pwm;
+ 
+-	if (!panel->backlight.hz_to_pwm) {
++	if (!panel->backlight.funcs->hz_to_pwm) {
+ 		drm_dbg_kms(&dev_priv->drm,
+ 			    "backlight frequency conversion not supported\n");
+ 		return 0;
+ 	}
+ 
+-	pwm = panel->backlight.hz_to_pwm(connector, pwm_freq_hz);
++	pwm = panel->backlight.funcs->hz_to_pwm(connector, pwm_freq_hz);
+ 	if (!pwm) {
+ 		drm_dbg_kms(&dev_priv->drm,
+ 			    "backlight frequency conversion failed\n");
+@@ -1981,12 +1981,12 @@ int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
+ 	}
+ 
+ 	/* ensure intel_panel has been initialized first */
+-	if (drm_WARN_ON(&dev_priv->drm, !panel->backlight.setup))
++	if (drm_WARN_ON(&dev_priv->drm, !panel->backlight.funcs))
+ 		return -ENODEV;
+ 
+ 	/* set level and max in panel struct */
+ 	mutex_lock(&dev_priv->backlight_lock);
+-	ret = panel->backlight.setup(intel_connector, pipe);
++	ret = panel->backlight.funcs->setup(intel_connector, pipe);
+ 	mutex_unlock(&dev_priv->backlight_lock);
+ 
+ 	if (ret) {
+@@ -2016,6 +2016,86 @@ static void intel_panel_destroy_backlight(struct intel_panel *panel)
+ 	panel->backlight.present = false;
+ }
+ 
++static const struct intel_panel_bl_funcs bxt_funcs = {
++	.setup = bxt_setup_backlight,
++	.enable = bxt_enable_backlight,
++	.disable = bxt_disable_backlight,
++	.set = bxt_set_backlight,
++	.get = bxt_get_backlight,
++	.hz_to_pwm = bxt_hz_to_pwm,
++};
++
++static const struct intel_panel_bl_funcs cnp_funcs = {
++	.setup = cnp_setup_backlight,
++	.enable = cnp_enable_backlight,
++	.disable = cnp_disable_backlight,
++	.set = bxt_set_backlight,
++	.get = bxt_get_backlight,
++	.hz_to_pwm = cnp_hz_to_pwm,
++};
++
++static const struct intel_panel_bl_funcs lpt_funcs = {
++	.setup = lpt_setup_backlight,
++	.enable = lpt_enable_backlight,
++	.disable = lpt_disable_backlight,
++	.set = lpt_set_backlight,
++	.get = lpt_get_backlight,
++	.hz_to_pwm = lpt_hz_to_pwm,
++};
++
++static const struct intel_panel_bl_funcs spt_funcs = {
++	.setup = lpt_setup_backlight,
++	.enable = lpt_enable_backlight,
++	.disable = lpt_disable_backlight,
++	.set = lpt_set_backlight,
++	.get = lpt_get_backlight,
++	.hz_to_pwm = spt_hz_to_pwm,
++};
++
++static const struct intel_panel_bl_funcs pch_funcs = {
++	.setup = pch_setup_backlight,
++	.enable = pch_enable_backlight,
++	.disable = pch_disable_backlight,
++	.set = pch_set_backlight,
++	.get = pch_get_backlight,
++	.hz_to_pwm = pch_hz_to_pwm,
++};
++
++static const struct intel_panel_bl_funcs pwm_funcs = {
++	.setup = pwm_setup_backlight,
++	.enable = pwm_enable_backlight,
++	.disable = pwm_disable_backlight,
++	.set = pwm_set_backlight,
++	.get = pwm_get_backlight,
++};
++
++static const struct intel_panel_bl_funcs vlv_funcs = {
++	.setup = vlv_setup_backlight,
++	.enable = vlv_enable_backlight,
++	.disable = vlv_disable_backlight,
++	.set = vlv_set_backlight,
++	.get = vlv_get_backlight,
++	.hz_to_pwm = vlv_hz_to_pwm,
++};
++
++static const struct intel_panel_bl_funcs i965_funcs = {
++	.setup = i965_setup_backlight,
++	.enable = i965_enable_backlight,
++	.disable = i965_disable_backlight,
++	.set = i9xx_set_backlight,
++	.get = i9xx_get_backlight,
++	.hz_to_pwm = i965_hz_to_pwm,
++};
++
++static const struct intel_panel_bl_funcs i9xx_funcs = {
++	.setup = i9xx_setup_backlight,
++	.enable = i9xx_enable_backlight,
++	.disable = i9xx_disable_backlight,
++	.set = i9xx_set_backlight,
++	.get = i9xx_get_backlight,
++	.hz_to_pwm = i9xx_hz_to_pwm,
++};
++
+ /* Set up chip specific backlight functions */
+ static void
+ intel_panel_init_backlight_funcs(struct intel_panel *panel)
+@@ -2033,65 +2113,26 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
+ 		return;
+ 
+ 	if (IS_GEN9_LP(dev_priv)) {
+-		panel->backlight.setup = bxt_setup_backlight;
+-		panel->backlight.enable = bxt_enable_backlight;
+-		panel->backlight.disable = bxt_disable_backlight;
+-		panel->backlight.set = bxt_set_backlight;
+-		panel->backlight.get = bxt_get_backlight;
+-		panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
++		panel->backlight.funcs = &bxt_funcs;
+ 	} else if (INTEL_PCH_TYPE(dev_priv) >= PCH_CNP) {
+-		panel->backlight.setup = cnp_setup_backlight;
+-		panel->backlight.enable = cnp_enable_backlight;
+-		panel->backlight.disable = cnp_disable_backlight;
+-		panel->backlight.set = bxt_set_backlight;
+-		panel->backlight.get = bxt_get_backlight;
+-		panel->backlight.hz_to_pwm = cnp_hz_to_pwm;
++		panel->backlight.funcs = &cnp_funcs;
+ 	} else if (INTEL_PCH_TYPE(dev_priv) >= PCH_LPT) {
+-		panel->backlight.setup = lpt_setup_backlight;
+-		panel->backlight.enable = lpt_enable_backlight;
+-		panel->backlight.disable = lpt_disable_backlight;
+-		panel->backlight.set = lpt_set_backlight;
+-		panel->backlight.get = lpt_get_backlight;
+ 		if (HAS_PCH_LPT(dev_priv))
+-			panel->backlight.hz_to_pwm = lpt_hz_to_pwm;
++			panel->backlight.funcs = &lpt_funcs;
+ 		else
+-			panel->backlight.hz_to_pwm = spt_hz_to_pwm;
++			panel->backlight.funcs = &spt_funcs;
+ 	} else if (HAS_PCH_SPLIT(dev_priv)) {
+-		panel->backlight.setup = pch_setup_backlight;
+-		panel->backlight.enable = pch_enable_backlight;
+-		panel->backlight.disable = pch_disable_backlight;
+-		panel->backlight.set = pch_set_backlight;
+-		panel->backlight.get = pch_get_backlight;
+-		panel->backlight.hz_to_pwm = pch_hz_to_pwm;
++		panel->backlight.funcs = &pch_funcs;
+ 	} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+ 		if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) {
+-			panel->backlight.setup = pwm_setup_backlight;
+-			panel->backlight.enable = pwm_enable_backlight;
+-			panel->backlight.disable = pwm_disable_backlight;
+-			panel->backlight.set = pwm_set_backlight;
+-			panel->backlight.get = pwm_get_backlight;
++			panel->backlight.funcs = &pwm_funcs;
+ 		} else {
+-			panel->backlight.setup = vlv_setup_backlight;
+-			panel->backlight.enable = vlv_enable_backlight;
+-			panel->backlight.disable = vlv_disable_backlight;
+-			panel->backlight.set = vlv_set_backlight;
+-			panel->backlight.get = vlv_get_backlight;
+-			panel->backlight.hz_to_pwm = vlv_hz_to_pwm;
++			panel->backlight.funcs = &vlv_funcs;
+ 		}
+ 	} else if (IS_GEN(dev_priv, 4)) {
+-		panel->backlight.setup = i965_setup_backlight;
+-		panel->backlight.enable = i965_enable_backlight;
+-		panel->backlight.disable = i965_disable_backlight;
+-		panel->backlight.set = i9xx_set_backlight;
+-		panel->backlight.get = i9xx_get_backlight;
+-		panel->backlight.hz_to_pwm = i965_hz_to_pwm;
++		panel->backlight.funcs = &i965_funcs;
+ 	} else {
+-		panel->backlight.setup = i9xx_setup_backlight;
+-		panel->backlight.enable = i9xx_enable_backlight;
+-		panel->backlight.disable = i9xx_disable_backlight;
+-		panel->backlight.set = i9xx_set_backlight;
+-		panel->backlight.get = i9xx_get_backlight;
+-		panel->backlight.hz_to_pwm = i9xx_hz_to_pwm;
++		panel->backlight.funcs = &i9xx_funcs;
+ 	}
+ }
+ 
+-- 
+2.29.2
+