Re: [Intel-xe] [PATCH 2/7] drm/xe: Cleanup OPEN_BRACE style issues

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

On Fri, 14 Jul 2023, Matthew Brost <matthew.brost@intel.com> wrote:
> On Thu, Jul 13, 2023 at 03:06:06PM +0000, Francois Dugast wrote:
>> Remove almost all existing style issues of type OPEN_BRACE reported
>> by checkpatch.
>> 
>> Signed-off-by: Francois Dugast <francois.dugast@intel.com>
>
> Reviewed-by: Matthew Brost <matthew.brost@intel.com>
>
>> ---
>>  drivers/gpu/drm/xe/display/ext/intel_device_info.c | 11 ++++++++---
>>  drivers/gpu/drm/xe/xe_gt_mcr.c                     |  3 ++-

I don't know what I need to do to drive this point through:


WE MUST **STOP** CHANGING DISPLAY CODE AND XE CODE IN THE SAME COMMITS.


The code in display/ext/intel_device_info.c is a nightmare that needs to
be fixed. The history of it needs to be gone when submitting
upstream. Doing checkpatch fixes to it is utterly pointless, and
combined with changes to rest of xe in the same commit, this makes
display fixes harder than it already is.

Do not touch display code *or* i915 code in the same commits, please.

BR,
Jani.


>>  2 files changed, 10 insertions(+), 4 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/xe/display/ext/intel_device_info.c b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
>> index 29f3909e018a..9e9ccdef81f1 100644
>> --- a/drivers/gpu/drm/xe/display/ext/intel_device_info.c
>> +++ b/drivers/gpu/drm/xe/display/ext/intel_device_info.c
>> @@ -49,9 +49,14 @@ void intel_dvo_init(struct drm_i915_private *i915) {}
>>  int intel_tv_init(struct drm_i915_private *i915) { return 0; }
>>  int assert_dsi_pll_enabled(struct drm_i915_private *i915) { return 0; }
>>  bool intel_sdvo_init(struct drm_i915_private *dev_priv,
>> -		     i915_reg_t sdvo_reg, enum port port) { return false; }
>> +		     i915_reg_t sdvo_reg, enum port port)
>> +
>> +{
>> +	return false;
>> +}
>>  void g4x_hdmi_init(struct drm_i915_private *dev_priv,
>> -		   i915_reg_t hdmi_reg, enum port port) {}
>> +		   i915_reg_t hdmi_reg, enum port port)
>> +{}
>>  int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,
>> -                                    struct drm_atomic_state *state)
>> +				    struct drm_atomic_state *state)
>>  { return -ENODEV; }
>> diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c
>> index 3db550c85e32..ff4075387564 100644
>> --- a/drivers/gpu/drm/xe/xe_gt_mcr.c
>> +++ b/drivers/gpu/drm/xe/xe_gt_mcr.c
>> @@ -429,7 +429,8 @@ static void mcr_lock(struct xe_gt *gt)
>>  	drm_WARN_ON_ONCE(&xe->drm, ret == -ETIMEDOUT);
>>  }
>>  
>> -static void mcr_unlock(struct xe_gt *gt) {
>> +static void mcr_unlock(struct xe_gt *gt)
>> +{
>>  	/* Release hardware semaphore */
>>  	if (GRAPHICS_VERx100(gt_to_xe(gt)) >= 1270)
>>  		xe_mmio_write32(gt, STEER_SEMAPHORE, 0x1);
>> -- 
>> 2.34.1
>> 

-- 
Jani Nikula, Intel Open Source Graphics Center