From: Harry Wentland Subject: Re: [PATCH] drm: fix missing reference counting decrease Date: Tue, 9 Feb 2016 09:48:35 -0500 Message-ID: <56B9FC43.3040407@amd.com> References: <1454342909-15327-1-git-send-email-wuninsu@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050702040803040104090205" Return-path: Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0085.outbound.protection.outlook.com [207.46.100.85]) by gabe.freedesktop.org (Postfix) with ESMTPS id D04216E055 for ; Tue, 9 Feb 2016 07:02:48 -0800 (PST) In-Reply-To: <1454342909-15327-1-git-send-email-wuninsu@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Insu Yun , airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: yeongjin.jang@gatech.edu, taesoo@gatech.edu, insu@gatech.edu, changwoo@gatech.edu, "Deucher, Alexander" , "Lysenko, Mykola" List-Id: dri-devel@lists.freedesktop.org --------------050702040803040104090205 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit This looks good but we should probably do the same for all return paths when reference for port has been acquired. Please see attached patch. Thanks, Harry On 2016-02-01 11:08 AM, Insu Yun wrote: > In drm_dp_mst_allocate_vcpi, it returns true in two paths, > but in one path, there is no reference couting decrease. > > Signed-off-by: Insu Yun > --- > drivers/gpu/drm/drm_dp_mst_topology.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index 6ed90a2..fe273b6 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -2446,6 +2446,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp > DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn); > if (pbn == port->vcpi.pbn) { > *slots = port->vcpi.num_slots; > + drm_dp_put_port(port); > return true; > } > } --------------050702040803040104090205 Content-Type: text/x-patch; name="0001-drm-dp-mst-Fix-missing-ref-count-decrease.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-drm-dp-mst-Fix-missing-ref-count-decrease.patch" >From a6d4dc6206f06a3d1acc05ea5bf3b4885cc96a0a Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Tue, 9 Feb 2016 09:33:11 -0500 Subject: [PATCH] drm/dp/mst: Fix missing ref count decrease Decrease ref count for port on all exit conditions. Signed-off-by: Harry Wentland Reviewed-by: Mykola Lysenko --- drivers/gpu/drm/drm_dp_mst_topology.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 5662e68ecccd..fa50fd0cb5ef 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2498,7 +2498,8 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n", port->vcpi.vcpi, port->vcpi.pbn, pbn); if (pbn == port->vcpi.pbn) { *slots = port->vcpi.num_slots; - return true; + ret = 0; + goto out; } } @@ -2510,10 +2511,10 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp DRM_DEBUG_KMS("initing vcpi for %d %d\n", pbn, port->vcpi.num_slots); *slots = port->vcpi.num_slots; - drm_dp_put_port(port); - return true; + ret = 0; out: - return false; + drm_dp_put_port(port); + return ret == 0; } EXPORT_SYMBOL(drm_dp_mst_allocate_vcpi); -- 2.1.4 --------------050702040803040104090205 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --------------050702040803040104090205--