mbox series

[0/8] drm/i915: drm_i915_private and xe_device cleanups

Message ID cover.1712599670.git.jani.nikula@intel.com (mailing list archive)
Headers show
Series drm/i915: drm_i915_private and xe_device cleanups | expand

Message

Jani Nikula April 8, 2024, 6:08 p.m. UTC
Continue cleaning up the members from drm_i915_private and xe_device to
struct intel_display.

Jani Nikula (8):
  drm/i915/gt: drop display clock info from gt debugfs
  drm/i915: move skl_preferred_vco_freq to display substruct
  drm/i915: move max_dotclk_freq to display substruct
  drm/i915: move vblank_enabled to display substruct
  drm/i915: move display_irqs_enabled to display substruct
  drm/i915: move de_irq_mask to display substruct
  drm/i915: move pipestat_irq_mask to display substruct
  drm/xe/display: remove unused xe->enabled_irq_mask

 drivers/gpu/drm/i915/display/intel_cdclk.c    | 23 ++++----
 drivers/gpu/drm/i915/display/intel_crt.c      |  2 +-
 drivers/gpu/drm/i915/display/intel_display.c  |  6 +-
 .../gpu/drm/i915/display/intel_display_core.h | 12 ++++
 .../gpu/drm/i915/display/intel_display_irq.c  | 57 ++++++++++---------
 drivers/gpu/drm/i915/display/intel_dp.c       |  4 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  2 +-
 drivers/gpu/drm/i915/display/intel_dsi.c      |  2 +-
 drivers/gpu/drm/i915/display/intel_dvo.c      |  2 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c     |  2 +-
 .../gpu/drm/i915/display/intel_hotplug_irq.c  |  2 +-
 drivers/gpu/drm/i915/display/intel_lvds.c     |  2 +-
 drivers/gpu/drm/i915/display/intel_sdvo.c     |  2 +-
 drivers/gpu/drm/i915/display/intel_tv.c       |  2 +-
 drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c |  4 --
 drivers/gpu/drm/i915/i915_drv.h               | 13 +----
 drivers/gpu/drm/i915/i915_irq.c               |  8 +--
 drivers/gpu/drm/xe/display/xe_display.c       |  1 -
 drivers/gpu/drm/xe/xe_device_types.h          | 15 +----
 19 files changed, 73 insertions(+), 88 deletions(-)

Comments

Ville Syrjälä April 8, 2024, 6:15 p.m. UTC | #1
On Mon, Apr 08, 2024 at 09:08:35PM +0300, Jani Nikula wrote:
> Continue cleaning up the members from drm_i915_private and xe_device to
> struct intel_display.
> 
> Jani Nikula (8):
>   drm/i915/gt: drop display clock info from gt debugfs
>   drm/i915: move skl_preferred_vco_freq to display substruct
>   drm/i915: move max_dotclk_freq to display substruct
>   drm/i915: move vblank_enabled to display substruct
>   drm/i915: move display_irqs_enabled to display substruct
>   drm/i915: move de_irq_mask to display substruct
>   drm/i915: move pipestat_irq_mask to display substruct
>   drm/xe/display: remove unused xe->enabled_irq_mask

Looks reasonable.

Series is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
>  drivers/gpu/drm/i915/display/intel_cdclk.c    | 23 ++++----
>  drivers/gpu/drm/i915/display/intel_crt.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_display.c  |  6 +-
>  .../gpu/drm/i915/display/intel_display_core.h | 12 ++++
>  .../gpu/drm/i915/display/intel_display_irq.c  | 57 ++++++++++---------
>  drivers/gpu/drm/i915/display/intel_dp.c       |  4 +-
>  drivers/gpu/drm/i915/display/intel_dp_mst.c   |  2 +-
>  drivers/gpu/drm/i915/display/intel_dsi.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_dvo.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_hdmi.c     |  2 +-
>  .../gpu/drm/i915/display/intel_hotplug_irq.c  |  2 +-
>  drivers/gpu/drm/i915/display/intel_lvds.c     |  2 +-
>  drivers/gpu/drm/i915/display/intel_sdvo.c     |  2 +-
>  drivers/gpu/drm/i915/display/intel_tv.c       |  2 +-
>  drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c |  4 --
>  drivers/gpu/drm/i915/i915_drv.h               | 13 +----
>  drivers/gpu/drm/i915/i915_irq.c               |  8 +--
>  drivers/gpu/drm/xe/display/xe_display.c       |  1 -
>  drivers/gpu/drm/xe/xe_device_types.h          | 15 +----
>  19 files changed, 73 insertions(+), 88 deletions(-)
> 
> -- 
> 2.39.2
Jani Nikula April 8, 2024, 9:02 p.m. UTC | #2
On Mon, 08 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> Continue cleaning up the members from drm_i915_private and xe_device to
> struct intel_display.

Lucas, there's a bunch of xe changes included here, ack for merging via
drm-intel-next?

BR,
Jani.

>
> Jani Nikula (8):
>   drm/i915/gt: drop display clock info from gt debugfs
>   drm/i915: move skl_preferred_vco_freq to display substruct
>   drm/i915: move max_dotclk_freq to display substruct
>   drm/i915: move vblank_enabled to display substruct
>   drm/i915: move display_irqs_enabled to display substruct
>   drm/i915: move de_irq_mask to display substruct
>   drm/i915: move pipestat_irq_mask to display substruct
>   drm/xe/display: remove unused xe->enabled_irq_mask
>
>  drivers/gpu/drm/i915/display/intel_cdclk.c    | 23 ++++----
>  drivers/gpu/drm/i915/display/intel_crt.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_display.c  |  6 +-
>  .../gpu/drm/i915/display/intel_display_core.h | 12 ++++
>  .../gpu/drm/i915/display/intel_display_irq.c  | 57 ++++++++++---------
>  drivers/gpu/drm/i915/display/intel_dp.c       |  4 +-
>  drivers/gpu/drm/i915/display/intel_dp_mst.c   |  2 +-
>  drivers/gpu/drm/i915/display/intel_dsi.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_dvo.c      |  2 +-
>  drivers/gpu/drm/i915/display/intel_hdmi.c     |  2 +-
>  .../gpu/drm/i915/display/intel_hotplug_irq.c  |  2 +-
>  drivers/gpu/drm/i915/display/intel_lvds.c     |  2 +-
>  drivers/gpu/drm/i915/display/intel_sdvo.c     |  2 +-
>  drivers/gpu/drm/i915/display/intel_tv.c       |  2 +-
>  drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c |  4 --
>  drivers/gpu/drm/i915/i915_drv.h               | 13 +----
>  drivers/gpu/drm/i915/i915_irq.c               |  8 +--
>  drivers/gpu/drm/xe/display/xe_display.c       |  1 -
>  drivers/gpu/drm/xe/xe_device_types.h          | 15 +----
>  19 files changed, 73 insertions(+), 88 deletions(-)
Lucas De Marchi April 8, 2024, 9:10 p.m. UTC | #3
On Tue, Apr 09, 2024 at 12:02:17AM +0300, Jani Nikula wrote:
>On Mon, 08 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>> Continue cleaning up the members from drm_i915_private and xe_device to
>> struct intel_display.
>
>Lucas, there's a bunch of xe changes included here, ack for merging via
>drm-intel-next?


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

I skimmed through the series and left just one comment. It may be very
well because I skimmed through it too fast though. I agree on merging
it through drm-intel-next.

Lucas De Marchi
Jani Nikula April 9, 2024, 8:43 a.m. UTC | #4
On Mon, 08 Apr 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Tue, Apr 09, 2024 at 12:02:17AM +0300, Jani Nikula wrote:
>>On Mon, 08 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>> Continue cleaning up the members from drm_i915_private and xe_device to
>>> struct intel_display.
>>
>>Lucas, there's a bunch of xe changes included here, ack for merging via
>>drm-intel-next?
>
>
> Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> I skimmed through the series and left just one comment. It may be very
> well because I skimmed through it too fast though. I agree on merging
> it through drm-intel-next.

Thanks for the review and ack, pushed patches 1-7 to drm-intel-next. I
decided the renaming, if any, can come later.

There was a trivial conflict with patch 1, pushed it anyway, but skipped
patch 8 for now also due to conflicts, and it didn't apply to
drm-xe-next either. Need to sync up the branches first.

BR,
Jani.