From patchwork Mon Jun 1 17:53:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 225051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57C6CC433E1 for ; Mon, 1 Jun 2020 18:14:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3046D207DF for ; Mon, 1 Jun 2020 18:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035266; bh=g3sscGhPq9hLVmx658tAsrUj80UrMHlDSMwYPWU6Ecw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lvdapktUbt2yb0bZQj05p/DvslOUHV6FxXtK8raeCoTVWWE9YKgNQmVQOB/BzwmSn VYdb1VvIRtV+P5h1i2N2uV9qGc82JjMYZB6CvJlNMYpdF3xJK4BBHYcLukOXleBe2m OOlm3aeJnFE4bHSM6PZf5fnSEVR0lMdJwt+2F1sM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731449AbgFASOY (ORCPT ); Mon, 1 Jun 2020 14:14:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:34020 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731461AbgFASOQ (ORCPT ); Mon, 1 Jun 2020 14:14:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7380D2065C; Mon, 1 Jun 2020 18:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591035255; bh=g3sscGhPq9hLVmx658tAsrUj80UrMHlDSMwYPWU6Ecw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hxzp8X6/Hmn1J3kTndPqK1bTasA5uib86X4/KHPRYKDla9AXGRhuxVwMpDNmd+kRm aP8IbmOuF2Hjw6W8d2V6DVEMSINv7vbh9lhfgw/PRdPQ59Z4naXWAk4sZMn01LZXYC u2cVSy7YYagqMrHkOssN3aZmot7ujx//+5WUhChY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bernard Zhao , Neil Armstrong , Sasha Levin Subject: [PATCH 5.6 077/177] drm/meson: pm resume add return errno branch Date: Mon, 1 Jun 2020 19:53:35 +0200 Message-Id: <20200601174055.311142505@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174048.468952319@linuxfoundation.org> References: <20200601174048.468952319@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bernard Zhao [ Upstream commit c54a8f1f329197d83d941ad84c4aa38bf282cbbd ] pm_resump api did not handle drm_mode_config_helper_resume error. This change add handle to return drm_mode_config_helper_resume`s error number. This code logic is aligned with api pm_suspend. After this change, the code maybe a bit readable. Signed-off-by: Bernard Zhao Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20200428131747.2099-1-bernard@vivo.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/meson/meson_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index b5f5eb7b4bb9..8c2e1b47e81a 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) if (priv->afbcd.ops) priv->afbcd.ops->init(priv); - drm_mode_config_helper_resume(priv->drm); - - return 0; + return drm_mode_config_helper_resume(priv->drm); } static int compare_of(struct device *dev, void *data)