From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752427AbcG2AD4 (ORCPT ); Thu, 28 Jul 2016 20:03:56 -0400 Received: from mga02.intel.com ([134.134.136.20]:48786 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752149AbcG2ADx (ORCPT ); Thu, 28 Jul 2016 20:03:53 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,436,1464678000"; d="scan'208";a="1004567993" Date: Thu, 28 Jul 2016 17:03:52 -0700 From: Matt Roper To: Lyude Cc: intel-gfx@lists.freedesktop.org, Maarten Lankhorst , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter Subject: Re: [Intel-gfx] [PATCH v4 0/6] Finally fix watermarks Message-ID: <20160729000352.GR32025@intel.com> References: <1469554483-24999-1-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1469554483-24999-1-git-send-email-cpaul@redhat.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is completely untested (and probably horribly broken/buggy), but here's a quick mockup of the general approach I was thinking for ensuring DDB & WM's can be updated together while ensuring the three-step pipe flushing process is honored: https://github.com/mattrope/kernel/commits/experimental/lyude_ddb Basically the idea is to take note of what's happening to the pipe's DDB allocation (shrinking, growing, unchanged, etc.) during the atomic check phase; then during the commit phase, we loop over the CRTC's three times instead of just once, but only operate on a subset of the CRTC's in each loop. While operating on each CRTC, the plane, WM, and DDB all get programmed together and have a single flush for all three. Matt On Tue, Jul 26, 2016 at 01:34:36PM -0400, Lyude wrote: > Latest version of https://lkml.org/lkml/2016/7/26/290 . Resending the whole > thing to keep it in one place. > > Lyude (5): > drm/i915/skl: Add support for the SAGV, fix underrun hangs > drm/i915/skl: Only flush pipes when we change the ddb allocation > drm/i915/skl: Fix extra whitespace in skl_flush_wm_values() > drm/i915/skl: Update plane watermarks atomically during plane updates > drm/i915/skl: Always wait for pipes to update after a flush > > Matt Roper (1): > drm/i915/gen9: Only copy WM results for changed pipes to skl_hw > > drivers/gpu/drm/i915/i915_drv.h | 3 + > drivers/gpu/drm/i915/i915_reg.h | 5 + > drivers/gpu/drm/i915/intel_display.c | 24 ++++ > drivers/gpu/drm/i915/intel_drv.h | 4 + > drivers/gpu/drm/i915/intel_pm.c | 240 +++++++++++++++++++++++++++++++---- > drivers/gpu/drm/i915/intel_sprite.c | 2 + > 6 files changed, 255 insertions(+), 23 deletions(-) > > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH v4 0/6] Finally fix watermarks Date: Thu, 28 Jul 2016 17:03:52 -0700 Message-ID: <20160729000352.GR32025@intel.com> References: <1469554483-24999-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1469554483-24999-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lyude Cc: David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VGhpcyBpcyBjb21wbGV0ZWx5IHVudGVzdGVkIChhbmQgcHJvYmFibHkgaG9ycmlibHkgYnJva2Vu L2J1Z2d5KSwgYnV0CmhlcmUncyBhIHF1aWNrIG1vY2t1cCBvZiB0aGUgZ2VuZXJhbCBhcHByb2Fj aCBJIHdhcyB0aGlua2luZyBmb3IKZW5zdXJpbmcgRERCICYgV00ncyBjYW4gYmUgdXBkYXRlZCB0 b2dldGhlciB3aGlsZSBlbnN1cmluZyB0aGUKdGhyZWUtc3RlcCBwaXBlIGZsdXNoaW5nIHByb2Nl c3MgaXMgaG9ub3JlZDoKCiAgICAgICAgaHR0cHM6Ly9naXRodWIuY29tL21hdHRyb3BlL2tlcm5l bC9jb21taXRzL2V4cGVyaW1lbnRhbC9seXVkZV9kZGIKCkJhc2ljYWxseSB0aGUgaWRlYSBpcyB0 byB0YWtlIG5vdGUgb2Ygd2hhdCdzIGhhcHBlbmluZyB0byB0aGUgcGlwZSdzIEREQgphbGxvY2F0 aW9uIChzaHJpbmtpbmcsIGdyb3dpbmcsIHVuY2hhbmdlZCwgZXRjLikgZHVyaW5nIHRoZSBhdG9t aWMgY2hlY2sKcGhhc2U7IHRoZW4gZHVyaW5nIHRoZSBjb21taXQgcGhhc2UsIHdlIGxvb3Agb3Zl ciB0aGUgQ1JUQydzIHRocmVlIHRpbWVzCmluc3RlYWQgb2YganVzdCBvbmNlLCBidXQgb25seSBv cGVyYXRlIG9uIGEgc3Vic2V0IG9mIHRoZSBDUlRDJ3MgaW4gZWFjaApsb29wLiAgV2hpbGUgb3Bl cmF0aW5nIG9uIGVhY2ggQ1JUQywgdGhlIHBsYW5lLCBXTSwgYW5kIEREQiBhbGwgZ2V0CnByb2dy YW1tZWQgdG9nZXRoZXIgYW5kIGhhdmUgYSBzaW5nbGUgZmx1c2ggZm9yIGFsbCB0aHJlZS4KCgoK TWF0dAoKT24gVHVlLCBKdWwgMjYsIDIwMTYgYXQgMDE6MzQ6MzZQTSAtMDQwMCwgTHl1ZGUgd3Jv dGU6Cj4gTGF0ZXN0IHZlcnNpb24gb2YgaHR0cHM6Ly9sa21sLm9yZy9sa21sLzIwMTYvNy8yNi8y OTAgLiBSZXNlbmRpbmcgdGhlIHdob2xlCj4gdGhpbmcgdG8ga2VlcCBpdCBpbiBvbmUgcGxhY2Uu Cj4gCj4gTHl1ZGUgKDUpOgo+ICAgZHJtL2k5MTUvc2tsOiBBZGQgc3VwcG9ydCBmb3IgdGhlIFNB R1YsIGZpeCB1bmRlcnJ1biBoYW5ncwo+ICAgZHJtL2k5MTUvc2tsOiBPbmx5IGZsdXNoIHBpcGVz IHdoZW4gd2UgY2hhbmdlIHRoZSBkZGIgYWxsb2NhdGlvbgo+ICAgZHJtL2k5MTUvc2tsOiBGaXgg ZXh0cmEgd2hpdGVzcGFjZSBpbiBza2xfZmx1c2hfd21fdmFsdWVzKCkKPiAgIGRybS9pOTE1L3Nr bDogVXBkYXRlIHBsYW5lIHdhdGVybWFya3MgYXRvbWljYWxseSBkdXJpbmcgcGxhbmUgdXBkYXRl cwo+ICAgZHJtL2k5MTUvc2tsOiBBbHdheXMgd2FpdCBmb3IgcGlwZXMgdG8gdXBkYXRlIGFmdGVy IGEgZmx1c2gKPiAKPiBNYXR0IFJvcGVyICgxKToKPiAgIGRybS9pOTE1L2dlbjk6IE9ubHkgY29w eSBXTSByZXN1bHRzIGZvciBjaGFuZ2VkIHBpcGVzIHRvIHNrbF9odwo+IAo+ICBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgIDMgKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlZy5oICAgICAgfCAgIDUgKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAgMjQgKysrKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAg ICAgfCAgIDQgKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAyNDAg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMgIHwgICAyICsKPiAgNiBmaWxlcyBjaGFuZ2VkLCAyNTUgaW5zZXJ0 aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCj4gCj4gLS0gCj4gMi43LjQKPiAKPiBfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5n IGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApNYXR0IFJvcGVy CkdyYXBoaWNzIFNvZnR3YXJlIEVuZ2luZWVyCklvVEcgUGxhdGZvcm0gRW5hYmxpbmcgJiBEZXZl bG9wbWVudApJbnRlbCBDb3Jwb3JhdGlvbgooOTE2KSAzNTYtMjc5NQpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK