Merge git://git.denx.de/u-boot-dm

[u-boot] / drivers / video / videomodes.h

diff --git a/drivers/video/videomodes.h b/drivers/video/videomodes.h
index 02419cdeacc6574b76fed30ecb166ee085ad63fb..29a3db4ae3c5fbc40115cdb1664d47f6062538a9 100644 (file)
--- a/drivers/video/videomodes.h
+++ b/drivers/video/videomodes.h
@@ -1,10 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2004
  * Pierre Aubert, Staubli Faverges , <p.aubert@staubli.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#include <edid.h>
 
 #ifndef CONFIG_SYS_DEFAULT_VIDEO_MODE
 #define CONFIG_SYS_DEFAULT_VIDEO_MODE  0x301
@@ -84,3 +84,11 @@ void video_get_ctfb_res_modes(int default_mode, unsigned int default_depth,
                              const struct ctfb_res_modes **mode_ret,
                              unsigned int *depth_ret,
                              const char **options);
+
+void video_get_option_string(const char *options, const char *name,
+                            char *dest, int dest_len, const char *def);
+
+int video_get_option_int(const char *options, const char *name, int def);
+
+int video_edid_dtd_to_ctfb_res_modes(struct edid_detailed_timing *t,
+                                    struct ctfb_res_modes *mode);