From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915/skl: Don't try to update plane watermarks if they haven't changed Date: Mon, 29 Aug 2016 18:10:46 +0300 Message-ID: <871t17ipah.fsf@intel.com> References: <1472481944-13357-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1472481944-13357-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 , intel-gfx@lists.freedesktop.org, Maarten Lankhorst Cc: David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCAyOSBBdWcgMjAxNiwgTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+IHdyb3RlOgo+IGk5 MTUgc29tZXRpbWVzIG5lZWRzIHRvIGRpc2FibGUgcGxhbmVzIGluIHRoZSBtaWRkbGUgb2YgYW4g YXRvbWljCj4gY29tbWl0LCBhbmQgdGhlbiByZWVuYWJsZSB0aGVtIGxhdGVyIGluIHRoZSBzYW1l IGNvbW1pdC4gQmVjYXVzZSBvZgo+IHRoaXMsIHdlIGNhbid0IG1ha2UgdGhlIGFzc3VtcHRpb24g dGhhdCB0aGUgc3RhdGUgb2YgdGhlIHBsYW5lIGFjdHVhbGx5Cj4gY2hhbmdlZC4gU2luY2UgdGhl IHN0YXRlIG9mIHRoZSBwbGFuZSBoYXNuJ3QgYWN0dWFsbHkgY2hhbmdlZCwgbmVpdGhlcgo+IGhh dmUgaXQncyB3YXRlcm1hcmtzLiBBbmQgaWYgdGhlIHdhdGVybWFya3MgaGFzbid0IGNoYW5nZWQg dGhlbiB3ZQo+IGhhdmVuJ3QgcG9wdWxhdGVkIHNrbF9yZXN1bHRzIHdpdGggYW55dGhpbmcsIHdo aWNoIG1lYW5zIHdlJ2xsIGVuZCB1cAo+IHplcm9pbmcgb3V0IGEgcGxhbmUncyB3YXRlcm1hcmtz IGluIHRoZSBtaWRkbGUgb2YgdGhlIGF0b21pYyBjb21taXQKPiB3aXRob3V0IHJlc3RvcmluZyB0 aGVtIGxhdGVyLgoKSSB3b3VsZCBhcHByZWNpYXRlIGEgKGJyaWVmKSBkZXNjcmlwdGlvbiBvZiB3 aGF0IHRoZSBmYWlsdXJlIG1vZGUgaXMgaW4KdGhpcyBjYXNlLgoKQlIsCkphbmkuCgoKPgo+IENo YW5nZXMgc2luY2UgdjE6Cj4gIC0gRml4IGluY29ycmVjdCB1c2Ugb2YgIml0J3MiCj4KPiBTaWdu ZWQtb2ZmLWJ5OiBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4KPiBDYzogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiBGaXhlczogNjJlMGZiODgw MTIzICgiZHJtL2k5MTUvc2tsOiBVcGRhdGUgcGxhbmUgd2F0ZXJtYXJrcyBhdG9taWNhbGx5Cj4g ZHVyaW5nIHBsYW5lIHVwZGF0ZXMiKQo+Cj4gU2lnbmVkLW9mZi1ieTogTHl1ZGUgPGNwYXVsQHJl ZGhhdC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8 IDcgKysrKysrLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCA5ICsr KysrKystLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25z KC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggZTRlNjE0MS4u MTNlNDdhNyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMzQ0 OCw3ICszNDQ4LDEyIEBAIHN0YXRpYyB2b2lkIHNreWxha2VfZGlzYWJsZV9wcmltYXJ5X3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCj4gIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Cj4gIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBp cGU7Cj4gIAo+IC0Jc2tsX3dyaXRlX3BsYW5lX3dtKGludGVsX2NydGMsICZkZXZfcHJpdi0+d20u c2tsX3Jlc3VsdHMsIDApOwo+ICsJLyoKPiArCSAqIFdlIG9ubHkgcG9wdWxhdGUgc2tsX3Jlc3Vs dHMgb24gd2F0ZXJtYXJrIHVwZGF0ZXMsIGFuZCBpZiB0aGUKPiArCSAqIHBsYW5lJ3MgdmlzaWJs aXR5IGlzbid0IGFjdHVhbGx5IGNoYW5naW5nIG5laXRoZXIgaXMgaXRzIHdhdGVybWFya3MuCj4g KwkgKi8KPiArCWlmICghY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnZpc2libGUpCj4gKwkJc2tsX3dy aXRlX3BsYW5lX3dtKGludGVsX2NydGMsICZkZXZfcHJpdi0+d20uc2tsX3Jlc3VsdHMsIDApOwo+ ICAKPiAgCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUsIDApLCAwKTsKPiAgCUk5MTVfV1JJVEUo UExBTkVfU1VSRihwaXBlLCAwKSwgMCk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMK PiBpbmRleCAwZGY3ODNhLi43M2E1MjFmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3By aXRlLmMKPiBAQCAtMjkyLDggKzI5MiwxMyBAQCBza2xfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCWNvbnN0IGludCBwaXBl ID0gaW50ZWxfcGxhbmUtPnBpcGU7Cj4gIAljb25zdCBpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+ cGxhbmUgKyAxOwo+ICAKPiAtCXNrbF93cml0ZV9wbGFuZV93bSh0b19pbnRlbF9jcnRjKGNydGMp LCAmZGV2X3ByaXYtPndtLnNrbF9yZXN1bHRzLAo+IC0JCQkgICBwbGFuZSk7Cj4gKwkvKgo+ICsJ ICogV2Ugb25seSBwb3B1bGF0ZSBza2xfcmVzdWx0cyBvbiB3YXRlcm1hcmsgdXBkYXRlcywgYW5k IGlmIHRoZQo+ICsJICogcGxhbmUncyB2aXNpYmxpdHkgaXNuJ3QgYWN0dWFsbHkgY2hhbmdpbmcg bmVpdGhlciBpcyBpdHMgd2F0ZXJtYXJrcy4KPiArCSAqLwo+ICsJaWYgKCFkcGxhbmUtPnN0YXRl LT52aXNpYmxlKQo+ICsJCXNrbF93cml0ZV9wbGFuZV93bSh0b19pbnRlbF9jcnRjKGNydGMpLAo+ ICsJCQkJICAgJmRldl9wcml2LT53bS5za2xfcmVzdWx0cywgcGxhbmUpOwo+ICAKPiAgCUk5MTVf V1JJVEUoUExBTkVfQ1RMKHBpcGUsIHBsYW5lKSwgMCk7CgotLSAKSmFuaSBOaWt1bGEsIEludGVs IE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757588AbcH2PLJ (ORCPT ); Mon, 29 Aug 2016 11:11:09 -0400 Received: from mga06.intel.com ([134.134.136.31]:57191 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751983AbcH2PLI (ORCPT ); Mon, 29 Aug 2016 11:11:08 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,596,1464678000"; d="scan'208";a="1048705409" From: Jani Nikula To: Lyude , intel-gfx@lists.freedesktop.org, Maarten Lankhorst Cc: Lyude , Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/i915/skl: Don't try to update plane watermarks if they haven't changed In-Reply-To: <1472481944-13357-1-git-send-email-cpaul@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1472481944-13357-1-git-send-email-cpaul@redhat.com> User-Agent: Notmuch/0.22.1+62~g2a7b11b (https://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Mon, 29 Aug 2016 18:10:46 +0300 Message-ID: <871t17ipah.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 29 Aug 2016, Lyude wrote: > i915 sometimes needs to disable planes in the middle of an atomic > commit, and then reenable them later in the same commit. Because of > this, we can't make the assumption that the state of the plane actually > changed. Since the state of the plane hasn't actually changed, neither > have it's watermarks. And if the watermarks hasn't changed then we > haven't populated skl_results with anything, which means we'll end up > zeroing out a plane's watermarks in the middle of the atomic commit > without restoring them later. I would appreciate a (brief) description of what the failure mode is in this case. BR, Jani. > > Changes since v1: > - Fix incorrect use of "it's" > > Signed-off-by: Lyude > Cc: Maarten Lankhorst > Fixes: 62e0fb880123 ("drm/i915/skl: Update plane watermarks atomically > during plane updates") > > Signed-off-by: Lyude > --- > drivers/gpu/drm/i915/intel_display.c | 7 ++++++- > drivers/gpu/drm/i915/intel_sprite.c | 9 +++++++-- > 2 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index e4e6141..13e47a7 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3448,7 +3448,12 @@ static void skylake_disable_primary_plane(struct drm_plane *primary, > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > int pipe = intel_crtc->pipe; > > - skl_write_plane_wm(intel_crtc, &dev_priv->wm.skl_results, 0); > + /* > + * We only populate skl_results on watermark updates, and if the > + * plane's visiblity isn't actually changing neither is its watermarks. > + */ > + if (!crtc->primary->state->visible) > + skl_write_plane_wm(intel_crtc, &dev_priv->wm.skl_results, 0); > > I915_WRITE(PLANE_CTL(pipe, 0), 0); > I915_WRITE(PLANE_SURF(pipe, 0), 0); > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index 0df783a..73a521f 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -292,8 +292,13 @@ skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc) > const int pipe = intel_plane->pipe; > const int plane = intel_plane->plane + 1; > > - skl_write_plane_wm(to_intel_crtc(crtc), &dev_priv->wm.skl_results, > - plane); > + /* > + * We only populate skl_results on watermark updates, and if the > + * plane's visiblity isn't actually changing neither is its watermarks. > + */ > + if (!dplane->state->visible) > + skl_write_plane_wm(to_intel_crtc(crtc), > + &dev_priv->wm.skl_results, plane); > > I915_WRITE(PLANE_CTL(pipe, plane), 0); -- Jani Nikula, Intel Open Source Technology Center