drm: move edid property update and add modes out of edid firmware loader

Make the firmware loader more generic and generally useful.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1487344854-18777-2-git-send-email-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 622f788bff4603f7c97def996dc2838ca5e3dee5..1c0495acf341964f7684f9e2bf5336473e7f525a 100644 (file)
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -256,15 +256,14 @@ out:
        return edid;
 }
 
-int drm_load_edid_firmware(struct drm_connector *connector)
+struct edid *drm_load_edid_firmware(struct drm_connector *connector)
 {
        const char *connector_name = connector->name;
        char *edidname, *last, *colon, *fwstr, *edidstr, *fallback = NULL;
-       int ret;
        struct edid *edid;
 
        if (edid_firmware[0] == '\0')
-               return 0;
+               return ERR_PTR(-ENOENT);
 
        /*
         * If there are multiple edid files specified and separated
@@ -293,7 +292,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)
        if (!edidname) {
                if (!fallback) {
                        kfree(fwstr);
-                       return 0;
+                       return ERR_PTR(-ENOENT);
                }
                edidname = fallback;
        }
@@ -305,13 +304,5 @@ int drm_load_edid_firmware(struct drm_connector *connector)
        edid = edid_load(connector, edidname, connector_name);
        kfree(fwstr);
 
-       if (IS_ERR_OR_NULL(edid))
-               return 0;
-
-       drm_mode_connector_update_edid_property(connector, edid);
-       ret = drm_add_edid_modes(connector, edid);
-       drm_edid_to_eld(connector, edid);
-       kfree(edid);
-
-       return ret;
+       return edid;
 }

diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 93381454bdf7b92d6718f65b02c1a76bb674509b..358957118ca96f0f7f0f057c2a1682c41f53efee 100644 (file)
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -311,7 +311,13 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
                count = drm_add_edid_modes(connector, edid);
                drm_edid_to_eld(connector, edid);
        } else {
-               count = drm_load_edid_firmware(connector);
+               struct edid *edid = drm_load_edid_firmware(connector);
+               if (!IS_ERR_OR_NULL(edid)) {
+                       drm_mode_connector_update_edid_property(connector, edid);
+                       count = drm_add_edid_modes(connector, edid);
+                       drm_edid_to_eld(connector, edid);
+                       kfree(edid);
+               }
                if (count == 0)
                        count = (*connector_funcs->get_modes)(connector);
        }

diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 43fb0ac5eb9c352096622c1ac2b714e0419647d6..a55eea4afb61af0af7d31850898440309d8af92b 100644 (file)
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -331,11 +331,12 @@ int drm_av_sync_delay(struct drm_connector *connector,
                      const struct drm_display_mode *mode);
 
 #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
-int drm_load_edid_firmware(struct drm_connector *connector);
+struct edid *drm_load_edid_firmware(struct drm_connector *connector);
 #else
-static inline int drm_load_edid_firmware(struct drm_connector *connector)
+static inline struct edid *
+drm_load_edid_firmware(struct drm_connector *connector)
 {
-       return 0;
+       return ERR_PTR(-ENOENT);
 }
 #endif