videomodes: Add video_get_ctfb_res_modes helper function

Add a video_get_ctfb_res_modes() helper function, which uses
video_get_video_mode() to parse the 'video-mode' environment variable and then
looks up the matching mode in res_mode_init and returns the matching mode.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Anatolij Gustschin <agust@denx.de>

diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c
index 245917f1891bddbb645103a72f67c5ebbf4bcdd9..45ccb36e848bc102a7e0ddaee4f67e221545b520 100644 (file)
--- a/drivers/video/videomodes.c
+++ b/drivers/video/videomodes.c
@@ -275,3 +275,43 @@ int video_get_video_mode(unsigned int *xres, unsigned int *yres,
 
        return 1;
 }
+
+/*
+ * Parse the 'video-mode' environment variable using video_get_video_mode()
+ * and lookup the matching ctfb_res_modes in res_mode_init.
+ *
+ * @default_mode: RES_MODE_##x## define for the mode to store in mode_ret
+ *   when 'video-mode' is not set or does not contain a valid mode
+ * @default_depth: depth to set when 'video-mode' is not set
+ * @mode_ret: pointer where the mode will be stored
+ * @depth_ret: pointer where the depth will be stored
+ * @options: pointer to any remaining options, or NULL
+ */
+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)
+{
+       unsigned int i, xres, yres, depth, refresh;
+
+       *mode_ret = &res_mode_init[default_mode];
+       *depth_ret = default_depth;
+       *options = NULL;
+
+       if (!video_get_video_mode(&xres, &yres, &depth, &refresh, options))
+               return;
+
+       for (i = 0; i < RES_MODES_COUNT; i++) {
+               if (res_mode_init[i].xres == xres &&
+                   res_mode_init[i].yres == yres &&
+                   res_mode_init[i].refresh == refresh) {
+                       *mode_ret = &res_mode_init[i];
+                       *depth_ret = depth;
+                       return;
+               }
+       }
+
+       printf("video-mode %dx%d-%d@%d not available, falling back to %dx%d-%d@%d\n",
+              xres, yres, depth, refresh, (*mode_ret)->xres,
+              (*mode_ret)->yres, *depth_ret, (*mode_ret)->refresh);
+}

diff --git a/drivers/video/videomodes.h b/drivers/video/videomodes.h
index 579c6850f77816561b55646e3e12059c30347534..02419cdeacc6574b76fed30ecb166ee085ad63fb 100644 (file)
--- a/drivers/video/videomodes.h
+++ b/drivers/video/videomodes.h
@@ -79,3 +79,8 @@ int video_get_params (struct ctfb_res_modes *pPar, char *penv);
 
 int video_get_video_mode(unsigned int *xres, unsigned int *yres,
        unsigned int *depth, unsigned int *freq, const char **options);
+
+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);