Message-ID: <52f84169-b50f-3ac3-a4df-45e20b349fa2@amd.com>
Date:   Wed, 8 Feb 2023 15:15:27 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.7.1
Subject: Re: [PATCH] drm/amd/display: don't call dc_interrupt_set() for
 disabled crtcs
To:     Hamza Mahfooz <hamza.mahfooz@amd.com>,
        amd-gfx@lists.freedesktop.org
Cc:     Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Alan Liu <HaoPing.Liu@amd.com>, Alex Hung <alex.hung@amd.com>,
        Deepak R Varma <drv@mailo.com>,
        Melissa Wen <mwen@igalia.com>, Tony Cheng <Tony.Cheng@amd.com>,
        Mario Kleiner <mario.kleiner.de@gmail.com>,
        Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20230208200150.155684-1-hamza.mahfooz@amd.com>
Content-Language: en-US
From:   Harry Wentland <harry.wentland@amd.com>
In-Reply-To: <20230208200150.155684-1-hamza.mahfooz@amd.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGh1Ny9zUlAxejZna0RUUXNVcmtHaitCVXZKTklMbWptOWNveEY4b1RNN0VM?=
 =?utf-8?B?VHQ1VzRWd2xpeXh5ejllVnpMVkVKelpyTlVMcUVHTFNjaE80V05WSU5MbXp4?=
 =?utf-8?B?WDBlOWlpTGpxTTFaZ0JlME9HVXF0b3VJU0FYa1hGM3o2YlVrVGZJSkJ5ZkNX?=
 =?utf-8?B?bDI5YmIrL0x1UmFvdm9Bbml4SGI0aXk3V1dMVlYzdDNHa3V4RXRoOWFza2s2?=
 =?utf-8?B?OG1LcGFSYk9ab0xYTGh3eERwTWlzYjhYaytsV29yZVNsUTNLK3ROdWU3OWJx?=
 =?utf-8?B?b2poK1BySklSc2swTTZTaHdUVUpZemM0TXJVK1oySVB2WHkxdjZZZkRVTDNY?=
 =?utf-8?B?Z1dFZEE4bUpBbVJXdjlySDJLdjRDN29ROGk3cm9ibUE5allYZ2REUUdXZE5p?=
 =?utf-8?B?U1ltZHU1S00ybms4UDZBeVBMZ1RldndkSmZ1MUxaelhZclpQd2hSbnFWL3lh?=
 =?utf-8?B?TXNhaGlsalBGWGFXcjdGRTd3NTVHRUhpT3J6RzBxNDY0YUw2clM1cUZWcTFj?=
 =?utf-8?B?bmdUaW1GNzI1bmV4c3R1Yk9HQ3c0dkhEUDZ2Z0FSZWI0NEpwZlBDY3NVYWIv?=
 =?utf-8?B?bXFHY0p0MzBVeS9UWENhWmFoNmhBZUR2TTRYZFJUQjEzUTl3bzNVL1FCY1Fn?=
 =?utf-8?B?WHFhbGpFLytuZTZsSjl6MnFHZEJxU3lhc2s4NVhJWEMxaGpmYmZNUm8vL3lF?=
 =?utf-8?B?N2R1TmV6bHJZTUpvVFM0TEpWSUhYandVNmhlQUF3TVp2OUZ3ZVhsQi9aOEwx?=
 =?utf-8?B?MmJVVFRqSUw0THVoOW9tZ0RKYSt6TkRmc0ZXMERRdG16RC9wa3FORWdpc0tl?=
 =?utf-8?B?MzFDaHR4dTBrSlNaVGNKdmszZWRJdnc5ajIycm9YYWh1V2I1aXg1NnFDczRY?=
 =?utf-8?B?Tk10bFVVekQrZDF3d3pIdmxzR2pKeUtoNUxVMG8xRmhtMUludzZRbFN2VHg3?=
 =?utf-8?B?VzdiS0pPMjNUQlZjUTZRVHhKMzYxRTlHRE9QRVFvZUtSQ2RXNTJaTG1rL0kx?=
 =?utf-8?B?Ym0rcjlBcXZvd21pdWFSdS9TeFA1dkM4WldyQTM3cXNjM2JLUTZBODhIWkFs?=
 =?utf-8?B?MGs3NnBKUEFMdTRwM1pac0tQek5vSW9BM2lMYnNIaTJ6M0E3aW9QVktRZU9I?=
 =?utf-8?B?c3l3MnVNMmlBdlhNQmFIRlZNL09zMDJVNzBNby8vTWVxaUtDSk9yMi9EQzlt?=
 =?utf-8?B?Mk5hVW9Hb0R6eS9ZUytTWTRyV29xUERFZUpKSWhFLzFzNHFtWXpvL0lPQmUw?=
 =?utf-8?B?RnZFTTZoc254bStuTVJhL1B5djZTN21ZMmxLNHpSZ3pZRXhaUVhBZGpMZzhl?=
 =?utf-8?B?OVQ0OW03cE00dm5ENTRaN2FFWUo3dFdDS0ZmMlFKYlZBa2dxUWVVMGd2bE1w?=
 =?utf-8?B?Z2hScTJndzlBa24rQTIrcGU5dEJMQ1J0V2F4aFVZNDFFcGQzK2VWUDdqS1dN?=
 =?utf-8?B?R2tjclZ1d1VBbHczV3ppTFdnakhVZTd5MkR6cDJJWkxManA4WFliWEdGeDJm?=
 =?utf-8?B?Z21vQy9BdTJLU0tDakVNbTN6MUl2OTdqdnluM2Q5aU1mWWRIYjZwR2tNcHJh?=
 =?utf-8?B?bHFNTEkvZWw3NXp4SjJuUThJRDFQRTU1L2hLVE8vVks4QXoyVTRVNWxOWWgz?=
 =?utf-8?B?L1dHOXh1c2NiTnN6bmFwRmJsMVJuSVkyWHYxYUx4dkQwTzhrTWhpZGVYK1di?=
 =?utf-8?B?dnRkSENpRU0reWIxZ1VxN2JmUVZkdFJFenVFN2tJNTRXVWxvcGxWK2FWNjAy?=
 =?utf-8?B?NWVoZ0dhUmdGQXMyOHE3Sk5MR3VBbGpDRTZJZmhlMEhFaXRlRWpHenBueVpo?=
 =?utf-8?B?SnVTbXNoT3dMQ1ZQTmhNWE05K3IxYmlOSFNEUjNPOUpPbzdMRmE2WmFXOVla?=
 =?utf-8?B?bkFMTVdaeHFMSU1YRDVIYUI2OTE2R0lNRFhnOVhqdnpKRVc4ME9IdXRNZWhV?=
 =?utf-8?B?MEJQTVBtM2tJbnFtSmZnSjJqVGJsdzdHZjVISEp2aEZkc2pob09FNzdCTk50?=
 =?utf-8?B?OUR5UE9YOTE2RVFsbGhkc01lZjg3NmMwY1J0NnF2UStCZ1VNWEVkazI4YzdV?=
 =?utf-8?B?RFNHK2VxNFlPM29GMEQyY1l2bHoyNDdYeVRJRzZhMlVqOStxOFlEblZsWk9U?=
 =?utf-8?Q?ZeZycDZfPNrxI8jW1GOCJwu4X?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 65093a7e-60cc-48c8-fd44-08db0a113a8c
X-MS-Exchange-CrossTenant-AuthSource: CO6PR12MB5427.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2023 20:15:31.8440
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: s98JGYuYQ2K6xjckg5bycvulUgkXbn14mBKFFm2ScjI0GGnHAIai+tzjE/5LLLeFAIPjn+tO0hUAGi32ev3J/w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6419
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2/8/23 15:01, Hamza Mahfooz wrote:
> As made mention of in commit 4ea7fc09539b ("drm/amd/display: Do not
> program interrupt status on disabled crtc"), we shouldn't program
> disabled crtcs. So, filter out disabled crtcs in dm_set_vupdate_irq()
> and dm_set_vblank().
> 
> Fixes: 589d2739332d ("drm/amd/display: Use crtc enable/disable_vblank hooks")
> Fixes: d2574c33bb71 ("drm/amd/display: In VRR mode, do DRM core vblank handling at end of vblank. (v2)")
> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> index 1e39d0939700..dc4f37240beb 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> @@ -77,6 +77,9 @@ int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable)
>  	struct amdgpu_device *adev = drm_to_adev(crtc->dev);
>  	int rc;
>  
> +	if (acrtc->otg_inst == -1)
> +		return 0;
> +
>  	irq_source = IRQ_TYPE_VUPDATE + acrtc->otg_inst;
>  
>  	rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
> @@ -151,6 +154,9 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
>  	struct vblank_control_work *work;
>  	int rc = 0;
>  
> +	if (acrtc->otg_inst == -1)
> +		goto skip;
> +
>  	if (enable) {
>  		/* vblank irq on -> Only need vupdate irq in vrr mode */
>  		if (amdgpu_dm_vrr_active(acrtc_state))
> @@ -168,6 +174,7 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
>  	if (!dc_interrupt_set(adev->dm.dc, irq_source, enable))
>  		return -EBUSY;
>  
> +skip:
>  	if (amdgpu_in_reset(adev))
>  		return 0;
>