Re: [Intel-xe] [PATCH 2/2] Revert "FIXME: drm/i915: xe doesn't have fastboot module parameter"

[Jani Nikula <jani.nikula@linux.intel.com>]

On Mon, 25 Sep 2023, "Shankar, Uma" <uma.shankar@intel.com> wrote:
>> -----Original Message-----
>> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Arun R
>> Murthy
>> Sent: Sunday, September 24, 2023 8:18 PM
>> To: intel-xe@lists.freedesktop.org
>> Cc: Murthy, Arun R <arun.r.murthy@intel.com>
>> Subject: [Intel-xe] [PATCH 2/2] Revert "FIXME: drm/i915: xe doesn't have fastboot
>> module parameter"
>> 
>> Fastboot module parameter has been added to xe driver.
>
> Use "git commit --fixup" linking to patch which introduce the original change.
> Suggested by Jani in a different series.

Either that, or if the commit is completely being removed, the revert is
fine also. They'll be rebased away.

BR,
Jani.


>
> Regards,
> Uma Shankar
>
>> This reverts commit e1d816044a2feb4aab2592c840e999bd9a13f0a8.
>> ---
>>  drivers/gpu/drm/i915/display/intel_display.c | 4 ----
>>  1 file changed, 4 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
>> b/drivers/gpu/drm/i915/display/intel_display.c
>> index b2e16cb8d026..46a166b9ae43 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -4986,7 +4986,6 @@ pipe_config_mismatch(bool fastset, const struct
>> intel_crtc *crtc,
>> 
>>  static bool fastboot_enabled(struct drm_i915_private *dev_priv)  { -#ifdef I915
>>  	if (dev_priv->params.fastboot != -1)
>>  		return dev_priv->params.fastboot;
>> 
>> @@ -5000,9 +4999,6 @@ static bool fastboot_enabled(struct drm_i915_private
>> *dev_priv)
>> 
>>  	/* Disabled by default on all others */
>>  	return false;
>> -#else
>> -	return true;
>> -#endif
>>  }
>> 
>>  bool
>> --
>> 2.25.1
>

-- 
Jani Nikula, Intel