| Message ID | a9aeb27f0107bdf3d2bd834a48583bc64072447a.1724689818.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915/display: intel_display_types.h cleanup | expand |
Hi Jani, kernel test robot noticed the following build errors: [auto build test ERROR on drm-intel/for-linux-next] [also build test ERROR on drm-xe/drm-xe-next next-20240827] [cannot apply to linus/master v6.11-rc5] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/drm-i915-wm-move-struct-intel_watermark_params-to-i9xx_wm-c/20240827-003437 base: git://anongit.freedesktop.org/drm-intel for-linux-next patch link: https://lore.kernel.org/r/a9aeb27f0107bdf3d2bd834a48583bc64072447a.1724689818.git.jani.nikula%40intel.com patch subject: [PATCH 5/7] drm/i915/display: include media/cec-notifier.h and linux/debugfs.h where needed config: x86_64-rhel-8.3-rust (https://download.01.org/0day-ci/archive/20240827/202408271847.dOpt09wa-lkp@intel.com/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240827/202408271847.dOpt09wa-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408271847.dOpt09wa-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/gpu/drm/i915/display/hsw_ips.c:321:5: error: expected identifier 321 | "%llu\n"); | ^ >> drivers/gpu/drm/i915/display/hsw_ips.c:318:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] 318 | DEFINE_DEBUGFS_ATTRIBUTE(hsw_ips_debugfs_false_color_fops, | ^ | int >> drivers/gpu/drm/i915/display/hsw_ips.c:318:25: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] 318 | DEFINE_DEBUGFS_ATTRIBUTE(hsw_ips_debugfs_false_color_fops, | ^ 319 | hsw_ips_debugfs_false_color_get, 320 | hsw_ips_debugfs_false_color_set, 321 | "%llu\n"); | | void >> drivers/gpu/drm/i915/display/hsw_ips.c:355:2: error: call to undeclared function 'debugfs_create_file'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 355 | debugfs_create_file("i915_ips_false_color", 0644, crtc->base.debugfs_entry, | ^ drivers/gpu/drm/i915/display/hsw_ips.c:355:2: note: did you mean 'bus_create_file'? include/linux/device/bus.h:126:18: note: 'bus_create_file' declared here 126 | int __must_check bus_create_file(const struct bus_type *bus, struct bus_attribute *attr); | ^ >> drivers/gpu/drm/i915/display/hsw_ips.c:356:15: error: use of undeclared identifier 'hsw_ips_debugfs_false_color_fops' 356 | crtc, &hsw_ips_debugfs_false_color_fops); | ^ 5 errors generated. vim +321 drivers/gpu/drm/i915/display/hsw_ips.c 42b4c479025d92 Ville Syrjälä 2023-03-27 317 42b4c479025d92 Ville Syrjälä 2023-03-27 @318 DEFINE_DEBUGFS_ATTRIBUTE(hsw_ips_debugfs_false_color_fops, 42b4c479025d92 Ville Syrjälä 2023-03-27 319 hsw_ips_debugfs_false_color_get, 42b4c479025d92 Ville Syrjälä 2023-03-27 320 hsw_ips_debugfs_false_color_set, 42b4c479025d92 Ville Syrjälä 2023-03-27 @321 "%llu\n"); 42b4c479025d92 Ville Syrjälä 2023-03-27 322 bc37c98a3d44f7 Jani Nikula 2023-03-02 323 static int hsw_ips_debugfs_status_show(struct seq_file *m, void *unused) bc37c98a3d44f7 Jani Nikula 2023-03-02 324 { 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 325 struct intel_crtc *crtc = m->private; 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 326 struct drm_i915_private *i915 = to_i915(crtc->base.dev); bc37c98a3d44f7 Jani Nikula 2023-03-02 327 intel_wakeref_t wakeref; bc37c98a3d44f7 Jani Nikula 2023-03-02 328 bc37c98a3d44f7 Jani Nikula 2023-03-02 329 wakeref = intel_runtime_pm_get(&i915->runtime_pm); bc37c98a3d44f7 Jani Nikula 2023-03-02 330 bc37c98a3d44f7 Jani Nikula 2023-03-02 331 seq_printf(m, "Enabled by kernel parameter: %s\n", c39fc2aca32a93 Jouni Högander 2023-10-24 332 str_yes_no(i915->display.params.enable_ips)); bc37c98a3d44f7 Jani Nikula 2023-03-02 333 bc37c98a3d44f7 Jani Nikula 2023-03-02 334 if (DISPLAY_VER(i915) >= 8) { bc37c98a3d44f7 Jani Nikula 2023-03-02 335 seq_puts(m, "Currently: unknown\n"); bc37c98a3d44f7 Jani Nikula 2023-03-02 336 } else { bc37c98a3d44f7 Jani Nikula 2023-03-02 337 if (intel_de_read(i915, IPS_CTL) & IPS_ENABLE) bc37c98a3d44f7 Jani Nikula 2023-03-02 338 seq_puts(m, "Currently: enabled\n"); bc37c98a3d44f7 Jani Nikula 2023-03-02 339 else bc37c98a3d44f7 Jani Nikula 2023-03-02 340 seq_puts(m, "Currently: disabled\n"); bc37c98a3d44f7 Jani Nikula 2023-03-02 341 } bc37c98a3d44f7 Jani Nikula 2023-03-02 342 bc37c98a3d44f7 Jani Nikula 2023-03-02 343 intel_runtime_pm_put(&i915->runtime_pm, wakeref); bc37c98a3d44f7 Jani Nikula 2023-03-02 344 bc37c98a3d44f7 Jani Nikula 2023-03-02 345 return 0; bc37c98a3d44f7 Jani Nikula 2023-03-02 346 } bc37c98a3d44f7 Jani Nikula 2023-03-02 347 bc37c98a3d44f7 Jani Nikula 2023-03-02 348 DEFINE_SHOW_ATTRIBUTE(hsw_ips_debugfs_status); bc37c98a3d44f7 Jani Nikula 2023-03-02 349 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 350 void hsw_ips_crtc_debugfs_add(struct intel_crtc *crtc) bc37c98a3d44f7 Jani Nikula 2023-03-02 351 { 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 352 if (!hsw_crtc_supports_ips(crtc)) 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 353 return; bc37c98a3d44f7 Jani Nikula 2023-03-02 354 42b4c479025d92 Ville Syrjälä 2023-03-27 @355 debugfs_create_file("i915_ips_false_color", 0644, crtc->base.debugfs_entry, 42b4c479025d92 Ville Syrjälä 2023-03-27 @356 crtc, &hsw_ips_debugfs_false_color_fops);
Hi Jani, kernel test robot noticed the following build errors: [auto build test ERROR on drm-intel/for-linux-next] [also build test ERROR on drm-tip/drm-tip drm-xe/drm-xe-next next-20240827] [cannot apply to drm-intel/for-linux-next-fixes linus/master v6.11-rc5] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Jani-Nikula/drm-i915-wm-move-struct-intel_watermark_params-to-i9xx_wm-c/20240827-003437 base: git://anongit.freedesktop.org/drm-intel for-linux-next patch link: https://lore.kernel.org/r/a9aeb27f0107bdf3d2bd834a48583bc64072447a.1724689818.git.jani.nikula%40intel.com patch subject: [PATCH 5/7] drm/i915/display: include media/cec-notifier.h and linux/debugfs.h where needed config: i386-buildonly-randconfig-001-20240827 (https://download.01.org/0day-ci/archive/20240828/202408280033.x0jpUM2m-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240828/202408280033.x0jpUM2m-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408280033.x0jpUM2m-lkp@intel.com/ All error/warnings (new ones prefixed by >>): >> drivers/gpu/drm/i915/display/hsw_ips.c:320:58: error: expected ')' before string constant 320 | hsw_ips_debugfs_false_color_set, | ^ | ) 321 | "%llu\n"); | ~~~~~~~~ drivers/gpu/drm/i915/display/hsw_ips.c: In function 'hsw_ips_crtc_debugfs_add': >> drivers/gpu/drm/i915/display/hsw_ips.c:355:9: error: implicit declaration of function 'debugfs_create_file'; did you mean 'bus_create_file'? [-Werror=implicit-function-declaration] 355 | debugfs_create_file("i915_ips_false_color", 0644, crtc->base.debugfs_entry, | ^~~~~~~~~~~~~~~~~~~ | bus_create_file >> drivers/gpu/drm/i915/display/hsw_ips.c:356:36: error: 'hsw_ips_debugfs_false_color_fops' undeclared (first use in this function); did you mean 'hsw_ips_debugfs_false_color_set'? 356 | crtc, &hsw_ips_debugfs_false_color_fops); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | hsw_ips_debugfs_false_color_set drivers/gpu/drm/i915/display/hsw_ips.c:356:36: note: each undeclared identifier is reported only once for each function it appears in drivers/gpu/drm/i915/display/hsw_ips.c: At top level: >> drivers/gpu/drm/i915/display/hsw_ips.c:288:12: warning: 'hsw_ips_debugfs_false_color_set' defined but not used [-Wunused-function] 288 | static int hsw_ips_debugfs_false_color_set(void *data, u64 val) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> drivers/gpu/drm/i915/display/hsw_ips.c:278:12: warning: 'hsw_ips_debugfs_false_color_get' defined but not used [-Wunused-function] 278 | static int hsw_ips_debugfs_false_color_get(void *data, u64 *val) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +320 drivers/gpu/drm/i915/display/hsw_ips.c bc37c98a3d44f7 Jani Nikula 2023-03-02 277 42b4c479025d92 Ville Syrjälä 2023-03-27 @278 static int hsw_ips_debugfs_false_color_get(void *data, u64 *val) 42b4c479025d92 Ville Syrjälä 2023-03-27 279 { 42b4c479025d92 Ville Syrjälä 2023-03-27 280 struct intel_crtc *crtc = data; 42b4c479025d92 Ville Syrjälä 2023-03-27 281 struct drm_i915_private *i915 = to_i915(crtc->base.dev); 42b4c479025d92 Ville Syrjälä 2023-03-27 282 42b4c479025d92 Ville Syrjälä 2023-03-27 283 *val = i915->display.ips.false_color; 42b4c479025d92 Ville Syrjälä 2023-03-27 284 42b4c479025d92 Ville Syrjälä 2023-03-27 285 return 0; 42b4c479025d92 Ville Syrjälä 2023-03-27 286 } 42b4c479025d92 Ville Syrjälä 2023-03-27 287 42b4c479025d92 Ville Syrjälä 2023-03-27 @288 static int hsw_ips_debugfs_false_color_set(void *data, u64 val) 42b4c479025d92 Ville Syrjälä 2023-03-27 289 { 42b4c479025d92 Ville Syrjälä 2023-03-27 290 struct intel_crtc *crtc = data; 42b4c479025d92 Ville Syrjälä 2023-03-27 291 struct drm_i915_private *i915 = to_i915(crtc->base.dev); 42b4c479025d92 Ville Syrjälä 2023-03-27 292 struct intel_crtc_state *crtc_state; 42b4c479025d92 Ville Syrjälä 2023-03-27 293 int ret; 42b4c479025d92 Ville Syrjälä 2023-03-27 294 42b4c479025d92 Ville Syrjälä 2023-03-27 295 ret = drm_modeset_lock(&crtc->base.mutex, NULL); 42b4c479025d92 Ville Syrjälä 2023-03-27 296 if (ret) 42b4c479025d92 Ville Syrjälä 2023-03-27 297 return ret; 42b4c479025d92 Ville Syrjälä 2023-03-27 298 42b4c479025d92 Ville Syrjälä 2023-03-27 299 i915->display.ips.false_color = val; 42b4c479025d92 Ville Syrjälä 2023-03-27 300 42b4c479025d92 Ville Syrjälä 2023-03-27 301 crtc_state = to_intel_crtc_state(crtc->base.state); 42b4c479025d92 Ville Syrjälä 2023-03-27 302 42b4c479025d92 Ville Syrjälä 2023-03-27 303 if (!crtc_state->hw.active) 42b4c479025d92 Ville Syrjälä 2023-03-27 304 goto unlock; 42b4c479025d92 Ville Syrjälä 2023-03-27 305 42b4c479025d92 Ville Syrjälä 2023-03-27 306 if (crtc_state->uapi.commit && 42b4c479025d92 Ville Syrjälä 2023-03-27 307 !try_wait_for_completion(&crtc_state->uapi.commit->hw_done)) 42b4c479025d92 Ville Syrjälä 2023-03-27 308 goto unlock; 42b4c479025d92 Ville Syrjälä 2023-03-27 309 42b4c479025d92 Ville Syrjälä 2023-03-27 310 hsw_ips_enable(crtc_state); 42b4c479025d92 Ville Syrjälä 2023-03-27 311 42b4c479025d92 Ville Syrjälä 2023-03-27 312 unlock: 42b4c479025d92 Ville Syrjälä 2023-03-27 313 drm_modeset_unlock(&crtc->base.mutex); 42b4c479025d92 Ville Syrjälä 2023-03-27 314 42b4c479025d92 Ville Syrjälä 2023-03-27 315 return ret; 42b4c479025d92 Ville Syrjälä 2023-03-27 316 } 42b4c479025d92 Ville Syrjälä 2023-03-27 317 42b4c479025d92 Ville Syrjälä 2023-03-27 318 DEFINE_DEBUGFS_ATTRIBUTE(hsw_ips_debugfs_false_color_fops, 42b4c479025d92 Ville Syrjälä 2023-03-27 319 hsw_ips_debugfs_false_color_get, 42b4c479025d92 Ville Syrjälä 2023-03-27 @320 hsw_ips_debugfs_false_color_set, 42b4c479025d92 Ville Syrjälä 2023-03-27 321 "%llu\n"); 42b4c479025d92 Ville Syrjälä 2023-03-27 322 bc37c98a3d44f7 Jani Nikula 2023-03-02 323 static int hsw_ips_debugfs_status_show(struct seq_file *m, void *unused) bc37c98a3d44f7 Jani Nikula 2023-03-02 324 { 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 325 struct intel_crtc *crtc = m->private; 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 326 struct drm_i915_private *i915 = to_i915(crtc->base.dev); bc37c98a3d44f7 Jani Nikula 2023-03-02 327 intel_wakeref_t wakeref; bc37c98a3d44f7 Jani Nikula 2023-03-02 328 bc37c98a3d44f7 Jani Nikula 2023-03-02 329 wakeref = intel_runtime_pm_get(&i915->runtime_pm); bc37c98a3d44f7 Jani Nikula 2023-03-02 330 bc37c98a3d44f7 Jani Nikula 2023-03-02 331 seq_printf(m, "Enabled by kernel parameter: %s\n", c39fc2aca32a93 Jouni Högander 2023-10-24 332 str_yes_no(i915->display.params.enable_ips)); bc37c98a3d44f7 Jani Nikula 2023-03-02 333 bc37c98a3d44f7 Jani Nikula 2023-03-02 334 if (DISPLAY_VER(i915) >= 8) { bc37c98a3d44f7 Jani Nikula 2023-03-02 335 seq_puts(m, "Currently: unknown\n"); bc37c98a3d44f7 Jani Nikula 2023-03-02 336 } else { bc37c98a3d44f7 Jani Nikula 2023-03-02 337 if (intel_de_read(i915, IPS_CTL) & IPS_ENABLE) bc37c98a3d44f7 Jani Nikula 2023-03-02 338 seq_puts(m, "Currently: enabled\n"); bc37c98a3d44f7 Jani Nikula 2023-03-02 339 else bc37c98a3d44f7 Jani Nikula 2023-03-02 340 seq_puts(m, "Currently: disabled\n"); bc37c98a3d44f7 Jani Nikula 2023-03-02 341 } bc37c98a3d44f7 Jani Nikula 2023-03-02 342 bc37c98a3d44f7 Jani Nikula 2023-03-02 343 intel_runtime_pm_put(&i915->runtime_pm, wakeref); bc37c98a3d44f7 Jani Nikula 2023-03-02 344 bc37c98a3d44f7 Jani Nikula 2023-03-02 345 return 0; bc37c98a3d44f7 Jani Nikula 2023-03-02 346 } bc37c98a3d44f7 Jani Nikula 2023-03-02 347 bc37c98a3d44f7 Jani Nikula 2023-03-02 348 DEFINE_SHOW_ATTRIBUTE(hsw_ips_debugfs_status); bc37c98a3d44f7 Jani Nikula 2023-03-02 349 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 350 void hsw_ips_crtc_debugfs_add(struct intel_crtc *crtc) bc37c98a3d44f7 Jani Nikula 2023-03-02 351 { 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 352 if (!hsw_crtc_supports_ips(crtc)) 1fb4da5f7858d7 Ville Syrjälä 2023-03-27 353 return; bc37c98a3d44f7 Jani Nikula 2023-03-02 354 42b4c479025d92 Ville Syrjälä 2023-03-27 @355 debugfs_create_file("i915_ips_false_color", 0644, crtc->base.debugfs_entry, 42b4c479025d92 Ville Syrjälä 2023-03-27 @356 crtc, &hsw_ips_debugfs_false_color_fops);
diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c index 82ee778b2efe..6d0209d60de9 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.c +++ b/drivers/gpu/drm/i915/display/intel_alpm.c @@ -3,6 +3,8 @@ * Copyright 2024, Intel Corporation. */ +#include <linux/debugfs.h> + #include "intel_alpm.h" #include "intel_crtc.h" #include "intel_de.h" diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index d49435af62c7..cd32c9cd38a9 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -25,6 +25,7 @@ * */ +#include <linux/debugfs.h> #include <linux/firmware.h> #include <drm/display/drm_dp_helper.h> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c index aa3ba66c5307..d6031419e32b 100644 --- a/drivers/gpu/drm/i915/display/intel_cdclk.c +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include <linux/debugfs.h> #include <linux/time.h> #include <drm/drm_fixed.h> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 74f527647aa9..a9182af43f40 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -3,6 +3,7 @@ * Copyright © 2020 Intel Corporation */ +#include <linux/debugfs.h> #include <linux/string_helpers.h> #include <drm/drm_debugfs.h> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index e0e0bf6d67bf..15fb29ef7c63 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -43,7 +43,6 @@ #include <drm/drm_rect.h> #include <drm/drm_vblank_work.h> #include <drm/intel/i915_hdcp_interface.h> -#include <media/cec-notifier.h> #include "gem/i915_gem_object_types.h" /* for to_intel_bo() */ #include "i915_vma.h" @@ -55,6 +54,7 @@ #include "intel_dpll_mgr.h" #include "intel_wm_types.h" +struct cec_notifier; struct drm_printer; struct __intel_global_objs_state; struct intel_connector; diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 9c8738295106..f8aa77044e81 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -21,6 +21,8 @@ * IN THE SOFTWARE. */ +#include <linux/debugfs.h> + #include <drm/display/drm_dp_helper.h> #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c index 3ca29afa5422..bb39eb96e812 100644 --- a/drivers/gpu/drm/i915/display/intel_drrs.c +++ b/drivers/gpu/drm/i915/display/intel_drrs.c @@ -3,6 +3,8 @@ * Copyright © 2021 Intel Corporation */ +#include <linux/debugfs.h> + #include "i915_drv.h" #include "i915_reg.h" #include "intel_atomic.h" diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index 52b79bacef4d..b53b38c2f19f 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -38,6 +38,7 @@ * forcibly disable it to allow proper screen updates. */ +#include <linux/debugfs.h> #include <linux/string_helpers.h> #include <drm/drm_blend.h> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index bd2f6ad0e76e..a671fa8e4fe7 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -41,6 +41,8 @@ #include <drm/drm_probe_helper.h> #include <drm/intel/intel_lpe_audio.h> +#include <media/cec-notifier.h> + #include "g4x_hdmi.h" #include "i915_drv.h" #include "i915_reg.h" diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c index 2617c5f63a07..a013b0e0ef54 100644 --- a/drivers/gpu/drm/i915/display/intel_hotplug.c +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c @@ -21,6 +21,7 @@ * IN THE SOFTWARE. */ +#include <linux/debugfs.h> #include <linux/kernel.h> #include <drm/drm_probe_helper.h> diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index ff11836459de..0eaa6cd6fe80 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.c +++ b/drivers/gpu/drm/i915/display/intel_opregion.c @@ -26,6 +26,7 @@ */ #include <linux/acpi.h> +#include <linux/debugfs.h> #include <linux/dmi.h> #include <acpi/video.h> diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c index 68141af4da54..82c76e7f8d41 100644 --- a/drivers/gpu/drm/i915/display/intel_pps.c +++ b/drivers/gpu/drm/i915/display/intel_pps.c @@ -3,6 +3,8 @@ * Copyright © 2020 Intel Corporation */ +#include <linux/debugfs.h> + #include "g4x_dp.h" #include "i915_drv.h" #include "i915_reg.h" diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 257526362b39..99b0e359c634 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -21,6 +21,8 @@ * DEALINGS IN THE SOFTWARE. */ +#include <linux/debugfs.h> + #include <drm/drm_atomic_helper.h> #include <drm/drm_damage_helper.h> #include <drm/drm_debugfs.h> diff --git a/drivers/gpu/drm/i915/display/intel_wm.c b/drivers/gpu/drm/i915/display/intel_wm.c index 82c4933ad507..462917bc488f 100644 --- a/drivers/gpu/drm/i915/display/intel_wm.c +++ b/drivers/gpu/drm/i915/display/intel_wm.c @@ -3,6 +3,8 @@ * Copyright © 2023 Intel Corporation */ +#include <linux/debugfs.h> + #include "i915_drv.h" #include "i9xx_wm.h" #include "intel_display_types.h" diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index 045c7cac166b..e955e399b390 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -3,6 +3,8 @@ * Copyright © 2022 Intel Corporation */ +#include <linux/debugfs.h> + #include <drm/drm_blend.h> #include "i915_drv.h"
Use a forward declaration for struct cec_notifier instead of including media/cec-notifier.h in intel_display_types.h, and only include it where needed. Also realize that a lot of places depend on including linux/debugfs.h via intel_display_types.h -> media/cec-notifier.h -> media/cec.h, and include that too where needed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_alpm.c | 2 ++ drivers/gpu/drm/i915/display/intel_bios.c | 1 + drivers/gpu/drm/i915/display/intel_cdclk.c | 1 + drivers/gpu/drm/i915/display/intel_display_debugfs.c | 1 + drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 ++ drivers/gpu/drm/i915/display/intel_drrs.c | 2 ++ drivers/gpu/drm/i915/display/intel_fbc.c | 1 + drivers/gpu/drm/i915/display/intel_hdmi.c | 2 ++ drivers/gpu/drm/i915/display/intel_hotplug.c | 1 + drivers/gpu/drm/i915/display/intel_opregion.c | 1 + drivers/gpu/drm/i915/display/intel_pps.c | 2 ++ drivers/gpu/drm/i915/display/intel_psr.c | 2 ++ drivers/gpu/drm/i915/display/intel_wm.c | 2 ++ drivers/gpu/drm/i915/display/skl_watermark.c | 2 ++ 15 files changed, 23 insertions(+), 1 deletion(-)