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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8B52BC47DD9 for ; Fri, 22 Mar 2024 07:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-ID:In-Reply-To: References:Message-ID:Date:Subject:CC:To:From:Reply-To:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7f4SVNtrYMhP3Wh6GMR46ZjZKODXCKZwjWTdBn9d8Dw=; b=zmAWUCJIzTpzvn 1QJcuVABjKh4It/MwHWg5TGhAQ6cQ2OWLSk4WNHAxzkbDEebF7oi3NSOt/Zqc8e4UMxjS8rntaryR GL89U9GXG+VVXcHPktBqFtKC+f1suENrszpRCJkv+oJRWmMlVaEdMYXoSTqM4o8xMq0hykx4DM1UN ITamatqs237DMy1M+PfCBzy9msD0ZZ4r8K6P3/cXDc9Xc/RMFDuIpiiLfGwDmmX/M2/kQFEN+slC4 HCe+pGW6bTjZfabgKkrpjQjrs5nNJpNfDU7oLQ9Ib5DhzHxI7vET53ngt9UVsxUMioaMPTiyqUHax EgwMqh8jIjXVV+CkACog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnZMy-00000006CGK-3f7b; Fri, 22 Mar 2024 07:31:16 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rnZMw-00000006CFf-05db; Fri, 22 Mar 2024 07:31:15 +0000 X-UUID: 2675ebf4e81e11ee9aa9374d6d45775a-20240322 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=MIME-Version:Content-Transfer-Encoding:Content-ID:Content-Type:In-Reply-To:References:Message-ID:Date:Subject:CC:To:From; bh=puhEBYskqldzdn0YEgrOeXXc866PGgBZtDgdPuoXL58=; b=pzkMRLNTITJtp+w876pmubj0kLZbZuNf1WRfzrA5KeRZGm6JWl0khMzPvDnMXjy9wJ99mf5uAD6yBJzTc7tsqeelGO3UVjncykRMhJxGrkn2HupfXMf5DavVTWR8gWiL6LqkQywQPMkbHDH1fWkKUAXUrqFAB0uRajSjzly7/CU=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.37,REQID:a268865b-7576-4014-943b-ff188bc53342,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:6f543d0,CLOUDID:1f02b590-e2c0-40b0-a8fe-7c7e47299109,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 2675ebf4e81e11ee9aa9374d6d45775a-20240322 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1271751551; Fri, 22 Mar 2024 00:31:08 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by MTKMBS14N2.mediatek.inc (172.21.101.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Fri, 22 Mar 2024 15:30:33 +0800 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (172.21.101.237) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Fri, 22 Mar 2024 15:30:33 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mgr1yd7/9xgP5giP5mVuBiQk8pkLhgh3NTyzVXhE5U1qp73GzbrwcRhZJdPBkdZlJ67nsLdg68lfYfXbsIdZi9EXzXvOjV2jrNHct3wc1h42LkLAhE/iQqUDvfPHfkfOycqnB8svlziwpyonC9+lvcd3JcEJGj8nPifjvEyS3iy7ku/gJCxdAR+zJheExRa76/xdlmNY0pPTgE6cw4QH6FQc1CIxvPaU01Ren90RH6xbwmCIExdcFYrZT7hu4jQql4AalB+U7ecQN64oE8TDJDJLefgigbWZP+9WEJ6bDdF4qpX7HXHvUTM3SfD4Sf5ToXnnb+xHOpJICV9pXIuEBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=puhEBYskqldzdn0YEgrOeXXc866PGgBZtDgdPuoXL58=; b=QmaPMfp3hyFlHe1LbuhUij0WsGQgM16PLqMMGWbk83Z5gbyd9jWSUCjDDsV1COBm7S8HR5EOlW0oJoNCC4XqJK0X4HAGzlWCvzhPZ4jqwTeozeKuivXc9NiWw3LUBDii/2o35ExCy6De3dCXnbUz6uA+G0MKYaQggYVeLrEmnXLcYqCi/1pmrST366YFTEzPqC5egEUUQYaEZlBPvnNKK9ewPtWI0zRh7SY3CiZCmyJHK282BbGk853+I6RP1s+cJucPzvmkJbWb2R/v2Let8dsVre8mmd4nuqDoonMMn2gmxIJkEFNe7rbfENHOQkn5vBqZoffKTwvzI2vdYOMavQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mediatek.com; dmarc=pass action=none header.from=mediatek.com; dkim=pass header.d=mediatek.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mediateko365.onmicrosoft.com; s=selector2-mediateko365-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=puhEBYskqldzdn0YEgrOeXXc866PGgBZtDgdPuoXL58=; b=r2l5Ho4KmHvPLLLyRHCSdikFal2pXYizWVLKxOHABnFks3N0jM3jnQclRKBbCCFp1Visdch0cIYGVcEaruxb7Vgx2Yt5s5QQv2Hpnm1yLn2LQ3PjaPV7Czdi5mxN1dFb4ixMQavJgUIorXvE5JGYRiy8pTyVwtORzOYfmDUzhd4= Received: from TYZPR03MB6624.apcprd03.prod.outlook.com (2603:1096:400:1f4::13) by JH0PR03MB8169.apcprd03.prod.outlook.com (2603:1096:990:3c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Fri, 22 Mar 2024 07:30:30 +0000 Received: from TYZPR03MB6624.apcprd03.prod.outlook.com ([fe80::f3b6:91a7:e0fb:cb27]) by TYZPR03MB6624.apcprd03.prod.outlook.com ([fe80::f3b6:91a7:e0fb:cb27%7]) with mapi id 15.20.7386.031; Fri, 22 Mar 2024 07:30:30 +0000 From: =?utf-8?B?Q0sgSHUgKOiDoeS/iuWFiSk=?= To: "angelogioacchino.delregno@collabora.com" , "chunkuang.hu@kernel.org" CC: "linux-mediatek@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "wenst@chromium.org" , "kernel@collabora.com" , =?utf-8?B?TmFuY3kgTGluICjmnpfmrKPonqIp?= , "daniel@ffwll.ch" , "p.zabel@pengutronix.de" , "dri-devel@lists.freedesktop.org" , =?utf-8?B?TmF0aGFuIEx1ICjlkYLmnbHpnJYp?= , "airlied@gmail.com" , "linux-arm-kernel@lists.infradead.org" , "matthias.bgg@gmail.com" Subject: Re: [PATCH 1/3] drm/mediatek: drm_ddp_comp: Fix and cleanup DDP component CRTC search Thread-Topic: [PATCH 1/3] drm/mediatek: drm_ddp_comp: Fix and cleanup DDP component CRTC search Thread-Index: AQHaVQ2oMq6x1A0jEkiTE1BrVZXBC7FDq4QA Date: Fri, 22 Mar 2024 07:30:30 +0000 Message-ID: <72a1d501d001899eeac9b4c308a291f0fa86e935.camel@mediatek.com> References: <20240201125304.218467-1-angelogioacchino.delregno@collabora.com> <20240201125304.218467-2-angelogioacchino.delregno@collabora.com> In-Reply-To: <20240201125304.218467-2-angelogioacchino.delregno@collabora.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TYZPR03MB6624:EE_|JH0PR03MB8169:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: WY/E313xndTu+J1q3yp2kJR0apRW33HgV/UeecccRpbianzw6aQ33wznBZTtye/1xCwUtn/ize5lFVC3b/+XTjjGwoB3bWN9P5Xauc0tqDacimxGIpODx5hHg3Ewz0+2EjTBBCZnjhfpevFzsjojIvqaaAbldbQ6mdheNGWoEytp4d5KccUhMazOh+ksFN3lGCF2z0Fg8XXCTlDV5mV1hH5CxTjJD6Z9+HERkByPB7ythCCHqL6hx9/mDk+k5HNyMZ72ThlKmExZm5Z2tRoqbByo2Jxzw+NvmjrCY0IFRUTEoXSrI5Hq3AbEzbafJHUc+htRvUSHvB6qEFXpcFdlqcu137TpVflkq3vXbS/XoErbqpTlHcyxa5viFAmzYX3RzH16/KjMOjpaY0OqtepoOYaOIRtlQhSWxY7pNJFQJNb7ACxJUKAc+dbE6lyGexmI1Bzt2dt8D9YOSSw9GSI/tzDV+bWUYCx23IL4EdoWnfcsofvwHNifph0ospbCQD2Aodxrbvc9ieKX3YqwM7/J0g5qqfhG+TjExhHnCRhB9OZjsWRAFP/QZ3Z5hgwIjItQoQBsOlSRX5+vgieX8doCQBWyvfB+H4zquGHnQHqlLUxw6DvYVig1Rs1WiGG6RKKZH0K6lHmbJf1d6skXWtEo7tn9VOkyDtCDVpHsefBpqJQ= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR03MB6624.apcprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(7416005)(366007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?dzA2cW5ZT2o3cnFlSE5DYXRqREl0UHM0a3V5eGVPYkluejI0dWdyeGtiV2Ra?= =?utf-8?B?RnhhNGJ1NEpRcDFBc0doT3pwT2p4OWRRcUJ2NmdHOEVabGRpaHhSZU5lcjdB?= =?utf-8?B?aHBsSEVGeWdIUkN5YXhISkFaZzdRdWNsQWtHVDdnYytMYU1WR3Y2YURHVmlL?= =?utf-8?B?QzBldEM5L0VkR0JZdEpCSmd0MUllYmlSclBqNVRTTXpkbW5oYmZuaHhlNmF6?= =?utf-8?B?V3MxMElJNVpoNmZlSzYvS0dTb0Q2ODltZFJEYmFNR0E4S1pWU1Vvb24zNSt1?= =?utf-8?B?RGUrTzFOQzRSdHhhQUdVZnFDc0Z6TkJITzhkWlNUeC9KRlEvRDRETlNnaTVw?= =?utf-8?B?RCtESHR3VlMrbUU0OVVqRi81MjlhZzIwbWovTW4rbjdIVmJUSEZsbklVNlBo?= =?utf-8?B?bmhHVmdPWlkvdTFZeC9OUXpYNHFQcG9zZ1RSbWhYQzlQSFNObkxsZm42cjBK?= =?utf-8?B?K2FRdkZWWCsvcmFVTzRGYXRzWmc4bGhVMVl6UDRialJrOEQ0TjBicEdTN3Qy?= =?utf-8?B?cnJjR2lFSTBKK1Y0Um1tZm5IYWxLWDR0Nkl2WW9uRW5rNXhLUW9XM05jSFhN?= =?utf-8?B?Q1FDbmJHYWk0UkFjOFp0NnZnSWVVR0QrVUhFTEc1eXEyYTFtSGg1V0MxekFO?= =?utf-8?B?RnBoazAyMTQrY1ZCTWowZE9QQ2Y4d084MDk1elVHTTgyRmhLYjZRdVBnTnY3?= =?utf-8?B?cUY1VWFWNy9WdElqNDhQUXJrNGltZ2FpMlR5aWFhU25VNzZoQ3NEck9UMmtW?= =?utf-8?B?VUxqSWNGbWtSY1pzMXhIaUM4QzFBWE9HNmR2RC8wZktuNEZhYStyT0JOY2tV?= =?utf-8?B?UW9yaDczUWpsQTQrcmZDcEZpNXpsc2hZMlo0WUdJOUJhd09JQzI5ZUxpUXFr?= =?utf-8?B?ZXF0TEVlc0ZRRm5PeDZYWWVxVG5JUDlxTEFsVWV2SzdDRS9UUCtKU3ZxOEtC?= =?utf-8?B?U2hFbXEyVkQ0bHk1OW1WSXJIOWRKSURhWnJmZkVqWmRKYXhsR25kaGFSVk1y?= =?utf-8?B?aVFCN05PWHJSa2dya2N2SHFDTzVyVy9sZzF6OHB5NFVmajJUaHVqYmNtU3lm?= =?utf-8?B?R1BFdSs1OExYSE1Sa1BRemYrenpOOTFWMzhWYzk5WVE2OWowTHFMeEQxSFZs?= =?utf-8?B?Vm8xdzNXRWQ3ZjFEcFlzK0g1SkZNV25ZeUthMFp3eElvYTlNaENpU0I3SlNG?= =?utf-8?B?aVFSekNvSUdxcTM1MWNWdGRPdEFNcW5TRE05VGE4SUZJRG12LzgvVlVKWTJB?= =?utf-8?B?aUFZaGxocy9xUUNORnBKRTQzbUJyRHVER3pDbmNwNlp5YWZiOHVKdFAvSWVX?= =?utf-8?B?VUpUNitkeEtncmM2QlhiK0V6STI2aDhsMjJCYkpSWWRTSC9LUlFBSHJjTmUy?= =?utf-8?B?djRueGd2NTVaaStUbFZpbjlRczVsK3lCZGhzalJaQnE1THNzQ05Eb3c4bEhz?= =?utf-8?B?YzNLdTlzNUlTakdjNzlWTzhtWlY1NGFSTFdocVg5YXA1SWxtM29iZUFnREpt?= =?utf-8?B?aHU0NHFjVWxFcXMyZHgyeTBiZ2pXTDFtdmFwa0lMT05uckdZRERjTlBaUDEw?= =?utf-8?B?Tkk5dVNPcUlVajV1SC9RTnRvVy9td2xWQURoVEZCcDJiakp0Uk84WERxSTk0?= =?utf-8?B?akVOWGRYeGxzMTR2S3A3dmRSeWlhWHlraW1RbXg5YW1HSy80ZE9Zbm5xR05M?= =?utf-8?B?YnNVRnlGUVNLT2V6Nm1wNnZCYkxFZjlOV0puZXV5OWh3WFRBbS9Ga1NCelRs?= =?utf-8?B?K1I0a05DdmZqcDdpYllFU0FuYzZqWHJGRlNHRmQxTk8yWG14cmlmSTBrdUZI?= =?utf-8?B?RW1JaTJaV3k3NkpCMHR3aHlPdkU4UGg0aGV1ekFoNFhZNFZnVCszdVNET1VC?= =?utf-8?B?V1k2cnR0SC9mczE1UnVJSkNIWmlWWE5uUzFFaXEvZTRaSjlUMmMycFRhYzB2?= =?utf-8?B?SVU4UWU1OGZQLzRWMGYwMlRZdU95NWxkZmJQcTE2MFUvd3R3WS90UzFmMk1p?= =?utf-8?B?REtNTVpoMUFWZ1hsTTBscWxYQVNnZ0VaRHZrRDVvV0xIckdVajFVOG9QSndY?= =?utf-8?B?a2c2OEFvSU1IMks0ZVhlS3hRUkxBQW5pZ2tOdlQ3UDRxYlpWbkFKWWFiMWVn?= =?utf-8?Q?8RCRTxsn3SaAH1G8v5E2MOPIf?= Content-ID: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TYZPR03MB6624.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98adec42-61c3-41fa-7050-08dc4a41f3f9 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Mar 2024 07:30:30.5724 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a7687ede-7a6b-4ef6-bace-642f677fbe31 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jaPUSxlPt5GaGfoKSTbw5n/Pthe/noxbJ1f/XxSnmz5h1V1wS+NjgKNq6VCgRAQET3LJfiWQvcY/UljYh4nDHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR03MB8169 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--12.994200-8.000000 X-TMASE-MatchedRID: QW5G6BKkLToNtKv7cnNXnSa1MaKuob8PC/ExpXrHizxX14Hy+eYp7xzX ueN0Y75lGezsckwe5G+L/byGw/LMe6wUHwBRC6FfM8ORI7N4NZaBHKTJ+sfXGVvym/gvSH4iywz sCceHAI+H2C04ZAyahxcMqgLkfh6Nz7wL+9mPXSVIOSHptb5tx1F5adRR2Ej1kXR9dgxJdJDygv NRZ7BeSK1IUMzMQAm6qiMcz9Yi4r3D/HB6o7/l2GlHv4vQHqYTfrTt+hmA5bLhM7UFTEf32QbVb dqUS/dG4vM1YF6AJbY9l7H+TFQgdbew1twePJJB3QfwsVk0UbtuRXh7bFKB7oLwQKKo5MmO9cu2 hSAfYvmXFXEbzm1SQqtPwDbmbqOllExlQIQeRG0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.994200-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: DA05EA874A9009E916197D5E1A5A7BF138821AF3889376CDAE94BF9E98CC4CA72000:8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240322_003114_086161_78CA5C20 X-CRM114-Status: GOOD ( 26.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Angelo: On Thu, 2024-02-01 at 13:53 +0100, AngeloGioacchino Del Regno wrote: > Finding a possible CRTC by DDP component is done by first checking > static routes in three paths (main, external, third/extra path) and > then, if not found, we check for dynamic connection on a per-route > basis because, for example, on some SoCs the main route may output > to either a DSI display or DisplayPort and this is finally done by > assigning a CRTC mask to `possible_crtcs`, found with function > mtk_drm_find_comp_in_ddp_conn_path(): being that a mask the possible > values are BIT(x) and, if no CRTC is possible, zero. > > Problem is, both mtk_drm_find_possible_crtc_by_comp() and the > aforementioned function are trying to return a negative error value > (but it's unsigned int!) if no CRTC was found, which is wrong for > multiple obvious reasons. I does not find anywhere to return negative value. So this patch just like a refine patch not bug fix. Regards, CK > > Cleanup both functions, so that: > - mtk_drm_find_comp_in_ddp_conn_path() returns a signed integer > with a negative number for error, or a bit/bitmask of the found > possible CRTC; and > - mtk_drm_find_possible_crtc_by_comp() always returns either a > bitmask of the possible CRTC, or zero if none available. > > Fixes: 01389b324c97 ("drm/mediatek: Add connector dynamic selection > capability") > Signed-off-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > --- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 44 ++++++++++--------- > -- > 1 file changed, 21 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index a9b5a21cde2d..c13359eeb3cd 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -513,29 +513,25 @@ static bool mtk_drm_find_comp_in_ddp(struct > device *dev, > return false; > } > > -static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device > *dev, > - const struct > mtk_drm_route *routes, > - unsigned int > num_routes, > - struct > mtk_ddp_comp *ddp_comp) > +static int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev, > + const struct > mtk_drm_route *routes, > + unsigned int num_routes, > + struct mtk_ddp_comp > *ddp_comp) > { > - int ret; > - unsigned int i; > + int i; > > - if (!routes) { > - ret = -EINVAL; > - goto err; > + if (!routes || !num_routes) { > + DRM_ERROR("No connection routes specified!\n"); > + return -EINVAL; > } > > for (i = 0; i < num_routes; i++) > if (dev == ddp_comp[routes[i].route_ddp].dev) > return BIT(routes[i].crtc_id); > > - ret = -ENODEV; > -err: > - > - DRM_INFO("Failed to find comp in ddp table, ret = %d\n", ret); > + DRM_ERROR("Failed to find component in ddp table\n"); > > - return 0; > + return -ENODEV; > } > > int mtk_ddp_comp_get_id(struct device_node *node, > @@ -557,22 +553,24 @@ unsigned int > mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm, > struct device *dev) > { > struct mtk_drm_private *private = drm->dev_private; > - unsigned int ret = 0; > + int ret; > > if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, > private->data->main_len, > private->ddp_comp)) > - ret = BIT(0); > + return BIT(0); > else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path, > private->data->ext_len, > private->ddp_comp)) > - ret = BIT(1); > + return BIT(1); > else if (mtk_drm_find_comp_in_ddp(dev, private->data- > >third_path, > private->data->third_len, > private->ddp_comp)) > - ret = BIT(2); > - else > - ret = mtk_drm_find_comp_in_ddp_conn_path(dev, > - private->data- > >conn_routes, > - private->data- > >num_conn_routes, > - private- > >ddp_comp); > + return BIT(2); > + > + ret = mtk_drm_find_comp_in_ddp_conn_path(dev, private->data- > >conn_routes, > + private->data- > >num_conn_routes, > + private->ddp_comp); > + /* No CRTC is available: return a zero mask */ > + if (ret < 0) > + return 0; > > return ret; > } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel