From patchwork Tue Mar 4 20:08:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3766001 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3E7CE9F35F for ; Tue, 4 Mar 2014 20:08:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 62EEB2023F for ; Tue, 4 Mar 2014 20:08:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 83E522022F for ; Tue, 4 Mar 2014 20:08:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 11A4610585B; Tue, 4 Mar 2014 12:08:55 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f46.google.com (mail-ee0-f46.google.com [74.125.83.46]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C34E105841 for ; Tue, 4 Mar 2014 12:08:52 -0800 (PST) Received: by mail-ee0-f46.google.com with SMTP id t10so11631eei.19 for ; Tue, 04 Mar 2014 12:08:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=lznqnk4JKGYK/Fa262dWaNogigZTIOPJ+z49gCpCkQU=; b=j3bfJw0aDTVEpPzeGUonTnnfTCuWwSiCj+GH5qrKJY8+XUt9eShnOMuxnIKxDFqY0H ZVcaWl5/VzppGSPK5LeFjJ5UflGCoksvABAqppciIVK8dkvpxxy2MiEKYZjKJu12jf/3 UFI5sWzqlQo6FT/qswOz1XJD17BNPMbloH2Sg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lznqnk4JKGYK/Fa262dWaNogigZTIOPJ+z49gCpCkQU=; b=VUauUdgt17msvWMaBiFNdxrbFr4WqFZ3ZwVy8RYn6mJ/gerLNpsHsCmwIOtIeNRO0X nfyBZW3w+haucMkU9joeHoR6fEY1PwRKGqWxa7IkO4QnwphxAkVPhxmceCIB2GIixcVg V9NOfsi0Gv1/KXd0Z3BQ1x8zUQ69oapfk5V/Snc5XG4ipgHLPWECdbFMB408S/+Z4VM+ haChpg1gQrCMIg9ZimJLaROgWNuhGaydS+Y1yAHrzaFrwbPmsl3zPG0TBsT8G4Wwc4gb Mi8G0njOqvmwG26FDsQrO34FR27wXFgqwCxKyK66E/dys5i2MtO8seIDkeFXt1mgxoCX KmIQ== X-Gm-Message-State: ALoCoQlcjp6Z+mueFCYw0BKYzh2HfOWfgIeO2DHOcJkx39tfOHRCIFm28PWGeROxFHfOef+8bU1u X-Received: by 10.15.21.2 with SMTP id c2mr1280449eeu.77.1393963732192; Tue, 04 Mar 2014 12:08:52 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id 54sm14567676eek.19.2014.03.04.12.08.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Mar 2014 12:08:49 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 4 Mar 2014 21:08:41 +0100 Message-Id: <1393963722-5617-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/2] drm/i915: s/any_enabled/!fallback/ in fbdev_initial_config X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Daniel Vetter Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_fbdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 4e4b461e0a70..df00e6b01f0d 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -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;