Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp964998pxf; Thu, 8 Apr 2021 18:04:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz57K5Na8qsKgvjEQUQ0eKd2dg93SM0K9M/T2iDmIEiThEotW+hY326kr5OCpgMNu1vfCmb X-Received: by 2002:a50:fd12:: with SMTP id i18mr9268899eds.137.1617930260856; Thu, 08 Apr 2021 18:04:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617930260; cv=none; d=google.com; s=arc-20160816; b=EY3A5B8Rh/ipsJFUTsG6nLKs6xR2+EZbxKtCaWKFdLAyszlW/P6LVPPuOpb4UmvIHz exdedwLTkzDfJp3YbXpd5ZBzUhr9KjyNMg6g2nGqWOKYWKyrlIhvkiY48QhzAQ706G0x vgi2nOxd03AvO3SWCXIXDbW4zU5Xkl8cnSswHuByrIv0v+3ZfIkfO8kGFz/fGBdmxr9u fl86QRDC5ht6Zj5rP4blOoK5Q7q0kj8ZgDkkHDV0NeHbzOP+rN+9Bv0QvlMLABY/BGdB beaC+aXVxi+0xrPj8nYkexawq3+d3+CbvUau2HcvcvA/FeS1sGQhxt7xonOPZCgWq+x8 yV9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=fHB/+dK6Mq9Z5oA7LjLWEposRFG9O6Ln3UZNEI50HN8=; b=H077e6IvV7OcM/+Yy1RYqxRa5Or4Y6DbUuahNvPZIM+fn6VfV4/YJO3HkVY/G2H8Vu KiBHLj1TLY+mj4WzEcOfLSCH39Menf1/etXCJvkRzu59NSYVximgBpWqSQLASPn8z6u6 gKZ3ofgCz/dF3w7I90QWKyDkboSXuDzzaZU9l2xJCmnuCus3d7q2pilYJ/io1lY8uxFR PAlYcu1tPTR0UT4QvMi1uBbbFSMjwYKp/UCN12GELWm1kihpQVp63gA/elYN/mZuuAjD P8oMw82YEMa81/JP+DBXPdGFo/GQSjSlfTj5JLOk60iLdWm2HGS9ZtqxoL/lO/1TlEi5 0ibQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@126.com header.s=s110527 header.b=F1ZvPebr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=126.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i13si707855ejy.221.2021.04.08.18.03.57; Thu, 08 Apr 2021 18:04:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@126.com header.s=s110527 header.b=F1ZvPebr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=126.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232967AbhDIBCH (ORCPT + 99 others); Thu, 8 Apr 2021 21:02:07 -0400 Received: from m15113.mail.126.com ([220.181.15.113]:49228 "EHLO m15113.mail.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232918AbhDIBCG (ORCPT ); Thu, 8 Apr 2021 21:02:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=fHB/+dK6Mq9Z5oA7Lj LWEposRFG9O6Ln3UZNEI50HN8=; b=F1ZvPebr1a47K3BmCsHrDgc/ilqPNyfTva HQTvHC5nBe1UNhMHvroG4X362sGBLURh9yWWM0tuykefmPZJg8x9H312SzBxwCYZ cOuZ0Ov8ImN/IaQAb0NecXgBvEC5wc9Koa21/9DQ0LnE+Xl+q4z5cTDE7MxsthLL IUABXFIKI= Received: from localhost.localdomain (unknown [106.19.194.64]) by smtp3 (Coremail) with SMTP id DcmowAAnL+tzpm9gcYu_QA--.50335S2; Fri, 09 Apr 2021 08:57:25 +0800 (CST) From: wangyingjie55@126.com To: harry.wentland@amd.com, sunpeng.li@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@linux.ie, daniel@ffwll.ch, mikita.lipski@amd.com, eryk.brol@amd.com, aurabindo.pillai@amd.com, Wayne.Lin@amd.com, luben.tuikov@amd.com Cc: wangyingjie55@126.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v1] drm/amd/dc: Fix a missing check bug in dm_dp_mst_detect() Date: Thu, 8 Apr 2021 17:57:20 -0700 Message-Id: <1617929840-13269-1-git-send-email-wangyingjie55@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: DcmowAAnL+tzpm9gcYu_QA--.50335S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Xry8AryxKFWfZryUWw45KFg_yoW8JF1Up3 yUtrZrXr1kZa12934DAF1ruFZ0ya4kXFWUKrWUuw1Y9a48Grs8JayrJrnrWasrWrZIk3y3 Za17X3y7XF1q9w7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UbJ5wUUUUU= X-Originating-IP: [106.19.194.64] X-CM-SenderInfo: 5zdqw5xlqjyxrhvvqiyswou0bp/1tbi7hZvp1tC6ZkkMwAAsO Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yingjie Wang In dm_dp_mst_detect(), We should check whether or not @connector has been unregistered from userspace. If the connector is unregistered, we should return disconnected status. Fixes: 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") Signed-off-by: Yingjie Wang --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 8ab0b9060d2b..103dfd0e9b65 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -271,6 +271,9 @@ dm_dp_mst_detect(struct drm_connector *connector, struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector); struct amdgpu_dm_connector *master = aconnector->mst_port; + if (drm_connector_is_unregistered(connector)) + return connector_status_disconnected; + return drm_dp_mst_detect_port(connector, ctx, &master->mst_mgr, aconnector->port); } -- 2.7.4