Commit a4dea9a0 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/edid/firmware: drop drm_kms_helper.edid_firmware backward compat 



Since the edid_firmware module parameter was moved from
drm_kms_helper.ko to drm.ko in v4.15, we've had a backwards
compatibility helper in place, with a DRM_NOTE() suggesting to migrate
to drm.edid_firmware. This was added in commit ac6c35a4 ("drm: add
backwards compatibility support for drm_kms_helper.edid_firmware").

More than five years and 30+ kernel releases later, drop the backward
compatibility.

v2: Drop the warnings too

Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231114151406.61230-1-jani.nikula@intel.com
parent 38360bf9

drivers/gpu/drm/drm_edid_load.c

+0 −16
Original line number Diff line number Diff line
@@ -23,22 +23,6 @@ module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644); 
MODULE_PARM_DESC(edid_firmware, "Do not probe monitor, use specified EDID blob "

	"from built-in data or /lib/firmware instead. ");



/* Use only for backward compatibility with drm_kms_helper.edid_firmware */

int __drm_set_edid_firmware_path(const char *path)

{

	scnprintf(edid_firmware, sizeof(edid_firmware), "%s", path);



	return 0;

}

EXPORT_SYMBOL(__drm_set_edid_firmware_path);



/* Use only for backward compatibility with drm_kms_helper.edid_firmware */

int __drm_get_edid_firmware_path(char *buf, size_t bufsize)

{

	return scnprintf(buf, bufsize, "%s", edid_firmware);

}

EXPORT_SYMBOL(__drm_get_edid_firmware_path);



#define GENERIC_EDIDS 6

static const char * const generic_edid_name[GENERIC_EDIDS] = {

	"edid/800x600.bin",

drivers/gpu/drm/drm_kms_helper_common.c

+0 −32
Original line number Diff line number Diff line
@@ -27,38 +27,6 @@ 


#include <linux/module.h>



#include <drm/drm_edid.h>

#include <drm/drm_print.h>



#include "drm_crtc_helper_internal.h"



MODULE_AUTHOR("David Airlie, Jesse Barnes");

MODULE_DESCRIPTION("DRM KMS helper");

MODULE_LICENSE("GPL and additional rights");
 


#if IS_ENABLED(CONFIG_DRM_LOAD_EDID_FIRMWARE)



/* Backward compatibility for drm_kms_helper.edid_firmware */

static int edid_firmware_set(const char *val, const struct kernel_param *kp)

{

	DRM_NOTE("drm_kms_helper.edid_firmware is deprecated, please use drm.edid_firmware instead.\n");



	return __drm_set_edid_firmware_path(val);

}



static int edid_firmware_get(char *buffer, const struct kernel_param *kp)

{

	return __drm_get_edid_firmware_path(buffer, PAGE_SIZE);

}



static const struct kernel_param_ops edid_firmware_ops = {

	.set = edid_firmware_set,

	.get = edid_firmware_get,

};



module_param_cb(edid_firmware, &edid_firmware_ops, NULL, 0644);

__MODULE_PARM_TYPE(edid_firmware, "charp");

MODULE_PARM_DESC(edid_firmware,

		 "DEPRECATED. Use drm.edid_firmware module parameter instead.");



#endif

include/drm/drm_edid.h

+0 −5
Original line number Diff line number Diff line
@@ -329,11 +329,6 @@ int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb); 
int drm_av_sync_delay(struct drm_connector *connector,

		      const struct drm_display_mode *mode);



#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE

int __drm_set_edid_firmware_path(const char *path);

int __drm_get_edid_firmware_path(char *buf, size_t bufsize);

#endif



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



int