]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/i915: s/any_enabled/!fallback/ in fbdev_initial_config
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 4 Mar 2014 20:08:41 +0000 (21:08 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 5 Mar 2014 20:30:05 +0000 (21:30 +0100)
It started as a simple check whether anything is lit up, but now is't
used to driver the general fallback logic to the default output
configuration selector in the helper library. So rename it for more
clarity.

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_fbdev.c

index 4e4b461e0a70c00e0b8ec69997127f0baad43b27..df00e6b01f0da81a8be5602058471a4fc8b3a08f 100644 (file)
@@ -289,7 +289,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
        struct drm_device *dev = fb_helper->dev;
        int i, j;
        bool *save_enabled;
-       bool any_enabled = false;
+       bool fallback = true;
 
        /*
         * If the user specified any force options, just bail here
@@ -347,7 +347,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                 */
                for (j = 0; j < fb_helper->connector_count; j++) {
                        if (crtcs[j] == new_crtc) {
-                               any_enabled = false;
+                               fallback = true;
                                goto out;
                        }
                }
@@ -390,11 +390,11 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                              encoder->crtc->base.id,
                              modes[i]->name);
 
-               any_enabled = true;
+               fallback = false;
        }
 
 out:
-       if (!any_enabled) {
+       if (fallback) {
                memcpy(enabled, save_enabled, dev->mode_config.num_connector);
                kfree(save_enabled);
                return false;