From patchwork Tue Aug 25 13:45:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7071301 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EA67DC05AC for ; Tue, 25 Aug 2015 13:45:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0043D2086B for ; Tue, 25 Aug 2015 13:45:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 210B120864 for ; Tue, 25 Aug 2015 13:45:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 342DA7211A; Tue, 25 Aug 2015 06:45:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C3026E5D8 for ; Tue, 25 Aug 2015 06:45:24 -0700 (PDT) Received: by widdq5 with SMTP id dq5so16508114wid.1 for ; Tue, 25 Aug 2015 06:45:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yO9dIzhO8E+JAaKX5XwxATnq0ukl1A29AP37fNrphj8=; b=bna1J4Evw1FJyE19dVB7iMjbMvSyMtsvmqvgNAmzxeWiNY9x/TpQPoKfO81gBwbS69 +dNkz+bjI9ubhNQBYU6C4eKKVi0ET2qwobHKBz1fXf39QV9Hda1G38MDRiBXCscDeii4 yCpxnJQ80V6d0eeP4uVjdfoJAQ2lfoOqYnUfw= 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:in-reply-to :references; bh=yO9dIzhO8E+JAaKX5XwxATnq0ukl1A29AP37fNrphj8=; b=lPCkghzFujBwxbohlIZk3F0qf35RE2CY2PjbXohrCWE39kXQICp8Yz6if8tKlyupmI pJbb0yxVgRArdr9bjdw5YGFe0ZVc96MEfT4OgkhdnC7RFa77ihSwqscYHgJw98FkQIqI k0sHOgQS5z+OxFCTAg3RKbvbIwbxZR29YS8REQUI49ysmjXDzbt5ug44dtnx3nnRZl5i sIjgmrXb8TZ6w+Kt8igg9kH+Vq9eoxJR18h19dzlwRe+rekSdH5LT7gmdCumXlXyqFX/ m9KBEuvIBiFAAjeufKTuTr+MFbVaZ5LAMGEs03vxUDs8BQdqkBAB2RlpqZsNCnIOmj/i xKrw== X-Gm-Message-State: ALoCoQka+pXJ2+1GSILC15eW4BRDpuXrMX3I3+eeJBoR1z+sK0hBxYHIG32D03BTWzJPPnD9ZQ7p X-Received: by 10.180.106.233 with SMTP id gx9mr5056985wib.32.1440510322760; Tue, 25 Aug 2015 06:45:22 -0700 (PDT) Received: from biers.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id bi6sm28221946wjc.25.2015.08.25.06.45.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Aug 2015 06:45:22 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/4] drm/fb-helper: Use -errno return in restore_mode_unlocked Date: Tue, 25 Aug 2015 15:45:12 +0200 Message-Id: <1440510314-8633-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1440510314-8633-1-git-send-email-daniel.vetter@ffwll.ch> References: <1440510314-8633-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.4 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 Using bool and returning true upon error is very uncommon. Also an int return value is actually what all the callers which did check it seem to have expected. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_fb_helper.c | 19 +++++++++++-------- include/drm/drm_fb_helper.h | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 418d299f3b12..83aacb0cc9df 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -320,11 +320,10 @@ int drm_fb_helper_debug_leave(struct fb_info *info) } EXPORT_SYMBOL(drm_fb_helper_debug_leave); -static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper) +static int restore_fbdev_mode(struct drm_fb_helper *fb_helper) { struct drm_device *dev = fb_helper->dev; struct drm_plane *plane; - bool error = false; int i; drm_warn_on_modeset_not_all_locked(dev); @@ -348,14 +347,15 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper) if (crtc->funcs->cursor_set) { ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0); if (ret) - error = true; + return ret; } ret = drm_mode_set_config_internal(mode_set); if (ret) - error = true; + return ret; } - return error; + + return 0; } /** @@ -365,12 +365,15 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper) * This should be called from driver's drm ->lastclose callback * when implementing an fbcon on top of kms using this helper. This ensures that * the user isn't greeted with a black screen when e.g. X dies. + * + * RETURNS: + * Zero if everything went ok, negative error code otherwise. */ -bool drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper) +int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper) { struct drm_device *dev = fb_helper->dev; - bool ret; - bool do_delayed = false; + bool do_delayed + int ret; drm_modeset_lock_all(dev); ret = restore_fbdev_mode(fb_helper); diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index dbab4622b58f..67de1f10008e 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -136,7 +136,7 @@ int drm_fb_helper_set_par(struct fb_info *info); int drm_fb_helper_check_var(struct fb_var_screeninfo *var, struct fb_info *info); -bool drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper); +int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper); struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper); void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper); @@ -226,10 +226,10 @@ static inline int drm_fb_helper_check_var(struct fb_var_screeninfo *var, return 0; } -static inline bool +static inline int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper) { - return true; + return 0; } static inline struct fb_info *