mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 13:43:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Combine the EDID fixed_mode+downclock_mode lookup into one

Browse Source 
The intel_panel_add_edid_fixed_mode() vs.
intel_panel_add_edid_downclock_mode() split is not really
helpful. Let's just roll those into a single function so
that the connector init code doesn't have to care too much
about this. All we need to know is whether DRRS should be
allowed or not.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220331112822.11462-6-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä
2022-03-31 14:28:16 +03:00
parent 05d2d45e87
commit 3a3c4ce929
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/display/intel_dp.c
View File

@@ -5072,10 +5072,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
}
intel_connector->edid = edid;
intel_panel_add_edid_fixed_mode(intel_connector);
if (intel_panel_preferred_fixed_mode(intel_connector) &&
intel_edp_has_drrs(intel_dp))
intel_panel_add_edid_downclock_mode(intel_connector);
intel_panel_add_edid_fixed_modes(intel_connector,
intel_edp_has_drrs(intel_dp));
/* MSO requires information from the EDID */
intel_edp_mso_init(intel_dp);

2
drivers/gpu/drm/i915/display/intel_lvds.c
View File

@@ -968,7 +968,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
intel_connector->edid = edid;
/* Try EDID first */
intel_panel_add_edid_fixed_mode(intel_connector);
intel_panel_add_edid_fixed_modes(intel_connector, false);
/* Failed to get EDID, what about VBT? */
if (!intel_panel_preferred_fixed_mode(intel_connector))

11
drivers/gpu/drm/i915/display/intel_panel.c
View File

@@ -159,7 +159,7 @@ static bool is_downclock_mode(const struct drm_display_mode *downclock_mode,
downclock_mode->clock < fixed_mode->clock;
}
void intel_panel_add_edid_downclock_mode(struct intel_connector *connector)
static void intel_panel_add_edid_downclock_mode(struct intel_connector *connector)
{
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
const struct drm_display_mode *fixed_mode =
@@ -202,7 +202,7 @@ void intel_panel_add_edid_downclock_mode(struct intel_connector *connector)
list_add_tail(&downclock_mode->head, &connector->panel.fixed_modes);
}
void intel_panel_add_edid_fixed_mode(struct intel_connector *connector)
static void intel_panel_add_edid_fixed_mode(struct intel_connector *connector)
{
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
const struct drm_display_mode *scan;
@@ -244,6 +244,13 @@ void intel_panel_add_edid_fixed_mode(struct intel_connector *connector)
list_add_tail(&fixed_mode->head, &connector->panel.fixed_modes);
}
void intel_panel_add_edid_fixed_modes(struct intel_connector *connector, bool has_drrs)
{
intel_panel_add_edid_fixed_mode(connector);
if (intel_panel_preferred_fixed_mode(connector) && has_drrs)
intel_panel_add_edid_downclock_mode(connector);
}
static void intel_panel_add_fixed_mode(struct intel_connector *connector,
struct drm_display_mode *fixed_mode,
const char *type)

3
drivers/gpu/drm/i915/display/intel_panel.h
View File

@@ -40,8 +40,7 @@ int intel_panel_fitting(struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state);
int intel_panel_compute_config(struct intel_connector *connector,
struct drm_display_mode *adjusted_mode);
void intel_panel_add_edid_fixed_mode(struct intel_connector *connector);
void intel_panel_add_edid_downclock_mode(struct intel_connector *connector);
void intel_panel_add_edid_fixed_modes(struct intel_connector *connector, bool has_drrs);
void intel_panel_add_vbt_lfp_fixed_mode(struct intel_connector *connector);
void intel_panel_add_vbt_sdvo_fixed_mode(struct intel_connector *connector);
void intel_panel_add_encoder_fixed_mode(struct intel_connector *connector,

2
drivers/gpu/drm/i915/display/intel_sdvo.c
View File

@@ -2907,7 +2907,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
if (!intel_panel_preferred_fixed_mode(intel_connector)) {
intel_ddc_get_modes(connector, &intel_sdvo->ddc);
intel_panel_add_edid_fixed_mode(intel_connector);
intel_panel_add_edid_fixed_modes(intel_connector, false);
}
intel_panel_init(intel_connector);