| 1 |
From b2ab400df0bdefb1cd54e53022a94a251b24ff35 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Sasha Levin <sashal@kernel.org> |
| 3 |
Date: Tue, 27 Sep 2022 21:06:13 +0300 |
| 4 |
Subject: drm/i915: Simplify intel_panel_add_edid_alt_fixed_modes() |
| 5 |
MIME-Version: 1.0 |
| 6 |
Content-Type: text/plain; charset=UTF-8 |
| 7 |
Content-Transfer-Encoding: 8bit |
| 8 |
|
| 9 |
From: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| 10 |
|
| 11 |
[ Upstream commit d372ec94a018c3a19dad71e2ee3478126394d9fc ] |
| 12 |
|
| 13 |
Since commit a5810f551d0a ("drm/i915: Allow more varied alternate |
| 14 |
fixed modes for panels") intel_panel_add_edid_alt_fixed_modes() |
| 15 |
no longer considers vrr vs. drrs separately. So no reason to |
| 16 |
pass them as separate parameters either. |
| 17 |
|
| 18 |
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| 19 |
Link: https://patchwork.freedesktop.org/patch/msgid/20220927180615.25476-2-ville.syrjala@linux.intel.com |
| 20 |
Reviewed-by: Jani Nikula <jani.nikula@intel.com> |
| 21 |
(cherry picked from commit eb89e83c152b122a94e79527d63cb7c79823c37e) |
| 22 |
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> |
| 23 |
Stable-dep-of: 12caf46cf4fc ("drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs") |
| 24 |
Signed-off-by: Sasha Levin <sashal@kernel.org> |
| 25 |
--- |
| 26 |
drivers/gpu/drm/i915/display/intel_dp.c | 2 +- |
| 27 |
drivers/gpu/drm/i915/display/intel_lvds.c | 3 +-- |
| 28 |
drivers/gpu/drm/i915/display/intel_panel.c | 4 ++-- |
| 29 |
drivers/gpu/drm/i915/display/intel_panel.h | 2 +- |
| 30 |
drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- |
| 31 |
5 files changed, 6 insertions(+), 7 deletions(-) |
| 32 |
|
| 33 |
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c |
| 34 |
index d4492b6d23d2..21ba510716b6 100644 |
| 35 |
--- a/drivers/gpu/drm/i915/display/intel_dp.c |
| 36 |
+++ b/drivers/gpu/drm/i915/display/intel_dp.c |
| 37 |
@@ -5233,7 +5233,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, |
| 38 |
encoder->devdata, IS_ERR(edid) ? NULL : edid); |
| 39 |
|
| 40 |
intel_panel_add_edid_fixed_modes(intel_connector, |
| 41 |
- intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE, |
| 42 |
+ intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE || |
| 43 |
intel_vrr_is_capable(intel_connector)); |
| 44 |
|
| 45 |
/* MSO requires information from the EDID */ |
| 46 |
diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c |
| 47 |
index 730480ac3300..c0bec3e0f0ae 100644 |
| 48 |
--- a/drivers/gpu/drm/i915/display/intel_lvds.c |
| 49 |
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c |
| 50 |
@@ -972,8 +972,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) |
| 51 |
|
| 52 |
/* Try EDID first */ |
| 53 |
intel_panel_add_edid_fixed_modes(intel_connector, |
| 54 |
- intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE, |
| 55 |
- false); |
| 56 |
+ intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE); |
| 57 |
|
| 58 |
/* Failed to get EDID, what about VBT? */ |
| 59 |
if (!intel_panel_preferred_fixed_mode(intel_connector)) |
| 60 |
diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c |
| 61 |
index cb44984bb9a2..1e008922b95d 100644 |
| 62 |
--- a/drivers/gpu/drm/i915/display/intel_panel.c |
| 63 |
+++ b/drivers/gpu/drm/i915/display/intel_panel.c |
| 64 |
@@ -238,10 +238,10 @@ static void intel_panel_destroy_probed_modes(struct intel_connector *connector) |
| 65 |
} |
| 66 |
|
| 67 |
void intel_panel_add_edid_fixed_modes(struct intel_connector *connector, |
| 68 |
- bool has_drrs, bool has_vrr) |
| 69 |
+ bool use_alt_fixed_modes) |
| 70 |
{ |
| 71 |
intel_panel_add_edid_preferred_mode(connector); |
| 72 |
- if (intel_panel_preferred_fixed_mode(connector) && (has_drrs || has_vrr)) |
| 73 |
+ if (intel_panel_preferred_fixed_mode(connector) && use_alt_fixed_modes) |
| 74 |
intel_panel_add_edid_alt_fixed_modes(connector); |
| 75 |
intel_panel_destroy_probed_modes(connector); |
| 76 |
} |
| 77 |
diff --git a/drivers/gpu/drm/i915/display/intel_panel.h b/drivers/gpu/drm/i915/display/intel_panel.h |
| 78 |
index b087c0c3cc6d..4a94bd0eae3b 100644 |
| 79 |
--- a/drivers/gpu/drm/i915/display/intel_panel.h |
| 80 |
+++ b/drivers/gpu/drm/i915/display/intel_panel.h |
| 81 |
@@ -41,7 +41,7 @@ int intel_panel_fitting(struct intel_crtc_state *crtc_state, |
| 82 |
int intel_panel_compute_config(struct intel_connector *connector, |
| 83 |
struct drm_display_mode *adjusted_mode); |
| 84 |
void intel_panel_add_edid_fixed_modes(struct intel_connector *connector, |
| 85 |
- bool has_drrs, bool has_vrr); |
| 86 |
+ bool use_alt_fixed_modes); |
| 87 |
void intel_panel_add_vbt_lfp_fixed_mode(struct intel_connector *connector); |
| 88 |
void intel_panel_add_vbt_sdvo_fixed_mode(struct intel_connector *connector); |
| 89 |
void intel_panel_add_encoder_fixed_mode(struct intel_connector *connector, |
| 90 |
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c |
| 91 |
index b5f65b093c10..282820fe55b5 100644 |
| 92 |
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c |
| 93 |
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c |
| 94 |
@@ -2901,7 +2901,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) |
| 95 |
|
| 96 |
if (!intel_panel_preferred_fixed_mode(intel_connector)) { |
| 97 |
intel_ddc_get_modes(connector, &intel_sdvo->ddc); |
| 98 |
- intel_panel_add_edid_fixed_modes(intel_connector, false, false); |
| 99 |
+ intel_panel_add_edid_fixed_modes(intel_connector, false); |
| 100 |
} |
| 101 |
|
| 102 |
intel_panel_init(intel_connector); |
| 103 |
-- |
| 104 |
2.35.1 |
| 105 |
|
Parent Directory
| 
Revision Log