From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH v5 4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state Date: Tue, 2 Aug 2016 14:26:04 -0700 Message-ID: <20160802212604.GZ32025@intel.com> References: <1470163975-30467-1-git-send-email-cpaul@redhat.com> <1470163975-30467-5-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: <1470163975-30467-5-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: dri-devel@lists.freedesktop.org, David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Hans de Goede , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBBdWcgMDIsIDIwMTYgYXQgMDI6NTI6NTJQTSAtMDQwMCwgTHl1ZGUgd3JvdGU6Cj4g SWYgd2UncmUgZW5hYmxpbmcgYSBwaXBlLCB3ZSdsbCBuZWVkIHRvIG1vZGlmeSB0aGUgd2F0ZXJt YXJrcyBvbiBhbGwKPiBvdGhlciBhY3RpdmUgcGlwZXMuIFNpbmNlIHRob3NlIHBpcGVzIHdvbid0 IGJlIGFkZGVkIHRvIHRoZSBzdGF0ZSBvbgo+IHRoZWlyIG93biwgd2UgbmVlZCB0byBhZGQgdGhl bSBvdXJzZWx2ZXMuCgpBbGwgcGlwZXMgKGNydGMncykgYXJlIGFscmVhZHkgYWRkZWQgdG8gdGhl IHN0YXRlIGlmIHdlIGhhdmUgYSBjaGFuZ2UgaW4KYWN0aXZlIHBpcGVzLiAgSSB0aGluayB3aGF0 IHlvdSBtZWFudCB0byB3cml0ZSB3YXMgIi4uLndlJ2xsIG5lZWQgdG8KbW9kaWZ5IHRoZSB3YXRl cm1hcmtzIG9uIGFsbCBhY3RpdmUgKnBsYW5lcyouICBTaW5jZSB0aG9zZSAqcGxhbmVzKgp3b24n dC4uLiIKCkFzaWRlIGZyb20gdGhlIGNvbW1pdCBtZXNzYWdlLCBJIGJlbGlldmUgdGhlIGxvZ2lj IGlzIGNvcnJlY3QsIHNvIHlvdQpjYW4gY29uc2lkZXIgdGhpcwogICAgICAgIFJldmlld2VkLWJ5 OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgpvbmNlIHlvdSByZXdvcmQg aXQuCgoKTWF0dAoKPiAKPiBTaWduZWQtb2ZmLWJ5OiBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4K PiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwo+IENjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxl LnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGludGVsLmNvbT4KPiBDYzogUmFkaGFrcmlzaG5hIFNyaXBhZGEgPHJhZGhha3Jpc2huYS5z cmlwYWRhQGludGVsLmNvbT4KPiBDYzogSGFucyBkZSBHb2VkZSA8aGRlZ29lZGVAcmVkaGF0LmNv bT4KPiBDYzogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDQgKysrKwo+ICAxIGZpbGUgY2hhbmdl ZCwgNCBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gaW5kZXggNTNh ZGNiZi4uNmIyNDUyYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IEBAIC00MDg1LDYg KzQwODUsMTAgQEAgc2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKPiAgCQlyZXQgPSBza2xfYWxsb2NhdGVfcGlwZV9kZGIoY3N0YXRlLCBkZGIpOwo+ICAJCWlm IChyZXQpCj4gIAkJCXJldHVybiByZXQ7Cj4gKwo+ICsJCXJldCA9IGRybV9hdG9taWNfYWRkX2Fm ZmVjdGVkX3BsYW5lcyhzdGF0ZSwgJmludGVsX2NydGMtPmJhc2UpOwo+ICsJCWlmIChyZXQpCj4g KwkJCXJldHVybiByZXQ7Cj4gIAl9Cj4gIAo+ICAJcmV0dXJuIDA7Cj4gLS0gCj4gMi43LjQKPiAK Ci0tIApNYXR0IFJvcGVyCkdyYXBoaWNzIFNvZnR3YXJlIEVuZ2luZWVyCklvVEcgUGxhdGZvcm0g RW5hYmxpbmcgJiBEZXZlbG9wbWVudApJbnRlbCBDb3Jwb3JhdGlvbgooOTE2KSAzNTYtMjc5NQpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756076AbcHBV2I (ORCPT ); Tue, 2 Aug 2016 17:28:08 -0400 Received: from mga02.intel.com ([134.134.136.20]:38533 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755863AbcHBV1z (ORCPT ); Tue, 2 Aug 2016 17:27:55 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,462,1464678000"; d="scan'208";a="1033907923" Date: Tue, 2 Aug 2016 14:26:04 -0700 From: Matt Roper To: Lyude Cc: intel-gfx@lists.freedesktop.org, Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Maarten Lankhorst , stable@vger.kernel.org, Daniel Vetter , Radhakrishna Sripada , Hans de Goede , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state Message-ID: <20160802212604.GZ32025@intel.com> References: <1470163975-30467-1-git-send-email-cpaul@redhat.com> <1470163975-30467-5-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1470163975-30467-5-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 On Tue, Aug 02, 2016 at 02:52:52PM -0400, Lyude wrote: > If we're enabling a pipe, we'll need to modify the watermarks on all > other active pipes. Since those pipes won't be added to the state on > their own, we need to add them ourselves. All pipes (crtc's) are already added to the state if we have a change in active pipes. I think what you meant to write was "...we'll need to modify the watermarks on all active *planes*. Since those *planes* won't..." Aside from the commit message, I believe the logic is correct, so you can consider this Reviewed-by: Matt Roper once you reword it. Matt > > Signed-off-by: Lyude > Cc: stable@vger.kernel.org > Cc: Ville Syrjälä > Cc: Daniel Vetter > Cc: Radhakrishna Sripada > Cc: Hans de Goede > Cc: Matt Roper > --- > drivers/gpu/drm/i915/intel_pm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 53adcbf..6b2452b 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4085,6 +4085,10 @@ skl_compute_ddb(struct drm_atomic_state *state) > ret = skl_allocate_pipe_ddb(cstate, ddb); > if (ret) > return ret; > + > + ret = drm_atomic_add_affected_planes(state, &intel_crtc->base); > + if (ret) > + return ret; > } > > return 0; > -- > 2.7.4 > -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:38533 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755863AbcHBV1z (ORCPT ); Tue, 2 Aug 2016 17:27:55 -0400 Date: Tue, 2 Aug 2016 14:26:04 -0700 From: Matt Roper To: Lyude Cc: intel-gfx@lists.freedesktop.org, Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Maarten Lankhorst , stable@vger.kernel.org, Daniel Vetter , Radhakrishna Sripada , Hans de Goede , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state Message-ID: <20160802212604.GZ32025@intel.com> References: <1470163975-30467-1-git-send-email-cpaul@redhat.com> <1470163975-30467-5-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1470163975-30467-5-git-send-email-cpaul@redhat.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Aug 02, 2016 at 02:52:52PM -0400, Lyude wrote: > If we're enabling a pipe, we'll need to modify the watermarks on all > other active pipes. Since those pipes won't be added to the state on > their own, we need to add them ourselves. All pipes (crtc's) are already added to the state if we have a change in active pipes. I think what you meant to write was "...we'll need to modify the watermarks on all active *planes*. Since those *planes* won't..." Aside from the commit message, I believe the logic is correct, so you can consider this Reviewed-by: Matt Roper once you reword it. Matt > > Signed-off-by: Lyude > Cc: stable@vger.kernel.org > Cc: Ville Syrj�l� > Cc: Daniel Vetter > Cc: Radhakrishna Sripada > Cc: Hans de Goede > Cc: Matt Roper > --- > drivers/gpu/drm/i915/intel_pm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 53adcbf..6b2452b 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4085,6 +4085,10 @@ skl_compute_ddb(struct drm_atomic_state *state) > ret = skl_allocate_pipe_ddb(cstate, ddb); > if (ret) > return ret; > + > + ret = drm_atomic_add_affected_planes(state, &intel_crtc->base); > + if (ret) > + return ret; > } > > return 0; > -- > 2.7.4 > -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795