Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/edid: move edid load declarations to internal header

The EDID loader is internal to drm, not for drivers.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d58a59fede286caa8766e0813f4be492a7200287.1666614699.git.jani.nikula@intel.com

+14 -9
+11
drivers/gpu/drm/drm_crtc_internal.h
··· 290 290 int drm_edid_override_show(struct drm_connector *connector, struct seq_file *m); 291 291 int drm_edid_override_set(struct drm_connector *connector, const void *edid, size_t size); 292 292 int drm_edid_override_reset(struct drm_connector *connector); 293 + 294 + /* drm_edid_load.c */ 295 + #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE 296 + const struct drm_edid *drm_edid_load_firmware(struct drm_connector *connector); 297 + #else 298 + static inline const struct drm_edid * 299 + drm_edid_load_firmware(struct drm_connector *connector) 300 + { 301 + return ERR_PTR(-ENOENT); 302 + } 303 + #endif
+3 -2
drivers/gpu/drm/drm_edid_load.c
··· 11 11 #include <linux/module.h> 12 12 #include <linux/platform_device.h> 13 13 14 - #include <drm/drm_crtc.h> 15 - #include <drm/drm_crtc_helper.h> 14 + #include <drm/drm_connector.h> 16 15 #include <drm/drm_drv.h> 17 16 #include <drm/drm_edid.h> 18 17 #include <drm/drm_print.h> 18 + 19 + #include "drm_crtc_internal.h" 19 20 20 21 static char edid_firmware[PATH_MAX]; 21 22 module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644);
-7
include/drm/drm_edid.h
··· 388 388 const struct drm_display_mode *mode); 389 389 390 390 #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE 391 - const struct drm_edid *drm_edid_load_firmware(struct drm_connector *connector); 392 391 int __drm_set_edid_firmware_path(const char *path); 393 392 int __drm_get_edid_firmware_path(char *buf, size_t bufsize); 394 - #else 395 - static inline const struct drm_edid * 396 - drm_edid_load_firmware(struct drm_connector *connector) 397 - { 398 - return ERR_PTR(-ENOENT); 399 - } 400 393 #endif 401 394 402 395 bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2);