From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 6CC3122C6DC; Sat, 7 Dec 2024 00:49:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733532552; cv=none; b=UdvbvoUYX6xnpBUknpBlP4Ljoa0zkBUUPrDdgOpMmiQooW7UiSmTl771BrXo1JsVuzY/Rj1ZW5cqHfPAx0zLaQ0qOmeDPNU1OCVU4g7j7L5+waZK0U2DP56gXqYuv6bevslDD1pil0nRpV2Ti0vNXJ+jxnnlo8Ba+ArJtlGCJBQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733532552; c=relaxed/simple; bh=kBTarmwfIO+GCCWNjyURqN3Jc9erv0BphZuS6jWcWdE=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=BTt8PrSKmH8C5EZ1oRD0FoeN/xg/uB+tKOh4w8C2hBUYNWiGTs6QGu6c4B+qXoPzeL4y0QrH9QhT58lonai2v9fy2qj4gaYNxZj9OIRyPjHfmqEkGJ8at9c2wqCvPog37Vt7I5ZuTzYpFrEW71rW9dNzIXzS1HaWZ5zFFz+LNIs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=OpS0FShT; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="OpS0FShT" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4B70JxQX023369; Sat, 7 Dec 2024 00:48:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= AK74VPG6A9e2QYgKpR9cQJBVCOoLg7G7LnluO38hQd4=; b=OpS0FShTGFm0IoR/ 6a64wEG/tISKcsQYtnmqcQQVyFbhRSZDPkh+D/Y/UUzcqL80PTLKhKl8xgDUbbLF 6vxADF+2/CztOaUPLELPJC7FbWbf3YbZJKsJRl6sqNUJWcA9mL63+EZdIJ6VN2CN 2gvvpwsbsDCC/+5T7IBMsra+cFIpRPrdRDMGGV9pPEHIndEjzugHM3ZG1dOwUnsh ybHwv5y77qP0o6htqAFDlfP0geOckmGewnGz+/s87BK1aeutBU8840IYzan04gPG DsQb+Ogelkz0Fn6rED2K54b2J0t/lboOiY1uzy833azMCB/tQOHZlEztvbtA1S8L Fepf9A== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 43cbqn019d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 07 Dec 2024 00:48:45 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 4B70miY1011072 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 7 Dec 2024 00:48:44 GMT Received: from [10.134.70.212] (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Fri, 6 Dec 2024 16:48:44 -0800 Message-ID: <80d08449-71de-4a7f-8b2a-8af565d8d701@quicinc.com> Date: Fri, 6 Dec 2024 16:48:43 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 02/22] drm: Add valid clones check To: Maxime Ripard CC: Rob Clark , Dmitry Baryshkov , , Sean Paul , Marijn Suijten , "David Airlie" , Daniel Vetter , "Maarten Lankhorst" , Thomas Zimmermann , , , , , , Rob Clark , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= References: <20240924-concurrent-wb-v2-0-7849f900e863@quicinc.com> <20240924-concurrent-wb-v2-2-7849f900e863@quicinc.com> <20240925-hasty-bald-caribou-eedbf5@houat> Content-Language: en-US From: Jessica Zhang In-Reply-To: <20240925-hasty-bald-caribou-eedbf5@houat> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: -zKcDFja7cx9ZYMB7kSujIe0CKHcr77J X-Proofpoint-GUID: -zKcDFja7cx9ZYMB7kSujIe0CKHcr77J X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 spamscore=0 bulkscore=0 adultscore=0 clxscore=1015 mlxlogscore=999 malwarescore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2411120000 definitions=main-2412070003 On 9/25/2024 12:23 AM, Maxime Ripard wrote: > On Tue, Sep 24, 2024 at 03:59:18PM GMT, Jessica Zhang wrote: >> Check that all encoders attached to a given CRTC are valid >> possible_clones of each other. >> >> Signed-off-by: Jessica Zhang >> --- >> drivers/gpu/drm/drm_atomic_helper.c | 23 +++++++++++++++++++++++ >> 1 file changed, 23 insertions(+) >> >> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c >> index 43cdf39019a4..cc4001804fdc 100644 >> --- a/drivers/gpu/drm/drm_atomic_helper.c >> +++ b/drivers/gpu/drm/drm_atomic_helper.c >> @@ -574,6 +574,25 @@ mode_valid(struct drm_atomic_state *state) >> return 0; >> } >> >> +static int drm_atomic_check_valid_clones(struct drm_atomic_state *state, >> + struct drm_crtc *crtc) >> +{ >> + struct drm_encoder *drm_enc; >> + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, >> + crtc); >> + >> + drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc_state->encoder_mask) { >> + if ((crtc_state->encoder_mask & drm_enc->possible_clones) != >> + crtc_state->encoder_mask) { >> + DRM_DEBUG("crtc%d failed valid clone check for mask 0x%x\n", >> + crtc->base.id, crtc_state->encoder_mask); >> + return -EINVAL; >> + } >> + } >> + >> + return 0; >> +} >> + >> /** >> * drm_atomic_helper_check_modeset - validate state object for modeset changes >> * @dev: DRM device >> @@ -745,6 +764,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, >> ret = drm_atomic_add_affected_planes(state, crtc); >> if (ret != 0) >> return ret; >> + >> + ret = drm_atomic_check_valid_clones(state, crtc); >> + if (ret != 0) >> + return ret; >> } > > Pretty much the same comment, we should have kunit tests for this. Hey Maxime, I'm working on the kunit test for this and had a question on the design for the unit test: Since this is a static helper that returns a pretty common error code, how would you recommend going about making sure that `drm_atomic_check_valid_clones()` specifically is returning the error (and not a different part of check_modeset) when testing the check_valid_clones() failure path? Thanks, Jessica Zhang > > Maxime