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

drm/edid/firmware: stop using a throwaway platform device

We've used a temporary platform device for firmware EDID loading since
it was introduced in commit da0df92b5731 ("drm: allow loading an EDID as
firmware to override broken monitor"), but there's no explanation why.

Using a temporary device does not play well with CONFIG_FW_CACHE=y,
which caches firmware images (e.g. on suspend) so that drivers can
request firmware when the system is not ready for it, and return the
images from the cache (e.g. during resume). This works automatically for
regular devices, but obviously not for a temporarily created device.

Stop using the throwaway platform device, and use the drm device
instead.

Note that this may still be problematic for cases where the display was
plugged in during suspend, and the firmware wasn't loaded and therefore
not cached before suspend.

References: https://lore.kernel.org/r/20220727074152.43059-1-matthieu.charette@gmail.com
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2061
Reported-by: Matthieu CHARETTE <matthieu.charette@gmail.com>
Tested-by: Matthieu CHARETTE <matthieu.charette@gmail.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20221114111709.434979-1-jani.nikula@intel.com

+1 -12
+1 -12
drivers/gpu/drm/drm_edid_load.c
··· 172 172 fwdata = generic_edid[builtin]; 173 173 fwsize = sizeof(generic_edid[builtin]); 174 174 } else { 175 - struct platform_device *pdev; 176 175 int err; 177 176 178 - pdev = platform_device_register_simple(connector->name, -1, NULL, 0); 179 - if (IS_ERR(pdev)) { 180 - drm_err(connector->dev, 181 - "[CONNECTOR:%d:%s] Failed to register EDID firmware platform device for connector \"%s\"\n", 182 - connector->base.id, connector->name, 183 - connector->name); 184 - return ERR_CAST(pdev); 185 - } 186 - 187 - err = request_firmware(&fw, name, &pdev->dev); 188 - platform_device_unregister(pdev); 177 + err = request_firmware(&fw, name, connector->dev->dev); 189 178 if (err) { 190 179 drm_err(connector->dev, 191 180 "[CONNECTOR:%d:%s] Requesting EDID firmware \"%s\" failed (err=%d)\n",