| Message ID | 20240209183809.16887-6-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: PLL state check stuff | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville Syrjala > Sent: Friday, February 9, 2024 8:38 PM > To: intel-gfx@lists.freedesktop.org > Subject: [PATCH 5/5] drm/i915: Enable fastboot across the board > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > There's nothing magical about vlv+ platforms vs. fastboot. > If it works somewhere it should work everywhere, assuming we've not missed any crucial state checks. That seems unlikely on > older platforms with less state to check anyway. > > Just enable fastboot across the board, and the remove the remnants of the optional stuff (we already removed the modparam for > fastboot anyway). > Reviewed-by: Mika Kahola <mika.kahola@intel.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 22 -------------------- > 1 file changed, 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 66ee6749fdae..00ac65a14029 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -4937,20 +4937,6 @@ pipe_config_pll_mismatch(bool fastset, > } > } > > -static bool fastboot_enabled(struct drm_i915_private *dev_priv) -{ > - /* Enable fastboot by default on Skylake and newer */ > - if (DISPLAY_VER(dev_priv) >= 9) > - return true; > - > - /* Enable fastboot by default on VLV and CHV */ > - if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > - return true; > - > - /* Disabled by default on all others */ > - return false; > -} > - > bool > intel_pipe_config_compare(const struct intel_crtc_state *current_config, > const struct intel_crtc_state *pipe_config, @@ -4959,14 +4945,6 @@ intel_pipe_config_compare(const > struct intel_crtc_state *current_config, > struct drm_i915_private *dev_priv = to_i915(current_config->uapi.crtc->dev); > struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); > bool ret = true; > - bool fixup_inherited = fastset && > - current_config->inherited && !pipe_config->inherited; > - > - if (fixup_inherited && !fastboot_enabled(dev_priv)) { > - drm_dbg_kms(&dev_priv->drm, > - "initial modeset and fastboot not set\n"); > - ret = false; > - } > > #define PIPE_CONF_CHECK_X(name) do { \ > if (current_config->name != pipe_config->name) { \ > -- > 2.43.0
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 66ee6749fdae..00ac65a14029 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -4937,20 +4937,6 @@ pipe_config_pll_mismatch(bool fastset, } } -static bool fastboot_enabled(struct drm_i915_private *dev_priv) -{ - /* Enable fastboot by default on Skylake and newer */ - if (DISPLAY_VER(dev_priv) >= 9) - return true; - - /* Enable fastboot by default on VLV and CHV */ - if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) - return true; - - /* Disabled by default on all others */ - return false; -} - bool intel_pipe_config_compare(const struct intel_crtc_state *current_config, const struct intel_crtc_state *pipe_config, @@ -4959,14 +4945,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, struct drm_i915_private *dev_priv = to_i915(current_config->uapi.crtc->dev); struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); bool ret = true; - bool fixup_inherited = fastset && - current_config->inherited && !pipe_config->inherited; - - if (fixup_inherited && !fastboot_enabled(dev_priv)) { - drm_dbg_kms(&dev_priv->drm, - "initial modeset and fastboot not set\n"); - ret = false; - } #define PIPE_CONF_CHECK_X(name) do { \ if (current_config->name != pipe_config->name) { \