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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 EE905C3DA42 for ; Tue, 9 Jul 2024 09:32:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3586310E4D4; Tue, 9 Jul 2024 09:32:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; secure) header.d=ffwll.ch header.i=@ffwll.ch header.b="ISUKwmQU"; dkim-atps=neutral Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56E0A10E4D4 for ; Tue, 9 Jul 2024 09:32:16 +0000 (UTC) Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2ee9bca8652so2811511fa.3 for ; Tue, 09 Jul 2024 02:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1720517534; x=1721122334; darn=lists.freedesktop.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ewc70fROqt3rzaJz07StrqQmqSZrtwDP5kdVthlFK8I=; b=ISUKwmQU0ES0+c5z3MZg6iUeY7O0uzsJnEcbZ4DYe1J1j9ZUK116y9eDtuqOJgQdEQ VUZvMK2Q060KH+DGWMnlijbZF8owtJA8p5ZnQPmTJMOHnB1/9+pJGGcu5+U653Zwg2v9 UuOVDT6zZ0L/O6NXk+Ng1dPyRjm6vu/xzT8Ls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720517534; x=1721122334; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ewc70fROqt3rzaJz07StrqQmqSZrtwDP5kdVthlFK8I=; b=bbzbdR0jhr5rrXS/Z4Nd4A9VFzIGRejpHO6bMkUoej6Muuj3554CCDSxS85aeicdb+ LQLz/jbd9Qkl9uq2U94qJol4DX/2xhN33dMRQ4S7FDfqH75EiCBkxrJkoz5yns4wzCnz ZwnbiFpGHNXie3KObXFz1q5p0ojoDOnymzTtm2QijiG2Ss46OhnE+eKymxETrRY13WQM /7q6sGD2AoAfAkqLg8uCRz/gk7MhjHVq6dp50B0KZol9QV2m+s6Yl5RUvDtJDnVaoV33 7yUVnyk/kwBxjcCNTpJt7pzA56rE5M7Uqitn0IvhdgCOY0eZty3x7PbxmbKaeyq3HIjn rdDQ== X-Forwarded-Encrypted: i=1; AJvYcCUNhX1QPNnHEQkiKK9d7zPBcoOSj9RG+L2RCD4Y4hwg5/pFiZLe3JxtNLWtZr/VWwB4OMSLMXXoOV4ZzLkZH5jqhaPclPTaX/lWrHBWPA== X-Gm-Message-State: AOJu0YzY+M4kqCQkkgDZ9ZsdLwVH+WywacMZSC/d8l369jRSUMy9HlIa Gt/MQS62NNNVh/9PPs4Xy9okiyj4KDaW+Kz4vHfcsfpHHfGAdoPRtxGt1T+NHGI= X-Google-Smtp-Source: AGHT+IGVWWUiNssA64xmT9WON6S1dOldSZUUjeYQLAGxDZ+nsaLA2Q0ky3uiXmODRee/PMIV+ZKiUA== X-Received: by 2002:a05:651c:509:b0:2ee:7e6c:34d7 with SMTP id 38308e7fff4ca-2eeb30b86b4mr15046411fa.1.1720517534339; Tue, 09 Jul 2024 02:32:14 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4264a2fca8bsm199553335e9.47.2024.07.09.02.32.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 02:32:13 -0700 (PDT) Date: Tue, 9 Jul 2024 11:32:11 +0200 From: Daniel Vetter To: Hamza Mahfooz Cc: dri-devel@lists.freedesktop.org, Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= , Maxime Ripard , Thomas Zimmermann , Alex Hung , Wayne Lin , Mario Limonciello , amd-gfx@lists.freedesktop.org Subject: Re: [PATCH 2/2] drm/amd/display: use drm_crtc_set_vblank_offdelay() Message-ID: References: <20240708202907.383917-1-hamza.mahfooz@amd.com> <20240708202907.383917-2-hamza.mahfooz@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240708202907.383917-2-hamza.mahfooz@amd.com> X-Operating-System: Linux phenom 6.9.7-amd64 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" On Mon, Jul 08, 2024 at 04:29:07PM -0400, Hamza Mahfooz wrote: > Hook up drm_crtc_set_vblank_offdelay() in amdgpu_dm, so that we can > enable PSR more quickly for displays that support it. > > Signed-off-by: Hamza Mahfooz > --- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 30 ++++++++++++++----- > 1 file changed, 22 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index fdbc9b57a23d..ee6c31e9d3c4 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -8231,7 +8231,7 @@ static int amdgpu_dm_encoder_init(struct drm_device *dev, > > static void manage_dm_interrupts(struct amdgpu_device *adev, > struct amdgpu_crtc *acrtc, > - bool enable) > + struct dm_crtc_state *acrtc_state) > { > /* > * We have no guarantee that the frontend index maps to the same > @@ -8239,12 +8239,25 @@ static void manage_dm_interrupts(struct amdgpu_device *adev, > * > * TODO: Use a different interrupt or check DC itself for the mapping. > */ > - int irq_type = > - amdgpu_display_crtc_idx_to_irq_type( > - adev, > - acrtc->crtc_id); > + int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev, > + acrtc->crtc_id); > + struct dc_crtc_timing *timing; > + int offdelay; > + > + if (acrtc_state) { > + timing = &acrtc_state->stream->timing; > + > + /* at least 2 frames */ > + offdelay = 2000 / div64_u64(div64_u64((timing->pix_clk_100hz * > + (uint64_t)100), > + timing->v_total), > + timing->h_total) + 1; Yeah, _especially_ when you have a this short timeout your really have to instead fix the vblank driver code properly so you can enable vblank_disable_immediate. This is just cheating :-) -Sima > + > + if (acrtc_state->stream->link->psr_settings.psr_version < > + DC_PSR_VERSION_UNSUPPORTED && > + amdgpu_ip_version(adev, DCE_HWIP, 0) >= IP_VERSION(3, 5, 0)) > + drm_crtc_set_vblank_offdelay(&acrtc->base, offdelay); > > - if (enable) { > drm_crtc_vblank_on(&acrtc->base); > amdgpu_irq_get( > adev, > @@ -9319,7 +9332,7 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, > if (old_crtc_state->active && > (!new_crtc_state->active || > drm_atomic_crtc_needs_modeset(new_crtc_state))) { > - manage_dm_interrupts(adev, acrtc, false); > + manage_dm_interrupts(adev, acrtc, NULL); > dc_stream_release(dm_old_crtc_state->stream); > } > } > @@ -9834,7 +9847,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) > drm_atomic_crtc_needs_modeset(new_crtc_state))) { > dc_stream_retain(dm_new_crtc_state->stream); > acrtc->dm_irq_params.stream = dm_new_crtc_state->stream; > - manage_dm_interrupts(adev, acrtc, true); > + manage_dm_interrupts(adev, acrtc, > + to_dm_crtc_state(new_crtc_state)); > } > /* Handle vrr on->off / off->on transitions */ > amdgpu_dm_handle_vrr_transition(dm_old_crtc_state, dm_new_crtc_state); > -- > 2.45.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch