mbox series

[0/6] drm/i915 and drm/xe display integration cleanups

Message ID cover.1712345787.git.jani.nikula@intel.com (mailing list archive)
Headers show
Series drm/i915 and drm/xe display integration cleanups | expand

Message

Jani Nikula April 5, 2024, 7:37 p.m. UTC 
Some cleanups on i915 side, and subsequent cleanups on xe side. I'd like
to merge all of these via drm-intel-next.

BR,
Jani.

Jani Nikula (6):
  drm/i915: use IS_JASPERLAKE()/IS_ELKHARTLAKE() instead of
    IS_PLATFORM()
  drm/i915/dmc: define firmware URL locally
  drm/i915: move i915_fixed.h to display/intel_fixed.h
  drm/xe/display: clean up a lot of cruft from compat i915_drv.h
  drm/xe/display: remove compat i915_gem.h
  drm/xe/display: clean up compat i915_vgpu.h

 .../drm/i915/display/intel_ddi_buf_trans.c    |  4 +--
 drivers/gpu/drm/i915/display/intel_dmc.c      |  4 ++-
 .../{i915_fixed.h => display/intel_fixed.h}   |  0
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 34 -------------------
 .../drm/xe/compat-i915-headers/i915_fixed.h   |  6 ----
 .../gpu/drm/xe/compat-i915-headers/i915_gem.h |  9 -----
 .../drm/xe/compat-i915-headers/i915_vgpu.h    | 26 --------------
 .../drm/xe/compat-i915-headers/intel_uc_fw.h  | 11 ------
 9 files changed, 6 insertions(+), 90 deletions(-)
 rename drivers/gpu/drm/i915/{i915_fixed.h => display/intel_fixed.h} (100%)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h

Comments

Lucas De Marchi April 5, 2024, 8:33 p.m. UTC | #1 
On Fri, Apr 05, 2024 at 10:37:37PM +0300, Jani Nikula wrote:
>Some cleanups on i915 side, and subsequent cleanups on xe side. I'd like
>to merge all of these via drm-intel-next.

For the entire series:

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

and ack on merging via drm-intel-next.

Lucas De Marchi

>
>BR,
>Jani.
>
>Jani Nikula (6):
>  drm/i915: use IS_JASPERLAKE()/IS_ELKHARTLAKE() instead of
>    IS_PLATFORM()
>  drm/i915/dmc: define firmware URL locally
>  drm/i915: move i915_fixed.h to display/intel_fixed.h
>  drm/xe/display: clean up a lot of cruft from compat i915_drv.h
>  drm/xe/display: remove compat i915_gem.h
>  drm/xe/display: clean up compat i915_vgpu.h
>
> .../drm/i915/display/intel_ddi_buf_trans.c    |  4 +--
> drivers/gpu/drm/i915/display/intel_dmc.c      |  4 ++-
> .../{i915_fixed.h => display/intel_fixed.h}   |  0
> drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
> .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 34 -------------------
> .../drm/xe/compat-i915-headers/i915_fixed.h   |  6 ----
> .../gpu/drm/xe/compat-i915-headers/i915_gem.h |  9 -----
> .../drm/xe/compat-i915-headers/i915_vgpu.h    | 26 --------------
> .../drm/xe/compat-i915-headers/intel_uc_fw.h  | 11 ------
> 9 files changed, 6 insertions(+), 90 deletions(-)
> rename drivers/gpu/drm/i915/{i915_fixed.h => display/intel_fixed.h} (100%)
> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h
> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h
>
>-- 
>2.39.2
>
Jani Nikula April 8, 2024, 8:07 a.m. UTC | #2 
On Fri, 05 Apr 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Fri, Apr 05, 2024 at 10:37:37PM +0300, Jani Nikula wrote:
>>Some cleanups on i915 side, and subsequent cleanups on xe side. I'd like
>>to merge all of these via drm-intel-next.
>
> For the entire series:
>
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> and ack on merging via drm-intel-next.

Thanks, pushed to drm-intel-next. I think the firwmare url stuff can be
sorted later.

There were some CI failures, but there are really no functional changes
here, it should all have failed at build time.

BR,
Jani.

>
> Lucas De Marchi
>
>>
>>BR,
>>Jani.
>>
>>Jani Nikula (6):
>>  drm/i915: use IS_JASPERLAKE()/IS_ELKHARTLAKE() instead of
>>    IS_PLATFORM()
>>  drm/i915/dmc: define firmware URL locally
>>  drm/i915: move i915_fixed.h to display/intel_fixed.h
>>  drm/xe/display: clean up a lot of cruft from compat i915_drv.h
>>  drm/xe/display: remove compat i915_gem.h
>>  drm/xe/display: clean up compat i915_vgpu.h
>>
>> .../drm/i915/display/intel_ddi_buf_trans.c    |  4 +--
>> drivers/gpu/drm/i915/display/intel_dmc.c      |  4 ++-
>> .../{i915_fixed.h => display/intel_fixed.h}   |  0
>> drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
>> .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 34 -------------------
>> .../drm/xe/compat-i915-headers/i915_fixed.h   |  6 ----
>> .../gpu/drm/xe/compat-i915-headers/i915_gem.h |  9 -----
>> .../drm/xe/compat-i915-headers/i915_vgpu.h    | 26 --------------
>> .../drm/xe/compat-i915-headers/intel_uc_fw.h  | 11 ------
>> 9 files changed, 6 insertions(+), 90 deletions(-)
>> rename drivers/gpu/drm/i915/{i915_fixed.h => display/intel_fixed.h} (100%)
>> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
>> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h
>> delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h
>>
>>-- 
>>2.39.2
>>