Commit 5f2d0ed4 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/edid: move edid load declarations to internal header 



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

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

drivers/gpu/drm/drm_crtc_internal.h

+11 −0
Original line number Diff line number Diff line
@@ -290,3 +290,14 @@ void drm_mode_fixup_1366x768(struct drm_display_mode *mode); 
int drm_edid_override_show(struct drm_connector *connector, struct seq_file *m);

int drm_edid_override_set(struct drm_connector *connector, const void *edid, size_t size);

int drm_edid_override_reset(struct drm_connector *connector);



/* drm_edid_load.c */

#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE

const struct drm_edid *drm_edid_load_firmware(struct drm_connector *connector);

#else

static inline const struct drm_edid *

drm_edid_load_firmware(struct drm_connector *connector)

{

	return ERR_PTR(-ENOENT);

}

#endif

drivers/gpu/drm/drm_edid_load.c

+3 −2
Original line number Diff line number Diff line
@@ -11,12 +11,13 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>



#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_connector.h>

#include <drm/drm_drv.h>

#include <drm/drm_edid.h>

#include <drm/drm_print.h>



#include "drm_crtc_internal.h"



static char edid_firmware[PATH_MAX];

module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644);

MODULE_PARM_DESC(edid_firmware, "Do not probe monitor, use specified EDID blob "

include/drm/drm_edid.h

+0 −7
Original line number Diff line number Diff line
@@ -388,15 +388,8 @@ int drm_av_sync_delay(struct drm_connector *connector, 
		      const struct drm_display_mode *mode);



#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE

const struct drm_edid *drm_edid_load_firmware(struct drm_connector *connector);

int __drm_set_edid_firmware_path(const char *path);

int __drm_get_edid_firmware_path(char *buf, size_t bufsize);

#else

static inline const struct drm_edid *

drm_edid_load_firmware(struct drm_connector *connector)

{

	return ERR_PTR(-ENOENT);

}

#endif



bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2);