From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: Re: [PATCH 07/10] drm/i915/gen9: Make skl_pipe_wm_get_hw_state() reusable Date: Thu, 13 Oct 2016 17:36:11 -0300 Message-ID: <1476390971.2478.43.camel@intel.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> <1475885497-6094-8-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: <1475885497-6094-8-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 Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org RW0gU2V4LCAyMDE2LTEwLTA3IMOgcyAyMDoxMSAtMDQwMCwgTHl1ZGUgZXNjcmV2ZXU6Cj4gVGhl cmUncyBub3QgbXVjaCBvZiBhIHJlYXNvbiB0aGlzIHNob3VsZCBoYXZlIHRoZSBsb2NhdGlvbnMg dG8gcmVhZAo+IG91dAo+IHRoZSBoYXJkd2FyZSBzdGF0ZSBoYXJkY29kZWQsIHNvIGFsbG93IHRo ZSBjYWxsZXIgdG8gc3BlY2lmeSB0aGUKPiBsb2NhdGlvbiBhbmQgYWRkIHRoaXMgZnVuY3Rpb24g dG8gaW50ZWxfZHJ2LmguIEFzIHdlbGwsIHdlJ3JlIGdvaW5nCj4gdG8KPiBuZWVkIHRoaXMgZnVu Y3Rpb24gdG8gYmUgcmV1c2FibGUgZm9yIHRoZSBuZXh0IHBhdGNoLgo+IAo+IFNpZ25lZC1vZmYt Ynk6IEx5dWRlIDxjcGF1bEByZWRoYXQuY29tPgo+IENjOiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IENjOiBWaWxsZSBTeXJqw6Rsw6QgPHZp bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+IENjOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIu emFub25pQGludGVsLmNvbT4KPiAtLS0KPiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIHzCoMKgMiArKwo+IMKgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uY8KgwqB8IDI3 ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQo+IMKgMiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o Cj4gaW5kZXggOTU4ZGM3Mi4uNzNhMmQxNmQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAo+IEBAIC0xNzU2LDYgKzE3NTYsOCBAQCB2b2lkIGlsa193bV9nZXRfaHdfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UKPiAqZGV2KTsKPiDCoHZvaWQgc2tsX3dtX2dldF9od19zdGF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKPiDCoHZvaWQgc2tsX2RkYl9nZXRfaHdfc3RhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+IMKgCQkJwqDCoHN0cnVjdCBza2xfZGRiX2FsbG9j YXRpb24gKmRkYiAvKiBvdXQgKi8pOwo+ICt2b2lkIHNrbF9waXBlX3dtX2dldF9od19zdGF0ZShz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gKwkJCcKgwqDCoMKgwqDCoHN0cnVjdCBza2xfcGlwZV93 bSAqb3V0KTsKPiDCoGJvb2wgaW50ZWxfY2FuX2VuYWJsZV9zYWd2KHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSk7Cj4gwqBpbnQgaW50ZWxfZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKPiDCoGludCBpbnRlbF9kaXNhYmxlX3NhZ3Yoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwo+IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IGlu ZGV4IDllNTNmZjcuLjI3YTUyMGNlIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gQEAg LTQyODcsMTUgKzQyODcsMTMgQEAgc3RhdGljIGlubGluZSB2b2lkCj4gc2tsX3dtX2xldmVsX2Zy b21fcmVnX3ZhbCh1aW50MzJfdCB2YWwsCj4gwqAJCVBMQU5FX1dNX0xJTkVTX01BU0s7Cj4gwqB9 Cj4gwqAKPiAtc3RhdGljIHZvaWQgc2tsX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKPiArdm9pZCBza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9j cnRjICpjcnRjLAo+ICsJCQnCoMKgwqDCoMKgwqBzdHJ1Y3Qgc2tsX3BpcGVfd20gKm91dCkKPiDC oHsKPiDCoAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2Owo+IMKgCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKPiAtCXN0cnVjdCBza2xf d21fdmFsdWVzICpodyA9ICZkZXZfcHJpdi0+d20uc2tsX2h3Owo+IMKgCXN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAtCXN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtCj4gPnN0YXRlKTsK PiDCoAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwo+IC0Jc3RydWN0IHNrbF9waXBl X3dtICphY3RpdmUgPSAmY3N0YXRlLT53bS5za2wub3B0aW1hbDsKPiDCoAlzdHJ1Y3Qgc2tsX3Bs YW5lX3dtICp3bTsKPiDCoAllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Cj4gwqAJ aW50IGxldmVsLCBpZCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOwo+IEBAIC00 MzAzLDcgKzQzMDEsNyBAQCBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoc3Ry dWN0Cj4gZHJtX2NydGMgKmNydGMpCj4gwqAKPiDCoAlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9j cnRjKGRldiwgaW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIHsKPiDCoAkJaWQgPSBza2xfd21fcGxh bmVfaWQoaW50ZWxfcGxhbmUpOwo+IC0JCXdtID0gJmNzdGF0ZS0+d20uc2tsLm9wdGltYWwucGxh bmVzW2lkXTsKPiArCQl3bSA9ICZvdXQtPnBsYW5lc1tpZF07Cj4gwqAKPiDCoAkJZm9yIChsZXZl bCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewo+IMKgCQkJaWYgKGlkICE9IFBM QU5FX0NVUlNPUikKPiBAQCAtNDMyNSwyMCArNDMyMywyOSBAQCBzdGF0aWMgdm9pZCBza2xfcGlw ZV93bV9nZXRfaHdfc3RhdGUoc3RydWN0Cj4gZHJtX2NydGMgKmNydGMpCj4gwqAJaWYgKCFpbnRl bF9jcnRjLT5hY3RpdmUpCj4gwqAJCXJldHVybjsKPiDCoAo+IC0JaHctPmRpcnR5X3BpcGVzIHw9 IGRybV9jcnRjX21hc2soY3J0Yyk7Cj4gLQlhY3RpdmUtPmxpbmV0aW1lID0gSTkxNV9SRUFEKFBJ UEVfV01fTElORVRJTUUocGlwZSkpOwo+IC0JaW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCA9ICph Y3RpdmU7Cj4gKwlvdXQtPmxpbmV0aW1lID0gSTkxNV9SRUFEKFBJUEVfV01fTElORVRJTUUocGlw ZSkpOwo+IMKgfQo+IMKgCj4gwqB2b2lkIHNrbF93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKPiDCoHsKPiDCoAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7Cj4gKwlzdHJ1Y3Qgc2tsX3dtX3ZhbHVlcyAqaHcgPSAmZGV2X3ByaXYt PndtLnNrbF9odzsKPiDCoAlzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIgPSAmZGV2X3By aXYtPndtLnNrbF9ody5kZGI7Cj4gwqAJc3RydWN0IGRybV9jcnRjICpjcnRjOwo+ICsJc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGM7Cj4gKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlOwo+IMKgCj4gwqAJc2tsX2RkYl9nZXRfaHdfc3RhdGUoZGV2X3ByaXYsIGRkYik7Cj4gLQls aXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVh ZCkKPiAtCQlza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoY3J0Yyk7Cj4gKwlsaXN0X2Zvcl9lYWNo X2VudHJ5KGNydGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkKPiB7Cj4gKwkJ aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Cj4gKwkJY3N0YXRlID0gdG9faW50ZWxf Y3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Cj4gKwo+ICsJCXNrbF9waXBlX3dtX2dldF9od19zdGF0 ZShjcnRjLCAmY3N0YXRlLQo+ID53bS5za2wub3B0aW1hbCk7Cj4gKwkJaW50ZWxfY3J0Yy0+d20u YWN0aXZlLnNrbCA9IGNzdGF0ZS0+d20uc2tsLm9wdGltYWw7CgpXZSdyZSBjaGFuZ2luZyBob3cg dGhlIGNvZGUgYmVoYXZlcyByZWdhcmRpbmcgaW50ZWxfY3J0Yy0KPndtLmFjdGl2ZS5za2wuIFBy ZXZpb3VzbHkgd2Ugd291bGQgb25seSBzZXQgaXQgaWYgaW50ZWxfY3J0Yy0+YWN0aXZlCmlzIHRy dWUgZHVlIHRvIHRoYXQgcmV0dXJuIGluIHNrbF9waXBlX3dtX2dldF9od19zdGF0ZSgpLiBOb3cg d2UncmUKYWx3YXlzIHNldHRpbmcgaXQuCgpJZiB0aGlzIGlzIHNvbWUgc29ydCBvZiBmaXggaXQg cHJvYmFibHkgZGVzZXJ2ZXMgdG8gYmUgaW4gYSBzZXBhcmF0ZQpjb21taXQgd2l0aCBhIG5pY2Ug Y29tbWl0IG1lc3NhZ2UuCgo+ICsKPiArCQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKPiArCQkJ aHctPmRpcnR5X3BpcGVzIHw9IGRybV9jcnRjX21hc2soY3J0Yyk7CgpTYW1lIGhlcmU6IHByZXZp b3VzbHkgd2Ugd291bGQgbm90IHNldCBkaXJ0eV9waXBlcyBpbiBjYXNlICFpbnRlbF9jcnRjLQo+ YWN0aXZlLiBOb3cgd2UncmUgZG9pbmcgdGhlIG9wcG9zaXRlLiBEaWRuJ3QgeW91IG1lYW4gImlm IChpbnRlbF9jcnRjLQo+YWN0aXZlKSIgaGVyZT8KCj4gKwl9Cj4gwqAKPiDCoAlpZiAoZGV2X3By aXYtPmFjdGl2ZV9jcnRjcykgewo+IMKgCQkvKiBGdWxseSByZWNvbXB1dGUgRERCIG9uIGZpcnN0 IGF0b21pYyBjb21taXQgKi8KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755797AbcJMUgn (ORCPT ); Thu, 13 Oct 2016 16:36:43 -0400 Received: from mga06.intel.com ([134.134.136.31]:21909 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753725AbcJMUgf (ORCPT ); Thu, 13 Oct 2016 16:36:35 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,489,1473145200"; d="scan'208";a="19331280" Message-ID: <1476390971.2478.43.camel@intel.com> Subject: Re: [PATCH 07/10] drm/i915/gen9: Make skl_pipe_wm_get_hw_state() reusable From: Paulo Zanoni To: Lyude , intel-gfx@lists.freedesktop.org Cc: Maarten Lankhorst , Ville =?ISO-8859-1?Q?Syrj=E4l=E4?= , Daniel Vetter , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Thu, 13 Oct 2016 17:36:11 -0300 In-Reply-To: <1475885497-6094-8-git-send-email-cpaul@redhat.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> <1475885497-6094-8-git-send-email-cpaul@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sex, 2016-10-07 às 20:11 -0400, Lyude escreveu: > There's not much of a reason this should have the locations to read > out > the hardware state hardcoded, so allow the caller to specify the > location and add this function to intel_drv.h. As well, we're going > to > need this function to be reusable for the next patch. > > Signed-off-by: Lyude > Cc: Maarten Lankhorst > Cc: Ville Syrjälä > Cc: Paulo Zanoni > --- >  drivers/gpu/drm/i915/intel_drv.h |  2 ++ >  drivers/gpu/drm/i915/intel_pm.c  | 27 +++++++++++++++++---------- >  2 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index 958dc72..73a2d16d 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1756,6 +1756,8 @@ void ilk_wm_get_hw_state(struct drm_device > *dev); >  void skl_wm_get_hw_state(struct drm_device *dev); >  void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, >     struct skl_ddb_allocation *ddb /* out */); > +void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, > +       struct skl_pipe_wm *out); >  bool intel_can_enable_sagv(struct drm_atomic_state *state); >  int intel_enable_sagv(struct drm_i915_private *dev_priv); >  int intel_disable_sagv(struct drm_i915_private *dev_priv); > diff --git a/drivers/gpu/drm/i915/intel_pm.c > b/drivers/gpu/drm/i915/intel_pm.c > index 9e53ff7..27a520ce 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4287,15 +4287,13 @@ static inline void > skl_wm_level_from_reg_val(uint32_t val, >   PLANE_WM_LINES_MASK; >  } >   > -static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc) > +void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc, > +       struct skl_pipe_wm *out) >  { >   struct drm_device *dev = crtc->dev; >   struct drm_i915_private *dev_priv = to_i915(dev); > - struct skl_wm_values *hw = &dev_priv->wm.skl_hw; >   struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > - struct intel_crtc_state *cstate = to_intel_crtc_state(crtc- > >state); >   struct intel_plane *intel_plane; > - struct skl_pipe_wm *active = &cstate->wm.skl.optimal; >   struct skl_plane_wm *wm; >   enum pipe pipe = intel_crtc->pipe; >   int level, id, max_level = ilk_wm_max_level(dev); > @@ -4303,7 +4301,7 @@ static void skl_pipe_wm_get_hw_state(struct > drm_crtc *crtc) >   >   for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) { >   id = skl_wm_plane_id(intel_plane); > - wm = &cstate->wm.skl.optimal.planes[id]; > + wm = &out->planes[id]; >   >   for (level = 0; level <= max_level; level++) { >   if (id != PLANE_CURSOR) > @@ -4325,20 +4323,29 @@ static void skl_pipe_wm_get_hw_state(struct > drm_crtc *crtc) >   if (!intel_crtc->active) >   return; >   > - hw->dirty_pipes |= drm_crtc_mask(crtc); > - active->linetime = I915_READ(PIPE_WM_LINETIME(pipe)); > - intel_crtc->wm.active.skl = *active; > + out->linetime = I915_READ(PIPE_WM_LINETIME(pipe)); >  } >   >  void skl_wm_get_hw_state(struct drm_device *dev) >  { >   struct drm_i915_private *dev_priv = to_i915(dev); > + struct skl_wm_values *hw = &dev_priv->wm.skl_hw; >   struct skl_ddb_allocation *ddb = &dev_priv->wm.skl_hw.ddb; >   struct drm_crtc *crtc; > + struct intel_crtc *intel_crtc; > + struct intel_crtc_state *cstate; >   >   skl_ddb_get_hw_state(dev_priv, ddb); > - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) > - skl_pipe_wm_get_hw_state(crtc); > + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) > { > + intel_crtc = to_intel_crtc(crtc); > + cstate = to_intel_crtc_state(crtc->state); > + > + skl_pipe_wm_get_hw_state(crtc, &cstate- > >wm.skl.optimal); > + intel_crtc->wm.active.skl = cstate->wm.skl.optimal; We're changing how the code behaves regarding intel_crtc- >wm.active.skl. Previously we would only set it if intel_crtc->active is true due to that return in skl_pipe_wm_get_hw_state(). Now we're always setting it. If this is some sort of fix it probably deserves to be in a separate commit with a nice commit message. > + > + if (!intel_crtc->active) > + hw->dirty_pipes |= drm_crtc_mask(crtc); Same here: previously we would not set dirty_pipes in case !intel_crtc- >active. Now we're doing the opposite. Didn't you mean "if (intel_crtc- >active)" here? > + } >   >   if (dev_priv->active_crtcs) { >   /* Fully recompute DDB on first atomic commit */