From mboxrd@z Thu Jan 1 00:00:00 1970 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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 C5068C072B1 for ; Thu, 30 May 2019 04:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C9C925BBC for ; Thu, 30 May 2019 04:52:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559191961; bh=586UX50h3Q4BsZQ0CM1cGiV0zVjXiFeWaTgd7/PqEQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=A55lJt475TtuMapeosZnvUUtTjAsHSdNEIpzK2Q5LA+POUHEo6bFlAE1udQ8q0lN5 P/mZVsmgYxgYe2SwEHCLhsJ5GvbkR7vvMp4tCvmM+bJu4hinmLOP2t7DCun1z0oCzp KwTY3nAK5aetWkMeWXeDkXVayJW2La+tRi89NiUA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728334AbfE3Ewa (ORCPT ); Thu, 30 May 2019 00:52:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48736 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728244AbfE3DKt (ORCPT ); Wed, 29 May 2019 23:10:49 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 6E7BE244C4; Thu, 30 May 2019 03:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185849; bh=586UX50h3Q4BsZQ0CM1cGiV0zVjXiFeWaTgd7/PqEQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1kabqHi/630s0UkgdAW0dTMn9f3eBpMTO5ognJKO874j/3Cwe5mYGqDUWiFRjHStb N7Jos5cyGbUZxJod3VNreZPHPAQBjUIgRMWZEoz4YCFo4s/9I/fVabndojOxDz/kvx QnvycZ50dD+O8dQnjcMVOhP1jjkzPlQ6D7WRzM54= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeykumar Sankaran , Sean Paul , Rob Clark , Sasha Levin Subject: [PATCH 5.1 172/405] drm/msm/dpu: release resources on modeset failure Date: Wed, 29 May 2019 20:02:50 -0700 Message-Id: <20190530030549.825412015@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit a7fcc3237f31a4e206953bb73cf41bd429442f09 ] release resources allocated in mode_set if any of the hw check fails. Most of these checks are not necessary and they will be removed in the follow up patches with state based resource allocations. Signed-off-by: Jeykumar Sankaran Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/1550107156-17625-4-git-send-email-jsanka@codeaurora.org Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 5aa3307f3f0c5..f59c00191a2a2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1023,13 +1023,13 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, if (!dpu_enc->hw_pp[i]) { DPU_ERROR_ENC(dpu_enc, "no pp block assigned" "at idx: %d\n", i); - return; + goto error; } if (!hw_ctl[i]) { DPU_ERROR_ENC(dpu_enc, "no ctl block assigned" "at idx: %d\n", i); - return; + goto error; } phys->hw_pp = dpu_enc->hw_pp[i]; @@ -1042,6 +1042,9 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc, } dpu_enc->mode_set_complete = true; + +error: + dpu_rm_release(&dpu_kms->rm, drm_enc); } static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) -- 2.20.1