Re: [Intel-xe] [PATCH 0/7] drm/xe: Code cleanup

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

On Tue, 08 Aug 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Tue, Aug 08, 2023 at 01:47:50PM +0300, Jani Nikula wrote:
>>On Mon, 17 Jul 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>> On Thu, Jul 13, 2023 at 04:33:52PM -0400, Rodrigo Vivi wrote:
>>>>On Thu, Jul 13, 2023 at 03:06:04PM +0000, Francois Dugast wrote:
>>>>> Fix minor typos and reduce ERRORs reported by checkpatch.pl from 95 to 22.
>>>>
>>>>I wonder if we should do this with !fixup patches...
>>>
>>> I think that would be a nightmare to thread through the conflicts.
>>
>>For display it's a nightmare we have to plunge through. And this just
>>made it worse.
>
> This is automatically resolved when we move display up in the branch
> though.  "Automatically" meaning that the pour sould doing the rebase
> has to resolve the conflicts. I don't like doing it, but what's the
> alternative? Last rebase I did a "squash-heavy approach" because moving
> display up means some commits don't make sense anymore, even if they
> apply correctly.  Those coding style changes would just be squashed in
> the respective commits.

Squashing is easy if you have respective commits with 1:1 mapping, but
if you have one commit fixing multiple commits, it gets tricky.

BR,
Jani.


>
>
> Lucas De Marchi
>
>>
>>BR,
>>Jani.
>>
>>
>>> Let's just accept the mistakes happened when we werent' checking
>>> for checkpatch in CI.
>>>
>>> Lucas De Marchi
>>>
>>>>
>>>>But we anyway need this,
>>>>
>>>>Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>>for the series
>>>>
>>>>>
>>>>> Francois Dugast (7):
>>>>>   drm/xe: Cleanup SPACING style issues
>>>>>   drm/xe: Cleanup OPEN_BRACE style issues
>>>>>   drm/xe: Cleanup POINTER_LOCATION style issues
>>>>>   drm/xe: Cleanup CODE_INDENT style issues
>>>>>   drm/xe: Cleanup TRAILING_WHITESPACE style issues
>>>>>   drm/xe: Cleanup COMPLEX_MACRO style issues
>>>>>   drm/xe: Fix typos
>>>>>
>>>>>  drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h  |  4 ++--
>>>>>  drivers/gpu/drm/xe/display/ext/intel_device_info.c | 11 ++++++++---
>>>>>  drivers/gpu/drm/xe/display/xe_fb_pin.c             |  4 ++--
>>>>>  drivers/gpu/drm/xe/xe_device.h                     |  6 +++---
>>>>>  drivers/gpu/drm/xe/xe_device_types.h               |  4 ++--
>>>>>  drivers/gpu/drm/xe/xe_engine.c                     |  4 ++--
>>>>>  drivers/gpu/drm/xe/xe_force_wake.c                 |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_gt.h                         |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_gt_clock.c                   |  8 ++++----
>>>>>  drivers/gpu/drm/xe/xe_gt_debugfs.c                 |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_gt_mcr.c                     |  3 ++-
>>>>>  drivers/gpu/drm/xe/xe_gt_types.h                   |  8 ++++----
>>>>>  drivers/gpu/drm/xe/xe_guc.c                        |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_guc_debugfs.c                |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_guc_fwif.h                   | 12 ++++++------
>>>>>  drivers/gpu/drm/xe/xe_guc_submit.c                 | 14 +++++++-------
>>>>>  drivers/gpu/drm/xe/xe_huc_debugfs.c                |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_hw_engine.c                  |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_lrc.c                        |  4 ++--
>>>>>  drivers/gpu/drm/xe/xe_rtp.h                        |  4 ++--
>>>>>  drivers/gpu/drm/xe/xe_rtp_helpers.h                | 10 +++++-----
>>>>>  drivers/gpu/drm/xe/xe_sched_job.c                  |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_uc.c                         | 10 +++++-----
>>>>>  drivers/gpu/drm/xe/xe_uc_fw.c                      |  4 ++--
>>>>>  drivers/gpu/drm/xe/xe_vm.c                         |  2 +-
>>>>>  drivers/gpu/drm/xe/xe_wa.c                         |  4 ++--
>>>>>  26 files changed, 69 insertions(+), 63 deletions(-)
>>>>>
>>>>> --
>>>>> 2.34.1
>>>>>
>>
>>-- 
>>Jani Nikula, Intel Open Source Graphics Center

-- 
Jani Nikula, Intel Open Source Graphics Center