drm/i915/display: use drm->debugfs_root for creating debugfs files

Since commit 0b30d57acafc ("drm/debugfs: rework debugfs directory
creation v5") we should be using drm->debugfs_root instead of
minor->debugfs_root for creating debugfs files.

As a rule of thumb, use a local variable when there are two or more
uses, otherwise just have the single reference inline.

Drop drm/drm_file.h include where possible.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/e8268546ec2a2941a3dc43c2fdc60f678dc03fce.1753782998.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 276ac29e4daf7a54bd512e82081acd855af2ff26..8de332c627f8b9eb83eafa0edaf637c6acc52f4d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -3744,8 +3744,6 @@ DEFINE_SHOW_ATTRIBUTE(intel_bios_vbt);
 
 void intel_bios_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
-
-       debugfs_create_file("i915_vbt", 0444, minor->debugfs_root,
+       debugfs_create_file("i915_vbt", 0444, display->drm->debugfs_root,
                            display, &intel_bios_vbt_fops);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 59997dc95984cda65c520fc8d960c6a4488f04ae..f7f76de0f94464d179c2ac1c68323e4463d9eff4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3627,9 +3627,7 @@ DEFINE_SHOW_ATTRIBUTE(i915_cdclk_info);
 
 void intel_cdclk_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
-
-       debugfs_create_file("i915_cdclk_info", 0444, minor->debugfs_root,
+       debugfs_create_file("i915_cdclk_info", 0444, display->drm->debugfs_root,
                            display, &i915_cdclk_info_fops);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index ce3f9810c42d29b00d3a6f9f189759dc1df460c1..10dddec3796f7cae4cf4def9988dbd7e87323972 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -820,14 +820,14 @@ static const struct drm_info_list intel_display_debugfs_list[] = {
 
 void intel_display_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
+       struct dentry *debugfs_root = display->drm->debugfs_root;
 
-       debugfs_create_file("i915_fifo_underrun_reset", 0644, minor->debugfs_root,
+       debugfs_create_file("i915_fifo_underrun_reset", 0644, debugfs_root,
                            display, &i915_fifo_underrun_reset_ops);
 
        drm_debugfs_create_files(intel_display_debugfs_list,
                                 ARRAY_SIZE(intel_display_debugfs_list),
-                                minor->debugfs_root, minor);
+                                debugfs_root, display->drm->primary);
 
        intel_bios_debugfs_register(display);
        intel_cdclk_debugfs_register(display);

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
index 88914a1f3f62465fe80d429f1eda13644c5f8bb9..de62b774272d22fc90ec5377ee8833399efafb34 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs_params.c
@@ -7,7 +7,6 @@
 #include <linux/kernel.h>
 
 #include <drm/drm_drv.h>
-#include <drm/drm_file.h>
 
 #include "intel_display_core.h"
 #include "intel_display_debugfs_params.h"
@@ -154,14 +153,14 @@ intel_display_debugfs_create_uint(const char *name, umode_t mode,
 /* add a subdirectory with files for each intel display param */
 void intel_display_debugfs_params(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
+       struct dentry *debugfs_root = display->drm->debugfs_root;
        struct dentry *dir;
        char dirname[16];
 
        snprintf(dirname, sizeof(dirname), "%s_params", display->drm->driver->name);
-       dir = debugfs_lookup(dirname, minor->debugfs_root);
+       dir = debugfs_lookup(dirname, debugfs_root);
        if (!dir)
-               dir = debugfs_create_dir(dirname, minor->debugfs_root);
+               dir = debugfs_create_dir(dirname, debugfs_root);
        if (IS_ERR(dir))
                return;
 

diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 744f51c0eab82cca405e99f65b135d9b235fba61..77a0199f9ea5f1a4d84c820e07127ed80f04080c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -1603,9 +1603,7 @@ DEFINE_SHOW_ATTRIBUTE(intel_dmc_debugfs_status);
 
 void intel_dmc_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
-
-       debugfs_create_file("i915_dmc_info", 0444, minor->debugfs_root,
+       debugfs_create_file("i915_dmc_info", 0444, display->drm->debugfs_root,
                            display, &intel_dmc_debugfs_status_fops);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp_test.c b/drivers/gpu/drm/i915/display/intel_dp_test.c
index 6ed5012c5fac06a3146310fa4dae82f0b1c0e1eb..5cfa1dd411dabf63af3b371d7f1adeeacc8208b2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_test.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_test.c
@@ -6,7 +6,6 @@
 #include <drm/display/drm_dp.h>
 #include <drm/display/drm_dp_helper.h>
 #include <drm/drm_edid.h>
-#include <drm/drm_file.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
@@ -753,13 +752,12 @@ static const struct {
 
 void intel_dp_test_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
        int i;
 
        for (i = 0; i < ARRAY_SIZE(intel_display_debugfs_files); i++) {
                debugfs_create_file(intel_display_debugfs_files[i].name,
                                    0644,
-                                   minor->debugfs_root,
+                                   display->drm->debugfs_root,
                                    display,
                                    intel_display_debugfs_files[i].fops);
        }

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index f82d392f1e22d976f84df69d104fa9e72520aabf..d4c5deff9cbe882893142aec1b35503ed1915254 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -2240,10 +2240,9 @@ void intel_fbc_crtc_debugfs_add(struct intel_crtc *crtc)
 /* FIXME: remove this once igt is on board with per-crtc stuff */
 void intel_fbc_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
        struct intel_fbc *fbc;
 
        fbc = display->fbc[INTEL_FBC_A];
        if (fbc)
-               intel_fbc_debugfs_add(fbc, minor->debugfs_root);
+               intel_fbc_debugfs_add(fbc, display->drm->debugfs_root);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index bd8851fd2ee9ca81cf411f8d8490bbd69485159c..4451a792600a0aaebf629694e08aa07145ac3972 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -1332,12 +1332,12 @@ static const struct file_operations i915_hpd_short_storm_ctl_fops = {
 
 void intel_hpd_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
+       struct dentry *debugfs_root = display->drm->debugfs_root;
 
-       debugfs_create_file("i915_hpd_storm_ctl", 0644, minor->debugfs_root,
+       debugfs_create_file("i915_hpd_storm_ctl", 0644, debugfs_root,
                            display, &i915_hpd_storm_ctl_fops);
-       debugfs_create_file("i915_hpd_short_storm_ctl", 0644, minor->debugfs_root,
+       debugfs_create_file("i915_hpd_short_storm_ctl", 0644, debugfs_root,
                            display, &i915_hpd_short_storm_ctl_fops);
-       debugfs_create_bool("i915_ignore_long_hpd", 0644, minor->debugfs_root,
+       debugfs_create_bool("i915_ignore_long_hpd", 0644, debugfs_root,
                            &display->hotplug.ignore_long_hpd);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
index 81efdb17fc0ce57aa9caa555d9b9e3ec03f580f5..380314a3b4d9cb5a3854b401b8c7329032503733 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_opregion.c
+++ b/drivers/gpu/drm/i915/display/intel_opregion.c
@@ -1299,8 +1299,6 @@ DEFINE_SHOW_ATTRIBUTE(intel_opregion);
 
 void intel_opregion_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
-
-       debugfs_create_file("i915_opregion", 0444, minor->debugfs_root,
+       debugfs_create_file("i915_opregion", 0444, display->drm->debugfs_root,
                            display, &intel_opregion_fops);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 6bd3454bb00e730e868752e1ba15921c04901008..1d70ae31b6dd41ab74062ba9a21a9d0f9d4046a5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -4132,12 +4132,12 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_edp_psr_debug_fops,
 
 void intel_psr_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
+       struct dentry *debugfs_root = display->drm->debugfs_root;
 
-       debugfs_create_file("i915_edp_psr_debug", 0644, minor->debugfs_root,
+       debugfs_create_file("i915_edp_psr_debug", 0644, debugfs_root,
                            display, &i915_edp_psr_debug_fops);
 
-       debugfs_create_file("i915_edp_psr_status", 0444, minor->debugfs_root,
+       debugfs_create_file("i915_edp_psr_status", 0444, debugfs_root,
                            display, &i915_edp_psr_status_fops);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_wm.c b/drivers/gpu/drm/i915/display/intel_wm.c
index bba82e888db2e12212ccd29081d4040acb9285f7..f887a664fe22cb4e7685ba0807ae8b0a1d5f58d4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_wm.c
+++ b/drivers/gpu/drm/i915/display/intel_wm.c
@@ -5,7 +5,6 @@
 
 #include <linux/debugfs.h>
 
-#include <drm/drm_file.h>
 #include <drm/drm_print.h>
 
 #include "i9xx_wm.h"
@@ -390,15 +389,15 @@ static const struct file_operations i915_cur_wm_latency_fops = {
 
 void intel_wm_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
+       struct dentry *debugfs_root = display->drm->debugfs_root;
 
-       debugfs_create_file("i915_pri_wm_latency", 0644, minor->debugfs_root,
+       debugfs_create_file("i915_pri_wm_latency", 0644, debugfs_root,
                            display, &i915_pri_wm_latency_fops);
 
-       debugfs_create_file("i915_spr_wm_latency", 0644, minor->debugfs_root,
+       debugfs_create_file("i915_spr_wm_latency", 0644, debugfs_root,
                            display, &i915_spr_wm_latency_fops);
 
-       debugfs_create_file("i915_cur_wm_latency", 0644, minor->debugfs_root,
+       debugfs_create_file("i915_cur_wm_latency", 0644, debugfs_root,
                            display, &i915_cur_wm_latency_fops);
 
        skl_watermark_debugfs_register(display);

diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 222c069fdadb5f1fd6a6b8f5c805ce415d475eaf..def5150231a4c18c85df9f7f486ee72961239044 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -6,7 +6,6 @@
 #include <linux/debugfs.h>
 
 #include <drm/drm_blend.h>
-#include <drm/drm_file.h>
 #include <drm/drm_print.h>
 
 #include "soc/intel_dram.h"
@@ -4033,14 +4032,14 @@ DEFINE_SHOW_ATTRIBUTE(intel_sagv_status);
 
 void skl_watermark_debugfs_register(struct intel_display *display)
 {
-       struct drm_minor *minor = display->drm->primary;
+       struct dentry *debugfs_root = display->drm->debugfs_root;
 
        if (HAS_IPC(display))
-               debugfs_create_file("i915_ipc_status", 0644, minor->debugfs_root,
+               debugfs_create_file("i915_ipc_status", 0644, debugfs_root,
                                    display, &skl_watermark_ipc_status_fops);
 
        if (HAS_SAGV(display))
-               debugfs_create_file("i915_sagv_status", 0444, minor->debugfs_root,
+               debugfs_create_file("i915_sagv_status", 0444, debugfs_root,
                                    display, &intel_sagv_status_fops);
 }