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 X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C733C43461 for ; Thu, 10 Sep 2020 13:42:29 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0E68C2087C for ; Thu, 10 Sep 2020 13:42:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E68C2087C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F1D86E92E; Thu, 10 Sep 2020 13:42:28 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D1F86E92A for ; Thu, 10 Sep 2020 13:42:26 +0000 (UTC) IronPort-SDR: m1z6pNeAQAQ9aa79uwf+aJxqvhXwvEY8e6jqPJzg+AlKgX1OVOVGo1IojlqyxkQISKE/5xL6Fx E3rY/0Hg225w== X-IronPort-AV: E=McAfee;i="6000,8403,9739"; a="176591251" X-IronPort-AV: E=Sophos;i="5.76,413,1592895600"; d="scan'208";a="176591251" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2020 06:42:26 -0700 IronPort-SDR: lqtI+EAmyEh/YzsSm3kYSi9Tl9ePzEl6EUpXGXoV/kYDVobg5PrasC7Tv0Cn5ZDLxXqXePOR9F KU5+DBQT8+yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,413,1592895600"; d="scan'208";a="341928721" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by FMSMGA003.fm.intel.com with ESMTP; 10 Sep 2020 06:42:26 -0700 Received: from bgsmsx606.gar.corp.intel.com (10.67.234.8) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 10 Sep 2020 06:42:25 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by BGSMSX606.gar.corp.intel.com (10.67.234.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 10 Sep 2020 19:12:23 +0530 Received: from bgsmsx604.gar.corp.intel.com ([10.67.234.6]) by BGSMSX604.gar.corp.intel.com ([10.67.234.6]) with mapi id 15.01.1713.004; Thu, 10 Sep 2020 19:12:23 +0530 From: "Shankar, Uma" To: Jani Nikula , "intel-gfx@lists.freedesktop.org" Thread-Topic: [Intel-gfx] [PATCH] drm/i915/display: Add a vblank wait for FBC activation within same frame Thread-Index: AQHWh2aYSvfsowFXwEGJujjDCGi3X6lhgwuAgABeDwA= Date: Thu, 10 Sep 2020 13:42:23 +0000 Message-ID: References: <20200910121153.6749-1-uma.shankar@intel.com> <878sdh21tq.fsf@intel.com> In-Reply-To: <878sdh21tq.fsf@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.223.10.1] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Add a vblank wait for FBC activation within same frame X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" > -----Original Message----- > From: Jani Nikula > Sent: Thursday, September 10, 2020 7:04 PM > To: Shankar, Uma ; intel-gfx@lists.freedesktop.org > Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Add a vblank wait for FBC > activation within same frame > > On Thu, 10 Sep 2020, Uma Shankar wrote: > > Add a vblank wait when fbc activation request comes for the same frame > > on TGL. This helps fix underrun related to fbc. > > > > Signed-off-by: Uma Shankar > > --- > > drivers/gpu/drm/i915/display/intel_fbc.c | 13 +++++++++++-- > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c > > b/drivers/gpu/drm/i915/display/intel_fbc.c > > index 135f5e8a4d70..3e1d715e4a4e 100644 > > --- a/drivers/gpu/drm/i915/display/intel_fbc.c > > +++ b/drivers/gpu/drm/i915/display/intel_fbc.c > > @@ -1055,6 +1055,7 @@ static void __intel_fbc_post_update(struct > > intel_crtc *crtc) { > > struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > struct intel_fbc *fbc = &dev_priv->fbc; > > + static u32 old_frame_cnt, new_frame_cnt; > > In the strongest terms, do not add static data. These would be shared across > devices, which is certainly a bug. Oh ok, yeah will remove this. I guess adding them to intel_fbc should be ok right ? Thanks & Regards, Uma Shankar > BR, > Jani. > > > > > drm_WARN_ON(&dev_priv->drm, !mutex_is_locked(&fbc->lock)); > > > > @@ -1075,10 +1076,18 @@ static void __intel_fbc_post_update(struct > intel_crtc *crtc) > > if (!intel_fbc_can_activate(crtc)) > > return; > > > > - if (!fbc->busy_bits) > > + old_frame_cnt = new_frame_cnt; > > + new_frame_cnt = intel_crtc_get_vblank_counter(crtc); > > + if (!fbc->busy_bits) { > > + if (IS_TIGERLAKE(dev_priv) && > > + old_frame_cnt == new_frame_cnt) { > > + drm_dbg_kms(&dev_priv->drm, "Wait for vblank before > Activating FBC"); > > + intel_wait_for_vblank_if_active(dev_priv, crtc->pipe); > > + } > > intel_fbc_hw_activate(dev_priv); > > - else > > + } else { > > intel_fbc_deactivate(dev_priv, "frontbuffer write"); > > + } > > } > > > > void intel_fbc_post_update(struct intel_atomic_state *state, > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx