Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp520169imb; Fri, 1 Mar 2019 06:58:44 -0800 (PST) X-Google-Smtp-Source: APXvYqzjP0R1c9ufyLPJ+qO3xjw7rVIF7F/x6IJMh4/1kzeGJmhDGl3mw8uUDIn/HiclUjntCfs5 X-Received: by 2002:a17:902:20c3:: with SMTP id v3mr6004859plg.268.1551452324594; Fri, 01 Mar 2019 06:58:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551452324; cv=none; d=google.com; s=arc-20160816; b=dOiG4Of9EFdjN+/v/kBuCN8HITZGZfKyfyczyVhPDEt+uYkFXF0/f1G1lUe2DCX2X9 FgBeXwhe3AR0V87hhoOuGBOUD8d7/oufVUHtEKUOpqjBuzgyJogm8xVh5zwDOVoToVFf gAWG08/sGAmVIrzFIJeC1qFrpiWM+4+QbBLbML/K2prHHQAUO7auvd0CAv1HJ8bc7dNJ egWDpeVrwcYigQkzueuNmMrGbhZYapgV/ITezFNdFrxTT2sXccOJSkw72AF0XjA+Ouhv mqswybxF/poTdoCL1+n+FQE49wyrQ5UkgJDhTgesnNiAEhZonPJyEAWkkSaavVIrU48N Rt1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=+A/rUjiNblflB10yhvy5uekIIynt3TlBlwJKLro1nXg=; b=Rk8ek8/6ZRgfxQtTmJbotuDCu+1gKxV+1fzwCCx4xBpNPOMkpwgtLUqyQ9wj33P9e9 UIMDvFi9h2r1oRo2CZ8QG4u7rUDuZ4yHXDULVG+BFr7be6nJ45fGxDPmgVnglVdfmdA3 j2uGAnLpuJkcwYGPGYCHWJtztM1uzKAEMI+ocuKsw0xBNFGbLQKt2oAmuVlV63/zNvAM zwvyzw+E0JWleNyD+BYVdiXChEoNPypLvxFXplEV6I2woGoile81RfSomS48Vpf6i9te y0tMFyfCgVtrNdlt/v2RniHPjZc8nSmyOT1Qj+Ru3raQvVr2hSo/6DvVu7OWdFeBGD3u zTLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=j55Q3Nhc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i190si21576232pfc.116.2019.03.01.06.58.29; Fri, 01 Mar 2019 06:58:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=j55Q3Nhc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387821AbfCAOzY (ORCPT + 99 others); Fri, 1 Mar 2019 09:55:24 -0500 Received: from mail-oi1-f193.google.com ([209.85.167.193]:38338 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727951AbfCAOzY (ORCPT ); Fri, 1 Mar 2019 09:55:24 -0500 Received: by mail-oi1-f193.google.com with SMTP id q81so19685019oic.5 for ; Fri, 01 Mar 2019 06:55:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=+A/rUjiNblflB10yhvy5uekIIynt3TlBlwJKLro1nXg=; b=j55Q3NhcRL7TS0X2zFFj65MT+xftMoy57OLmfI3KNcU6Rzs4uDjmwTrsa/6ZoxB+qy CSMyLOAXv2kfgFBXX8VBDHHZZMRSRBu3Xu6vf2iOro2/fMoWV27W27a9ZK24nHqjlWO2 egGUHVL7LzV/kTAmFC9qwlL9dkHhRtYc4QCAZiwfPQXEQmfjnWuzir4uFjaV2ERP69xh t+paHsqQvVzWwfjCbMCt45+HzpjzuzoQVqevlhOrsM01P5Vvf1R6byzwodL0GViFrWSd fxv6fr8EH+1EMCH1of9fx7l+CrtcNabSywdyor+e1y1tAOrBijZ1+Sv0VqOrsi0hXfp2 GzEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=+A/rUjiNblflB10yhvy5uekIIynt3TlBlwJKLro1nXg=; b=ZSxxTbBeCDhefkcBwqcB3rCcoDwdBOYD3vuvwdY9bTZFCFKI87k5dGIT7rfsq+mX2z QepykkIY0qmJ4NgCzibAyIJl2EFlHhdjkBn3QApe1lks3iSH9w1Fgjt4/RaoZh2eQ7AO GdXpxd/Cg4JHWY6vtod6HO9oPZpv4FyDlwx9pYMvTn2x6VNbRBXSkk6aBmejYfGH+CmX UmbUkiApxsheKRyF7BlJQuZeCtpSP1moGiJrYpawg9oKAMrpXxdbj+10SceswQ2cQXNl Bo1v26gPT0HX3F7yVIaADCJBEJCl32jJ+XU4dU5QsN3NTHDdPH6QjAmq5Mnxe7KiXgWz RZ7g== X-Gm-Message-State: AHQUAubVeHVIeg3oJEp0Pap21Jrd03Y5MVHBybe18sDuQqCjkd1PPrgl KbK3qR+qIUwRoNIuiy6u+96Cy45JFC9I74Uophk= X-Received: by 2002:aca:ba06:: with SMTP id k6mr3601504oif.159.1551452122694; Fri, 01 Mar 2019 06:55:22 -0800 (PST) MIME-Version: 1.0 References: <20190225142606.gov32asdq3qe375q@smtp.gmail.com> <20190228101107.GL2665@phenom.ffwll.local> <20190228140341.GG20097@intel.com> In-Reply-To: <20190228140341.GG20097@intel.com> From: Shayenne Moura Date: Fri, 1 Mar 2019 11:55:11 -0300 Message-ID: Subject: Re: [PATCH] drm/vkms: Solve bug on kms_crc_cursor tests To: =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= Cc: Rodrigo Siqueira , Haneen Mohammed , David Airlie , dri-devel , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em qui, 28 de fev de 2019 =C3=A0s 11:03, Ville Syrj=C3=A4l=C3=A4 escreveu: > > On Thu, Feb 28, 2019 at 11:11:07AM +0100, Daniel Vetter wrote: > > On Mon, Feb 25, 2019 at 11:26:06AM -0300, Shayenne Moura wrote: > > > vkms_crc_work_handle needs the value of the actual frame to > > > schedule the workqueue that calls periodically the vblank > > > handler and the destroy state functions. However, the frame > > > value returned from vkms_vblank_simulate is updated and > > > diminished in vblank_get_timestamp because it is not in a > > > vblank interrupt, and return an inaccurate value. > > > > > > Solve this getting the actual vblank frame directly from the > > > vblank->count inside the `struct drm_crtc`, instead of using > > > the `drm_accurate_vblank_count` function. > > > > > > Signed-off-by: Shayenne Moura > > > > Sorry for the delay, I'm a bit swamped right now :-/ > > > > Debug work you're doing here is really impressive! But I have no idea > > what's going on. It doesn't look like it's just papering over a bug (li= ke > > the in_vblank_irq check we've discussed on irc), but I also have no ide= a > > why it works. > > > > I'll pull in Ville, he understands this better than me. > > It's not entirely clear what we're trying to fix. From what I can see > the crc work seems to be in no way synchronized with page flips, so > I'm not sure how all this is really supposed to work. > Hi, Ville! Thank you for the review! :) I do not understand well what crc code is doing, but the issue that I found is related to the vblank timestamp and frame count. When vkms handles the crc_cursor it uses the start frame and end frame values to verify if it needs to call the function 'drm_crtc_add_crc_entry()= ' for each frame. However, when getting the frame count, the code is calling the function drm_update_vblank_count(dev, pipe, false) and, because of the 'false', subtracting the actual vblank timestamp (consequently, the frame count value), causing conflicts. Does it make sense? I am not sure about this crc code behavior. Shayenne > > -Daniel > > > > > --- > > > drivers/gpu/drm/vkms/vkms_crc.c | 4 +++- > > > drivers/gpu/drm/vkms/vkms_crtc.c | 4 +++- > > > 2 files changed, 6 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/v= kms_crc.c > > > index d7b409a3c0f8..09a8b00ef1f1 100644 > > > --- a/drivers/gpu/drm/vkms/vkms_crc.c > > > +++ b/drivers/gpu/drm/vkms/vkms_crc.c > > > @@ -161,6 +161,8 @@ void vkms_crc_work_handle(struct work_struct *wor= k) > > > struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); > > > struct vkms_device *vdev =3D container_of(out, struct vkms_device= , > > > output); > > > + unsigned int pipe =3D drm_crtc_index(crtc); > > > + struct drm_vblank_crtc *vblank =3D &crtc->dev->vblank[pipe]; > > > struct vkms_crc_data *primary_crc =3D NULL; > > > struct vkms_crc_data *cursor_crc =3D NULL; > > > struct drm_plane *plane; > > > @@ -196,7 +198,7 @@ void vkms_crc_work_handle(struct work_struct *wor= k) > > > if (primary_crc) > > > crc32 =3D _vkms_get_crc(primary_crc, cursor_crc); > > > > > > - frame_end =3D drm_crtc_accurate_vblank_count(crtc); > > > + frame_end =3D vblank->count; > > > > > > /* queue_work can fail to schedule crc_work; add crc for > > > * missing frames > > > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/= vkms_crtc.c > > > index 8a9aeb0a9ea8..9bf3268e2e92 100644 > > > --- a/drivers/gpu/drm/vkms/vkms_crtc.c > > > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > > > @@ -10,6 +10,8 @@ static enum hrtimer_restart vkms_vblank_simulate(st= ruct hrtimer *timer) > > > vblank_hrtimer); > > > struct drm_crtc *crtc =3D &output->crtc; > > > struct vkms_crtc_state *state =3D to_vkms_crtc_state(crtc->state)= ; > > > + unsigned int pipe =3D drm_crtc_index(crtc); > > > + struct drm_vblank_crtc *vblank =3D &crtc->dev->vblank[pipe]; > > > u64 ret_overrun; > > > bool ret; > > > > > > @@ -20,7 +22,7 @@ static enum hrtimer_restart vkms_vblank_simulate(st= ruct hrtimer *timer) > > > DRM_ERROR("vkms failure on handling vblank"); > > > > > > if (state && output->crc_enabled) { > > > - u64 frame =3D drm_crtc_accurate_vblank_count(crtc); > > > + u64 frame =3D vblank->count; > > > > > > /* update frame_start only if a queued vkms_crc_work_hand= le() > > > * has read the data > > > -- > > > 2.17.1 > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Ville Syrj=C3=A4l=C3=A4 > Intel