On Thu, Jan 11, 2024 at 07:21:15PM +0200, Jani Nikula wrote:
> All things about opregion should be placed in intel_opregion.c.
>
> Cc: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx>
> ---
> .../drm/i915/display/intel_display_debugfs.c | 13 +-----------
> drivers/gpu/drm/i915/display/intel_opregion.c | 21 +++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_opregion.h | 6 ++++++
> 3 files changed, 28 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 9ee7e0738059..6f2d13c8ccf7 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -86,17 +86,6 @@ static int i915_sr_status(struct seq_file *m, void *unused)
> return 0;
> }
>
> -static int i915_opregion(struct seq_file *m, void *unused)
> -{
> - struct drm_i915_private *i915 = node_to_i915(m->private);
> - struct intel_opregion *opregion = &i915->display.opregion;
> -
> - if (opregion->header)
> - seq_write(m, opregion->header, OPREGION_SIZE);
> -
> - return 0;
> -}
> -
> static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
> {
> struct drm_i915_private *dev_priv = node_to_i915(m->private);
> @@ -1055,7 +1044,6 @@ static const struct file_operations i915_fifo_underrun_reset_ops = {
> static const struct drm_info_list intel_display_debugfs_list[] = {
> {"i915_frontbuffer_tracking", i915_frontbuffer_tracking, 0},
> {"i915_sr_status", i915_sr_status, 0},
> - {"i915_opregion", i915_opregion, 0},
> {"i915_gem_framebuffer", i915_gem_framebuffer_info, 0},
> {"i915_power_domain_info", i915_power_domain_info, 0},
> {"i915_display_info", i915_display_info, 0},
> @@ -1098,6 +1086,7 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)
> intel_dmc_debugfs_register(i915);
> intel_fbc_debugfs_register(i915);
> intel_hpd_debugfs_register(i915);
> + intel_opregion_debugfs_register(i915);
> intel_psr_debugfs_register(i915);
> intel_wm_debugfs_register(i915);
> intel_display_debugfs_params(i915);
> diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
> index 1ce785db6a5e..26c92ab4ee8a 100644
> --- a/drivers/gpu/drm/i915/display/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/display/intel_opregion.c
> @@ -1265,3 +1265,24 @@ void intel_opregion_cleanup(struct drm_i915_private *i915)
> opregion->vbt = NULL;
> opregion->lid_state = NULL;
> }
> +
> +static int intel_opregion_show(struct seq_file *m, void *unused)
> +{
> + struct drm_i915_private *i915 = m->private;
> + struct intel_opregion *opregion = &i915->display.opregion;
> +
> + if (opregion->header)
> + seq_write(m, opregion->header, OPREGION_SIZE);
> +
> + return 0;
> +}
> +
> +DEFINE_SHOW_ATTRIBUTE(intel_opregion);
> +
> +void intel_opregion_debugfs_register(struct drm_i915_private *i915)
> +{
> + struct drm_minor *minor = i915->drm.primary;
> +
> + debugfs_create_file("i915_opregion", 0444, minor->debugfs_root,
> + i915, &intel_opregion_fops);
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h
> index fd2ea8ef0fa2..7177f50ab0d3 100644
> --- a/drivers/gpu/drm/i915/display/intel_opregion.h
> +++ b/drivers/gpu/drm/i915/display/intel_opregion.h
> @@ -79,6 +79,8 @@ const struct drm_edid *intel_opregion_get_edid(struct intel_connector *connector
>
> bool intel_opregion_headless_sku(struct drm_i915_private *i915);
>
> +void intel_opregion_debugfs_register(struct drm_i915_private *i915);
> +
> #else /* CONFIG_ACPI*/
>
> static inline int intel_opregion_setup(struct drm_i915_private *dev_priv)
> @@ -139,6 +141,10 @@ static inline bool intel_opregion_headless_sku(struct drm_i915_private *i915)
> return false;
> }
>
> +static inline void intel_opregion_debugfs_register(struct drm_i915_private *i915)
> +{
> +}
> +
> #endif /* CONFIG_ACPI */
>
> #endif
> --
> 2.39.2
>
