libhwcomposer: Move video mode selection out of common function

The video mode selection may require tuning based on the display that
is being configured, move selecting the mode out of the configuration
populating function and select it outside. Pass the selected mode into
the function by reference to keep a similar code flow.

Signed-off-by: Andrew F. Davis <afd@ti.com>

1 files changed, 12 insertions, 15 deletions

diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index 55530b0..e452d1b 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -148,11 +148,8 @@ static void get_connectors(omap_hwc_device_t* hwc_dev)
 }
 
 static void setup_display_config(kms::Connector* connector, display_config_t *config,
-                                kms::Videomode *mode)
+                                 kms::Videomode& videomode)
 {
-    // FIXME: Allow selecting other modes until HWC 1.4 support is added
-    kms::Videomode videomode = connector->get_default_mode();
-
     config->xres = videomode.hdisplay;
     config->yres = videomode.vdisplay;
     config->fps = videomode.vrefresh;
@@ -164,8 +161,6 @@ static void setup_display_config(kms::Connector* connector, display_config_t *co
 
     if (!config->ydpi)
         config->ydpi = config->xdpi;
-
-    *mode = videomode;
 }
 
 static int init_primary_display(omap_hwc_device_t* hwc_dev)
@@ -175,12 +170,10 @@ static int init_primary_display(omap_hwc_device_t* hwc_dev)
         return -EBUSY;
     }
 
-    display_config_t config;
-    kms::Videomode mode;
-    kms::Connector* connector = hwc_dev->primaryConector;
     HWCDisplay* display = new HWCDisplay(DISP_ROLE_PRIMARY);
     hwc_dev->displays[HWC_DISPLAY_PRIMARY] = display;
 
+    kms::Connector* connector = hwc_dev->primaryConector;
     if (!connector) {
         ALOGW("No connector found for primary display");
         ALOGW("Using dummy primary display");
@@ -205,7 +198,11 @@ static int init_primary_display(omap_hwc_device_t* hwc_dev)
         return 0;
     }
 
-    setup_display_config(connector, &config, &mode);
+    // FIXME: Allow selecting other modes until HWC 1.4 support is added
+    kms::Videomode mode = connector->get_default_mode();
+
+    display_config_t config;
+    setup_display_config(connector, &config, mode);
     display->configs.push_back(config);
 
     display->disp_link.card = hwc_dev->card;
@@ -228,9 +225,7 @@ static int add_external_hdmi_display(omap_hwc_device_t* hwc_dev)
         return 0;
     }
 
-    kms::Videomode mode;
     kms::Connector* connector = hwc_dev->externalConector;
-
     if (!connector) {
         ALOGE("No connector for external display");
         return -1;
@@ -246,12 +241,14 @@ static int add_external_hdmi_display(omap_hwc_device_t* hwc_dev)
         }
     }
 
-    display_config_t config;
-
     HWCDisplay* display = new HWCDisplay(DISP_ROLE_SECONDARY);
     hwc_dev->displays[HWC_DISPLAY_EXTERNAL] = display;
 
-    setup_display_config(connector, &config, &mode);
+    // FIXME: Allow selecting other modes until HWC 1.4 support is added
+    kms::Videomode mode = connector->get_default_mode();
+
+    display_config_t config;
+    setup_display_config(connector, &config, mode);
     display->configs.push_back(config);
 
     display->disp_link.card = hwc_dev->card;