| Message ID | 20190321132446.22394-1-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] drm/i915: Refactor EDID fixed mode search | expand |
Quoting Ville Syrjala (2019-03-21 13:24:41) > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Both LVDS and eDP have the same code to look up the preferred mode > from the connector probed_modes list. Move the code to a common > location. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On Thu, 21 Mar 2019, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Both LVDS and eDP have the same code to look up the preferred mode > from the connector probed_modes list. Move the code to a common > location. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> This series is something I've been meaning to do for ages. Thanks for doing it. Others beat me to review, I only glanced through. On the series, Acked-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 13 +++---------- > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > drivers/gpu/drm/i915/intel_lvds.c | 14 +++----------- > drivers/gpu/drm/i915/intel_panel.c | 27 +++++++++++++++++++++++++++ > 4 files changed, 35 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 7c043e8f6298..5096e99ffaad 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -7057,7 +7057,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > struct drm_display_mode *fixed_mode = NULL; > struct drm_display_mode *downclock_mode = NULL; > bool has_dpcd; > - struct drm_display_mode *scan; > enum pipe pipe = INVALID_PIPE; > intel_wakeref_t wakeref; > struct edid *edid; > @@ -7110,15 +7109,9 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > } > intel_connector->edid = edid; > > - /* prefer fixed mode from EDID if available */ > - list_for_each_entry(scan, &connector->probed_modes, head) { > - if ((scan->type & DRM_MODE_TYPE_PREFERRED)) { > - fixed_mode = drm_mode_duplicate(dev, scan); > - downclock_mode = intel_dp_drrs_init( > - intel_connector, fixed_mode); > - break; > - } > - } > + fixed_mode = intel_panel_edid_fixed_mode(intel_connector); > + if (fixed_mode) > + downclock_mode = intel_dp_drrs_init(intel_connector, fixed_mode); > > /* fallback to VBT if available for eDP */ > if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) { > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 4d7ae579fc92..4d45ed6aa097 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -2158,6 +2158,8 @@ extern struct drm_display_mode *intel_find_panel_downclock( > struct drm_i915_private *dev_priv, > struct drm_display_mode *fixed_mode, > struct drm_connector *connector); > +struct drm_display_mode * > +intel_panel_edid_fixed_mode(struct intel_connector *connector); > > #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) > int intel_backlight_device_register(struct intel_connector *connector); > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c > index 845792aa0abe..0686ad1f12df 100644 > --- a/drivers/gpu/drm/i915/intel_lvds.c > +++ b/drivers/gpu/drm/i915/intel_lvds.c > @@ -810,7 +810,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) > struct intel_connector *intel_connector; > struct drm_connector *connector; > struct drm_encoder *encoder; > - struct drm_display_mode *scan; /* *modes, *bios_mode; */ > struct drm_display_mode *fixed_mode = NULL; > struct drm_display_mode *downclock_mode = NULL; > struct edid *edid; > @@ -949,16 +948,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) > } > intel_connector->edid = edid; > > - list_for_each_entry(scan, &connector->probed_modes, head) { > - if (scan->type & DRM_MODE_TYPE_PREFERRED) { > - DRM_DEBUG_KMS("using preferred mode from EDID: "); > - drm_mode_debug_printmodeline(scan); > - > - fixed_mode = drm_mode_duplicate(dev, scan); > - if (fixed_mode) > - goto out; > - } > - } > + fixed_mode = intel_panel_edid_fixed_mode(intel_connector); > + if (fixed_mode) > + goto out; > > /* Failed to get EDID, what about VBT? */ > if (dev_priv->vbt.lfp_lvds_vbt_mode) { > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > index edd5540639b0..f42137512010 100644 > --- a/drivers/gpu/drm/i915/intel_panel.c > +++ b/drivers/gpu/drm/i915/intel_panel.c > @@ -99,6 +99,33 @@ intel_find_panel_downclock(struct drm_i915_private *dev_priv, > return NULL; > } > > +struct drm_display_mode * > +intel_panel_edid_fixed_mode(struct intel_connector *connector) > +{ > + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > + const struct drm_display_mode *scan; > + > + /* prefer fixed mode from EDID if available */ > + list_for_each_entry(scan, &connector->base.probed_modes, head) { > + struct drm_display_mode *fixed_mode; > + > + if ((scan->type & DRM_MODE_TYPE_PREFERRED) == 0) > + continue; > + > + fixed_mode = drm_mode_duplicate(&dev_priv->drm, scan); > + if (!fixed_mode) > + return NULL; > + > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] using preferred mode from EDID: ", > + connector->base.base.id, connector->base.name); > + drm_mode_debug_printmodeline(fixed_mode); > + > + return fixed_mode; > + } > + > + return NULL; > +} > + > /* adjusted_mode has been preset to be the panel's fixed mode */ > void > intel_pch_panel_fitting(struct intel_crtc *intel_crtc,
On Fri, Mar 22, 2019 at 10:32:40AM +0200, Jani Nikula wrote: > On Thu, 21 Mar 2019, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Both LVDS and eDP have the same code to look up the preferred mode > > from the connector probed_modes list. Move the code to a common > > location. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > This series is something I've been meaning to do for ages. I think I had these more or less typed up for a few years now. Finally got an excuse (the bug) to finish them ;) Series pushed to dinq. Thanks for the reviews/acks everyone. > Thanks for > doing it. Others beat me to review, I only glanced through. On the > series, > > Acked-by: Jani Nikula <jani.nikula@intel.com> > > > > --- > > drivers/gpu/drm/i915/intel_dp.c | 13 +++---------- > > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > > drivers/gpu/drm/i915/intel_lvds.c | 14 +++----------- > > drivers/gpu/drm/i915/intel_panel.c | 27 +++++++++++++++++++++++++++ > > 4 files changed, 35 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > > index 7c043e8f6298..5096e99ffaad 100644 > > --- a/drivers/gpu/drm/i915/intel_dp.c > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > @@ -7057,7 +7057,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > > struct drm_display_mode *fixed_mode = NULL; > > struct drm_display_mode *downclock_mode = NULL; > > bool has_dpcd; > > - struct drm_display_mode *scan; > > enum pipe pipe = INVALID_PIPE; > > intel_wakeref_t wakeref; > > struct edid *edid; > > @@ -7110,15 +7109,9 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > > } > > intel_connector->edid = edid; > > > > - /* prefer fixed mode from EDID if available */ > > - list_for_each_entry(scan, &connector->probed_modes, head) { > > - if ((scan->type & DRM_MODE_TYPE_PREFERRED)) { > > - fixed_mode = drm_mode_duplicate(dev, scan); > > - downclock_mode = intel_dp_drrs_init( > > - intel_connector, fixed_mode); > > - break; > > - } > > - } > > + fixed_mode = intel_panel_edid_fixed_mode(intel_connector); > > + if (fixed_mode) > > + downclock_mode = intel_dp_drrs_init(intel_connector, fixed_mode); > > > > /* fallback to VBT if available for eDP */ > > if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) { > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > > index 4d7ae579fc92..4d45ed6aa097 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -2158,6 +2158,8 @@ extern struct drm_display_mode *intel_find_panel_downclock( > > struct drm_i915_private *dev_priv, > > struct drm_display_mode *fixed_mode, > > struct drm_connector *connector); > > +struct drm_display_mode * > > +intel_panel_edid_fixed_mode(struct intel_connector *connector); > > > > #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) > > int intel_backlight_device_register(struct intel_connector *connector); > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c > > index 845792aa0abe..0686ad1f12df 100644 > > --- a/drivers/gpu/drm/i915/intel_lvds.c > > +++ b/drivers/gpu/drm/i915/intel_lvds.c > > @@ -810,7 +810,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) > > struct intel_connector *intel_connector; > > struct drm_connector *connector; > > struct drm_encoder *encoder; > > - struct drm_display_mode *scan; /* *modes, *bios_mode; */ > > struct drm_display_mode *fixed_mode = NULL; > > struct drm_display_mode *downclock_mode = NULL; > > struct edid *edid; > > @@ -949,16 +948,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) > > } > > intel_connector->edid = edid; > > > > - list_for_each_entry(scan, &connector->probed_modes, head) { > > - if (scan->type & DRM_MODE_TYPE_PREFERRED) { > > - DRM_DEBUG_KMS("using preferred mode from EDID: "); > > - drm_mode_debug_printmodeline(scan); > > - > > - fixed_mode = drm_mode_duplicate(dev, scan); > > - if (fixed_mode) > > - goto out; > > - } > > - } > > + fixed_mode = intel_panel_edid_fixed_mode(intel_connector); > > + if (fixed_mode) > > + goto out; > > > > /* Failed to get EDID, what about VBT? */ > > if (dev_priv->vbt.lfp_lvds_vbt_mode) { > > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > > index edd5540639b0..f42137512010 100644 > > --- a/drivers/gpu/drm/i915/intel_panel.c > > +++ b/drivers/gpu/drm/i915/intel_panel.c > > @@ -99,6 +99,33 @@ intel_find_panel_downclock(struct drm_i915_private *dev_priv, > > return NULL; > > } > > > > +struct drm_display_mode * > > +intel_panel_edid_fixed_mode(struct intel_connector *connector) > > +{ > > + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > > + const struct drm_display_mode *scan; > > + > > + /* prefer fixed mode from EDID if available */ > > + list_for_each_entry(scan, &connector->base.probed_modes, head) { > > + struct drm_display_mode *fixed_mode; > > + > > + if ((scan->type & DRM_MODE_TYPE_PREFERRED) == 0) > > + continue; > > + > > + fixed_mode = drm_mode_duplicate(&dev_priv->drm, scan); > > + if (!fixed_mode) > > + return NULL; > > + > > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] using preferred mode from EDID: ", > > + connector->base.base.id, connector->base.name); > > + drm_mode_debug_printmodeline(fixed_mode); > > + > > + return fixed_mode; > > + } > > + > > + return NULL; > > +} > > + > > /* adjusted_mode has been preset to be the panel's fixed mode */ > > void > > intel_pch_panel_fitting(struct intel_crtc *intel_crtc, > > -- > Jani Nikula, Intel Open Source Graphics Center
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7c043e8f6298..5096e99ffaad 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -7057,7 +7057,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, struct drm_display_mode *fixed_mode = NULL; struct drm_display_mode *downclock_mode = NULL; bool has_dpcd; - struct drm_display_mode *scan; enum pipe pipe = INVALID_PIPE; intel_wakeref_t wakeref; struct edid *edid; @@ -7110,15 +7109,9 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; - /* prefer fixed mode from EDID if available */ - list_for_each_entry(scan, &connector->probed_modes, head) { - if ((scan->type & DRM_MODE_TYPE_PREFERRED)) { - fixed_mode = drm_mode_duplicate(dev, scan); - downclock_mode = intel_dp_drrs_init( - intel_connector, fixed_mode); - break; - } - } + fixed_mode = intel_panel_edid_fixed_mode(intel_connector); + if (fixed_mode) + downclock_mode = intel_dp_drrs_init(intel_connector, fixed_mode); /* fallback to VBT if available for eDP */ if (!fixed_mode && dev_priv->vbt.lfp_lvds_vbt_mode) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 4d7ae579fc92..4d45ed6aa097 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -2158,6 +2158,8 @@ extern struct drm_display_mode *intel_find_panel_downclock( struct drm_i915_private *dev_priv, struct drm_display_mode *fixed_mode, struct drm_connector *connector); +struct drm_display_mode * +intel_panel_edid_fixed_mode(struct intel_connector *connector); #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) int intel_backlight_device_register(struct intel_connector *connector); diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 845792aa0abe..0686ad1f12df 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -810,7 +810,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) struct intel_connector *intel_connector; struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_display_mode *scan; /* *modes, *bios_mode; */ struct drm_display_mode *fixed_mode = NULL; struct drm_display_mode *downclock_mode = NULL; struct edid *edid; @@ -949,16 +948,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) } intel_connector->edid = edid; - list_for_each_entry(scan, &connector->probed_modes, head) { - if (scan->type & DRM_MODE_TYPE_PREFERRED) { - DRM_DEBUG_KMS("using preferred mode from EDID: "); - drm_mode_debug_printmodeline(scan); - - fixed_mode = drm_mode_duplicate(dev, scan); - if (fixed_mode) - goto out; - } - } + fixed_mode = intel_panel_edid_fixed_mode(intel_connector); + if (fixed_mode) + goto out; /* Failed to get EDID, what about VBT? */ if (dev_priv->vbt.lfp_lvds_vbt_mode) { diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index edd5540639b0..f42137512010 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -99,6 +99,33 @@ intel_find_panel_downclock(struct drm_i915_private *dev_priv, return NULL; } +struct drm_display_mode * +intel_panel_edid_fixed_mode(struct intel_connector *connector) +{ + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); + const struct drm_display_mode *scan; + + /* prefer fixed mode from EDID if available */ + list_for_each_entry(scan, &connector->base.probed_modes, head) { + struct drm_display_mode *fixed_mode; + + if ((scan->type & DRM_MODE_TYPE_PREFERRED) == 0) + continue; + + fixed_mode = drm_mode_duplicate(&dev_priv->drm, scan); + if (!fixed_mode) + return NULL; + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] using preferred mode from EDID: ", + connector->base.base.id, connector->base.name); + drm_mode_debug_printmodeline(fixed_mode); + + return fixed_mode; + } + + return NULL; +} + /* adjusted_mode has been preset to be the panel's fixed mode */ void intel_pch_panel_fitting(struct intel_crtc *intel_crtc,