diff mbox series

ASoC: hdmi-codec: drop drm/drm_edid.h include

Message ID 20231212143038.3828691-1-jani.nikula@intel.com (mailing list archive)
State Superseded
Headers show
Series ASoC: hdmi-codec: drop drm/drm_edid.h include | expand

Commit Message

Jani Nikula Dec. 12, 2023, 2:30 p.m. UTC
hdmi-codec.h does not appear to need drm/drm_edid.h for anything. Remove
it.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

I'm pretty sure I haven't compiled everything that might implicitly
depend on the include. However, the right thing to do is to include
drm_edid.h where needed, not from somewhat random intermediate
headers. I hope this uncovers anything I missed.
---
 include/sound/hdmi-codec.h | 1 -
 1 file changed, 1 deletion(-)

Comments

kernel test robot Dec. 12, 2023, 6:53 p.m. UTC | #1
Hi Jani,

kernel test robot noticed the following build errors:

[auto build test ERROR on tiwai-sound/for-next]
[also build test ERROR on tiwai-sound/for-linus linus/master v6.7-rc5 next-20231212]
[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/ASoC-hdmi-codec-drop-drm-drm_edid-h-include/20231212-223200
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next
patch link:    https://lore.kernel.org/r/20231212143038.3828691-1-jani.nikula%40intel.com
patch subject: [PATCH] ASoC: hdmi-codec: drop drm/drm_edid.h include
config: sparc-allmodconfig (https://download.01.org/0day-ci/archive/20231213/202312130235.qG8OwKk0-lkp@intel.com/config)
compiler: sparc64-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231213/202312130235.qG8OwKk0-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/202312130235.qG8OwKk0-lkp@intel.com/

All error/warnings (new ones prefixed by >>):

   drivers/gpu/drm/msm/dp/dp_display.c: In function 'dp_display_process_hpd_high':
>> drivers/gpu/drm/msm/dp/dp_display.c:406:31: error: implicit declaration of function 'drm_detect_monitor_audio' [-Werror=implicit-function-declaration]
     406 |         dp->audio_supported = drm_detect_monitor_audio(edid);
         |                               ^~~~~~~~~~~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors
--
   drivers/gpu/drm/vc4/vc4_hdmi.c: In function 'vc4_hdmi_is_full_range':
>> drivers/gpu/drm/vc4/vc4_hdmi.c:168:17: error: implicit declaration of function 'drm_default_rgb_quant_range' [-Werror=implicit-function-declaration]
     168 |                 drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_FULL;
         |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
   drivers/gpu/drm/vc4/vc4_hdmi.c: In function 'vc4_hdmi_handle_hotplug':
>> drivers/gpu/drm/vc4/vc4_hdmi.c:437:16: error: implicit declaration of function 'drm_get_edid'; did you mean 'drm_gem_evict'? [-Werror=implicit-function-declaration]
     437 |         edid = drm_get_edid(connector, vc4_hdmi->ddc);
         |                ^~~~~~~~~~~~
         |                drm_gem_evict
>> drivers/gpu/drm/vc4/vc4_hdmi.c:437:14: warning: assignment to 'struct edid *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
     437 |         edid = drm_get_edid(connector, vc4_hdmi->ddc);
         |              ^
   drivers/gpu/drm/vc4/vc4_hdmi.c: In function 'vc4_hdmi_connector_get_modes':
   drivers/gpu/drm/vc4/vc4_hdmi.c:508:14: warning: assignment to 'struct edid *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
     508 |         edid = drm_get_edid(connector, vc4_hdmi->ddc);
         |              ^
>> drivers/gpu/drm/vc4/vc4_hdmi.c:514:15: error: implicit declaration of function 'drm_add_edid_modes' [-Werror=implicit-function-declaration]
     514 |         ret = drm_add_edid_modes(connector, edid);
         |               ^~~~~~~~~~~~~~~~~~
   drivers/gpu/drm/vc4/vc4_hdmi.c: In function 'vc4_hdmi_set_avi_infoframe':
>> drivers/gpu/drm/vc4/vc4_hdmi.c:910:15: error: implicit declaration of function 'drm_hdmi_avi_infoframe_from_display_mode'; did you mean 'drm_hdmi_avi_infoframe_content_type'? [-Werror=implicit-function-declaration]
     910 |         ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
         |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |               drm_hdmi_avi_infoframe_content_type
>> drivers/gpu/drm/vc4/vc4_hdmi.c:917:9: error: implicit declaration of function 'drm_hdmi_avi_infoframe_quant_range'; did you mean 'drm_hdmi_avi_infoframe_content_type'? [-Werror=implicit-function-declaration]
     917 |         drm_hdmi_avi_infoframe_quant_range(&frame.avi,
         |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |         drm_hdmi_avi_infoframe_content_type
   drivers/gpu/drm/vc4/vc4_hdmi.c: In function 'vc4_hdmi_sink_supports_format_bpc':
>> drivers/gpu/drm/vc4/vc4_hdmi.c:1930:18: error: implicit declaration of function 'drm_match_cea_mode' [-Werror=implicit-function-declaration]
    1930 |         u8 vic = drm_match_cea_mode(mode);
         |                  ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/vc4/vc4_hdmi.c:1950:70: error: 'DRM_EDID_HDMI_DC_30' undeclared (first use in this function)
    1950 |                 if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
         |                                                                      ^~~~~~~~~~~~~~~~~~~
   drivers/gpu/drm/vc4/vc4_hdmi.c:1950:70: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/gpu/drm/vc4/vc4_hdmi.c:1955:70: error: 'DRM_EDID_HDMI_DC_36' undeclared (first use in this function)
    1955 |                 if (bpc == 12 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_36)) {
         |                                                                      ^~~~~~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors


vim +/drm_detect_monitor_audio +406 drivers/gpu/drm/msm/dp/dp_display.c

c943b4948b5848 Chandan Uddaraju 2020-08-27  381  
c943b4948b5848 Chandan Uddaraju 2020-08-27  382  static int dp_display_process_hpd_high(struct dp_display_private *dp)
c943b4948b5848 Chandan Uddaraju 2020-08-27  383  {
c943b4948b5848 Chandan Uddaraju 2020-08-27  384  	int rc = 0;
c943b4948b5848 Chandan Uddaraju 2020-08-27  385  	struct edid *edid;
c943b4948b5848 Chandan Uddaraju 2020-08-27  386  
c943b4948b5848 Chandan Uddaraju 2020-08-27  387  	dp->panel->max_dp_lanes = dp->parser->max_dp_lanes;
0e7f270591a42f Kuogee Hsieh     2022-12-27  388  	dp->panel->max_dp_link_rate = dp->parser->max_dp_link_rate;
0e7f270591a42f Kuogee Hsieh     2022-12-27  389  
0e7f270591a42f Kuogee Hsieh     2022-12-27  390  	drm_dbg_dp(dp->drm_dev, "max_lanes=%d max_link_rate=%d\n",
0e7f270591a42f Kuogee Hsieh     2022-12-27  391  		dp->panel->max_dp_lanes, dp->panel->max_dp_link_rate);
c943b4948b5848 Chandan Uddaraju 2020-08-27  392  
c943b4948b5848 Chandan Uddaraju 2020-08-27  393  	rc = dp_panel_read_sink_caps(dp->panel, dp->dp_display.connector);
c943b4948b5848 Chandan Uddaraju 2020-08-27  394  	if (rc)
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  395  		goto end;
c943b4948b5848 Chandan Uddaraju 2020-08-27  396  
c943b4948b5848 Chandan Uddaraju 2020-08-27  397  	dp_link_process_request(dp->link);
c943b4948b5848 Chandan Uddaraju 2020-08-27  398  
bfcc3d8f94f4cb Dmitry Baryshkov 2023-09-04  399  	drm_dp_set_subconnector_property(dp->dp_display.connector, connector_status_connected,
bfcc3d8f94f4cb Dmitry Baryshkov 2023-09-04  400  					 dp->panel->dpcd, dp->panel->downstream_ports);
bfcc3d8f94f4cb Dmitry Baryshkov 2023-09-04  401  
c943b4948b5848 Chandan Uddaraju 2020-08-27  402  	edid = dp->panel->edid;
c943b4948b5848 Chandan Uddaraju 2020-08-27  403  
b78c77273a5648 Abhinav Kumar    2023-04-27  404  	dp->dp_display.psr_supported = dp->panel->psr_cap.version && psr_enabled;
cd779808cccd50 Vinod Polimera   2023-03-02  405  
c943b4948b5848 Chandan Uddaraju 2020-08-27 @406  	dp->audio_supported = drm_detect_monitor_audio(edid);
c943b4948b5848 Chandan Uddaraju 2020-08-27  407  	dp_panel_handle_sink_request(dp->panel);
c943b4948b5848 Chandan Uddaraju 2020-08-27  408  
c943b4948b5848 Chandan Uddaraju 2020-08-27  409  	dp->dp_display.max_dp_lanes = dp->parser->max_dp_lanes;
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  410  
f21c8a276c2dad Kuogee Hsieh     2021-05-21  411  	/*
f21c8a276c2dad Kuogee Hsieh     2021-05-21  412  	 * set sink to normal operation mode -- D0
f21c8a276c2dad Kuogee Hsieh     2021-05-21  413  	 * before dpcd read
f21c8a276c2dad Kuogee Hsieh     2021-05-21  414  	 */
f21c8a276c2dad Kuogee Hsieh     2021-05-21  415  	dp_link_psm_config(dp->link, &dp->panel->link_info, false);
f21c8a276c2dad Kuogee Hsieh     2021-05-21  416  
6625e2637d93d2 Tanmay Shah      2020-09-25  417  	dp_link_reset_phy_params_vx_px(dp->link);
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  418  	rc = dp_ctrl_on_link(dp->ctrl);
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  419  	if (rc) {
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  420  		DRM_ERROR("failed to complete DP link training\n");
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  421  		goto end;
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  422  	}
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  423  
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  424  	dp_add_event(dp, EV_USER_NOTIFICATION, true, 0);
8ede2ecc3e5ee3 Kuogee Hsieh     2020-09-11  425  
c943b4948b5848 Chandan Uddaraju 2020-08-27  426  end:
c943b4948b5848 Chandan Uddaraju 2020-08-27  427  	return rc;
c943b4948b5848 Chandan Uddaraju 2020-08-27  428  }
c943b4948b5848 Chandan Uddaraju 2020-08-27  429
diff mbox series

Patch

diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
index 9b162ac1e08e..5e1a9eafd10f 100644
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
@@ -12,7 +12,6 @@ 
 
 #include <linux/of_graph.h>
 #include <linux/hdmi.h>
-#include <drm/drm_edid.h>
 #include <sound/asoundef.h>
 #include <sound/soc.h>
 #include <uapi/sound/asound.h>