Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp1881650lql; Wed, 13 Mar 2024 10:39:54 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUBSrh4Ph8Jjon8OroCOoBWMZ0/m7wQGl/XMmh2SaEz9Ax/YUv/ByrJaWqh2yAG9+wOFbkU682GBcWPEi2edgeiQ4SWLr1IwFZi9bhE3g== X-Google-Smtp-Source: AGHT+IFXe65BhstKvqdJbnk7NxIwLX1EUWcrwRD8iAfZZlXiDmQDC0aU+dfx+IomQ7raL7ibGu1k X-Received: by 2002:a05:6a20:9183:b0:1a1:8b4a:e443 with SMTP id v3-20020a056a20918300b001a18b4ae443mr4939055pzd.28.1710351594418; Wed, 13 Mar 2024 10:39:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710351594; cv=pass; d=google.com; s=arc-20160816; b=C7R6+D2cFa+Es4GNG28HlOVyZX2S4O13jW0TiBJXqOzgcSo2vJy6pXNhTZK4kS8AqU ErOcrVTAA9ZR5mJ4gqYbTnlyBOT1UEPB26mooAw9UEImHtDJWjJ4Bo3bqnPJgk2M2vtO SoK761PC0XQd0yj4cuQTIFJzdGSerOMFuHZrZ+c66zfTC8i7NZ/CuN/+mlJeRIN1/IbU BC3AHc/87RgTa6rZX5c5em0UEs0s2vrGhhuQFCapIK5+OjteR6L057ACfy0ljiPrhEYk 5Y2PSvEUmz/KlskTaPi2sLWHz9PXbgtcNQT+1tqhC8aU9Akaj8KVQoaGCKsg1fWaTSRe boXA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=lEqZhdCKPZ79m3ZGkXOvRpL/tjr6y36UQdVTKuEhegI=; fh=iLtq4Gju/41YYkRaEJJtBLz6aKGahwe7O4PiWfTBtgw=; b=l1+rmc8WO+aXI+C+WioyI8SDcRV9jthv6ZycJcITnCCS8hmggbFDv+X3KtMpCGNK82 L4SW6akbRyaeCs2pyel8OUv5sTYBRXMpm2RvjFziF0peru8brgIXz2QpazjnACNOloHG waan0LyGhP5Of7/obKPtxoL2lI85zBNriJtnZSs8YzO7WX/zzb4Rz3GMZHCcZionZuMN 0DDf+H5O1oPZa9CRjge0gS3CFXy5s3iiIQBHwFujhksG8I819mT7A6oENMVdri7RmJAk nmCO33li7Y7KS0aRk9DEjyarFvq9ZnskVxsPicnCWr+c8O7tp/b9+b/AnLSAXbgLQyh0 E/9w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tiTMbvmK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-102018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-102018-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id p14-20020a637f4e000000b005df58c84bfesi9401186pgn.506.2024.03.13.10.39.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 10:39:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-102018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tiTMbvmK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-102018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-102018-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C8EFA28151A for ; Wed, 13 Mar 2024 17:39:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 06537651BD; Wed, 13 Mar 2024 16:44:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tiTMbvmK" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AF1647A6F; Wed, 13 Mar 2024 16:44:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348252; cv=none; b=Iqu82Q2eCXHyrXRisiPBhJaPn6i2rNRNUhbvgdgU9o9vqLoyQuvMTO9ZoKIc7PGnmf+I0qStIMnmPvWba2QZFQimzdJHKwvv6WKNa5SeX6PPoWk/C+yblgzhZyRBbUJRZcCITwCD8IE30VS+rvbkiM4jvr/Y1Qo4LTCdcOYYJ5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348252; c=relaxed/simple; bh=hu6DpvE5WrtXLVtktC2RDOr1HzwCQFEFXKkD6CCXoEY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qZjXL3R9HVEB2Yk6eAjudE1DWM3d/9xlexLl4oCSfJaOpGwJRjf+akh9ksPDIjbiwPXdlbJD4Mo1j3lLO7g5WYcugrAL82P6cA+AJbAsn+eKmR3nMPsRfYYzxPZCX2Lam53unXNeLzNJR4tv7NOCb6AMqqUhMxpinJqdJtiT5U0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tiTMbvmK; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0640C433F1; Wed, 13 Mar 2024 16:44:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710348252; bh=hu6DpvE5WrtXLVtktC2RDOr1HzwCQFEFXKkD6CCXoEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tiTMbvmKsyx73w93QN46IBb2DHWPyCDhJne0/OXUI93WUuu8GYWMh4rALJ94WrhDP 2WgG2A221GyBBoNi2aWVhvfTtJLxvqVAIN6wdoGd4u+FccgB772Kh8gVWQjYo/HSN8 obGqFzUrEBNJVdvsPdJUkHpK9feCq7n9kYwo7VUC8fdL96HvKpVbbCA++qr782BkUl RRAo71ipEk7P3TxmY5bn7KcWAWhcxtrqlZo6k6IsV7/kwZldlzlNd8Ec79ScfBZDOI cSHmgkHo+ClUz4L9C7HDxiG+2+P+wUB996/Sz/xLhANkWP2ynLBlL2LWIw4d5fWdd0 ZTt79M+XF0wJg== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rkRiG-0000000062D-0QH9; Wed, 13 Mar 2024 17:44:20 +0100 From: Johan Hovold To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov Cc: Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Kuogee Hsieh , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/2] drm/msm/dp: fix runtime PM leak on connect failure Date: Wed, 13 Mar 2024 17:43:06 +0100 Message-ID: <20240313164306.23133-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240313164306.23133-1-johan+linaro@kernel.org> References: <20240313164306.23133-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Make sure to balance the runtime PM usage counter (and suspend) before returning on connect failures (e.g. DPCD read failures after a spurious connect event or if link training fails). Fixes: 5814b8bf086a ("drm/msm/dp: incorporate pm_runtime framework into DP driver") Cc: stable@vger.kernel.org # 6.8 Cc: Kuogee Hsieh Signed-off-by: Johan Hovold --- drivers/gpu/drm/msm/dp/dp_display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 8e8cf531da45..78464c395c3d 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -598,6 +598,7 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data) ret = dp_display_usbpd_configure_cb(&pdev->dev); if (ret) { /* link train failed */ dp->hpd_state = ST_DISCONNECTED; + pm_runtime_put_sync(&pdev->dev); } else { dp->hpd_state = ST_MAINLINK_READY; } -- 2.43.2