From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752538AbcJKTkl (ORCPT ); Tue, 11 Oct 2016 15:40:41 -0400 Received: from mga09.intel.com ([134.134.136.24]:59301 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752113AbcJKTkj (ORCPT ); Tue, 11 Oct 2016 15:40:39 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,330,1473145200"; d="scan'208";a="1052471699" Message-ID: <1476214833.2460.19.camel@intel.com> Subject: Re: [Intel-gfx] [PATCH 04/10] drm/i915/gen9: Cleanup skl_pipe_wm_active_state From: Paulo Zanoni To: Lyude , intel-gfx@lists.freedesktop.org Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter Date: Tue, 11 Oct 2016 16:40:33 -0300 In-Reply-To: <1475885497-6094-5-git-send-email-cpaul@redhat.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> <1475885497-6094-5-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: > This function is a wreck, let's help it get it's life back together > and > cleanup all of the copy pasta here. s/it's/its/ Idea for your next patch series: rename skl_pipe_wm_active_state()'s "i" parameter to something more meaningful. Reviewed-by: Paulo Zanoni > > (adding Maarten's reviewed-by since this is just a split-up version > of one > of the previous patches) > > Signed-off-by: Lyude > Reviewed-by: Maarten Lankhorst > Cc: Ville Syrjälä > Cc: Paulo Zanoni > --- >  drivers/gpu/drm/i915/intel_pm.c | 52 +++++++++++------------------ > ------------ >  1 file changed, 14 insertions(+), 38 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c > b/drivers/gpu/drm/i915/intel_pm.c > index 4c2ebcd..5dbaf12 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4267,46 +4267,22 @@ static void ilk_optimize_watermarks(struct > intel_crtc_state *cstate) >  static void skl_pipe_wm_active_state(uint32_t val, >        struct skl_pipe_wm *active, >        bool is_transwm, > -      bool is_cursor, >        int i, >        int level) >  { > + struct skl_plane_wm *plane_wm = &active->planes[i]; >   bool is_enabled = (val & PLANE_WM_EN) != 0; >   >   if (!is_transwm) { > - if (!is_cursor) { > - active->planes[i].wm[level].plane_en = > is_enabled; > - active->planes[i].wm[level].plane_res_b = > - val & PLANE_WM_BLOCKS_MASK; > - active->planes[i].wm[level].plane_res_l = > - (val >> PLANE_WM_LINES_SHIFT) & > - PLANE_WM_LINES_MASK; > - } else { > - active- > >planes[PLANE_CURSOR].wm[level].plane_en = > - is_enabled; > - active- > >planes[PLANE_CURSOR].wm[level].plane_res_b = > - val & PLANE_WM_BLOCKS_MASK; > - active- > >planes[PLANE_CURSOR].wm[level].plane_res_l = > - (val >> PLANE_WM_LINES_SHIFT) & > - PLANE_WM_LINES_MASK; > - } > + plane_wm->wm[level].plane_en = is_enabled; > + plane_wm->wm[level].plane_res_b = val & > PLANE_WM_BLOCKS_MASK; > + plane_wm->wm[level].plane_res_l = > + (val >> PLANE_WM_LINES_SHIFT) & > PLANE_WM_LINES_MASK; >   } else { > - if (!is_cursor) { > - active->planes[i].trans_wm.plane_en = > is_enabled; > - active->planes[i].trans_wm.plane_res_b = > - val & PLANE_WM_BLOCKS_MASK; > - active->planes[i].trans_wm.plane_res_l = > - (val >> PLANE_WM_LINES_SHIFT) & > - PLANE_WM_LINES_MASK; > - } else { > - active- > >planes[PLANE_CURSOR].trans_wm.plane_en = > - is_enabled; > - active- > >planes[PLANE_CURSOR].trans_wm.plane_res_b = > - val & PLANE_WM_BLOCKS_MASK; > - active- > >planes[PLANE_CURSOR].trans_wm.plane_res_l = > - (val >> PLANE_WM_LINES_SHIFT) & > - PLANE_WM_LINES_MASK; > - } > + plane_wm->trans_wm.plane_en = is_enabled; > + plane_wm->trans_wm.plane_res_b = val & > PLANE_WM_BLOCKS_MASK; > + plane_wm->trans_wm.plane_res_l = > + (val >> PLANE_WM_LINES_SHIFT) & > PLANE_WM_LINES_MASK; >   } >  } >   > @@ -4345,20 +4321,20 @@ static void skl_pipe_wm_get_hw_state(struct > drm_crtc *crtc) >   for (level = 0; level <= max_level; level++) { >   for (i = 0; i < intel_num_planes(intel_crtc); i++) { >   temp = hw->plane[pipe][i][level]; > - skl_pipe_wm_active_state(temp, active, > false, > - false, i, level); > + skl_pipe_wm_active_state(temp, active, > false, i, level); >   } >   temp = hw->plane[pipe][PLANE_CURSOR][level]; > - skl_pipe_wm_active_state(temp, active, false, true, > i, level); > + skl_pipe_wm_active_state(temp, active, false, > PLANE_CURSOR, > +  level); >   } >   >   for (i = 0; i < intel_num_planes(intel_crtc); i++) { >   temp = hw->plane_trans[pipe][i]; > - skl_pipe_wm_active_state(temp, active, true, false, > i, 0); > + skl_pipe_wm_active_state(temp, active, true, i, 0); >   } >   >   temp = hw->plane_trans[pipe][PLANE_CURSOR]; > - skl_pipe_wm_active_state(temp, active, true, true, i, 0); > + skl_pipe_wm_active_state(temp, active, true, PLANE_CURSOR, > 0); >   >   intel_crtc->wm.active.skl = *active; >  } From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: Re: [PATCH 04/10] drm/i915/gen9: Cleanup skl_pipe_wm_active_state Date: Tue, 11 Oct 2016 16:40:33 -0300 Message-ID: <1476214833.2460.19.camel@intel.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> <1475885497-6094-5-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-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 , intel-gfx@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RW0gU2V4LCAyMDE2LTEwLTA3IMOgcyAyMDoxMSAtMDQwMCwgTHl1ZGUgZXNjcmV2ZXU6Cj4gVGhp cyBmdW5jdGlvbiBpcyBhIHdyZWNrLCBsZXQncyBoZWxwIGl0IGdldCBpdCdzIGxpZmUgYmFjayB0 b2dldGhlcgo+IGFuZAo+IGNsZWFudXAgYWxsIG9mIHRoZSBjb3B5IHBhc3RhIGhlcmUuCgpzL2l0 J3MvaXRzLwoKSWRlYSBmb3IgeW91ciBuZXh0IHBhdGNoIHNlcmllczogcmVuYW1lIHNrbF9waXBl X3dtX2FjdGl2ZV9zdGF0ZSgpJ3MKImkiIHBhcmFtZXRlciB0byBzb21ldGhpbmcgbW9yZSBtZWFu aW5nZnVsLgoKUmV2aWV3ZWQtYnk6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwu Y29tPgoKPiAKPiAoYWRkaW5nIE1hYXJ0ZW4ncyByZXZpZXdlZC1ieSBzaW5jZSB0aGlzIGlzIGp1 c3QgYSBzcGxpdC11cCB2ZXJzaW9uCj4gb2Ygb25lCj4gb2YgdGhlIHByZXZpb3VzIHBhdGNoZXMp Cj4gCj4gU2lnbmVkLW9mZi1ieTogTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+Cj4gUmV2aWV3ZWQt Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ Cj4gQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4g Q2M6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgo+IC0tLQo+IMKgZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDUyICsrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tCj4gLS0tLS0tLS0tLS0tCj4gwqAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygr KSwgMzggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKPiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBpbmRleCA0 YzJlYmNkLi41ZGJhZjEyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gQEAgLTQyNjcs NDYgKzQyNjcsMjIgQEAgc3RhdGljIHZvaWQgaWxrX29wdGltaXplX3dhdGVybWFya3Moc3RydWN0 Cj4gaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQo+IMKgc3RhdGljIHZvaWQgc2tsX3BpcGVfd21f YWN0aXZlX3N0YXRlKHVpbnQzMl90IHZhbCwKPiDCoAkJCQnCoMKgwqDCoMKgc3RydWN0IHNrbF9w aXBlX3dtICphY3RpdmUsCj4gwqAJCQkJwqDCoMKgwqDCoGJvb2wgaXNfdHJhbnN3bSwKPiAtCQkJ CcKgwqDCoMKgwqBib29sIGlzX2N1cnNvciwKPiDCoAkJCQnCoMKgwqDCoMKgaW50IGksCj4gwqAJ CQkJwqDCoMKgwqDCoGludCBsZXZlbCkKPiDCoHsKPiArCXN0cnVjdCBza2xfcGxhbmVfd20gKnBs YW5lX3dtID0gJmFjdGl2ZS0+cGxhbmVzW2ldOwo+IMKgCWJvb2wgaXNfZW5hYmxlZCA9ICh2YWwg JiBQTEFORV9XTV9FTikgIT0gMDsKPiDCoAo+IMKgCWlmICghaXNfdHJhbnN3bSkgewo+IC0JCWlm ICghaXNfY3Vyc29yKSB7Cj4gLQkJCWFjdGl2ZS0+cGxhbmVzW2ldLndtW2xldmVsXS5wbGFuZV9l biA9Cj4gaXNfZW5hYmxlZDsKPiAtCQkJYWN0aXZlLT5wbGFuZXNbaV0ud21bbGV2ZWxdLnBsYW5l X3Jlc19iID0KPiAtCQkJCXZhbCAmIFBMQU5FX1dNX0JMT0NLU19NQVNLOwo+IC0JCQlhY3RpdmUt PnBsYW5lc1tpXS53bVtsZXZlbF0ucGxhbmVfcmVzX2wgPQo+IC0JCQkJKHZhbCA+PiBQTEFORV9X TV9MSU5FU19TSElGVCkgJgo+IC0JCQkJUExBTkVfV01fTElORVNfTUFTSzsKPiAtCQl9IGVsc2Ug ewo+IC0JCQlhY3RpdmUtCj4gPnBsYW5lc1tQTEFORV9DVVJTT1JdLndtW2xldmVsXS5wbGFuZV9l biA9Cj4gLQkJCQlpc19lbmFibGVkOwo+IC0JCQlhY3RpdmUtCj4gPnBsYW5lc1tQTEFORV9DVVJT T1JdLndtW2xldmVsXS5wbGFuZV9yZXNfYiA9Cj4gLQkJCQl2YWwgJiBQTEFORV9XTV9CTE9DS1Nf TUFTSzsKPiAtCQkJYWN0aXZlLQo+ID5wbGFuZXNbUExBTkVfQ1VSU09SXS53bVtsZXZlbF0ucGxh bmVfcmVzX2wgPQo+IC0JCQkJKHZhbCA+PiBQTEFORV9XTV9MSU5FU19TSElGVCkgJgo+IC0JCQkJ UExBTkVfV01fTElORVNfTUFTSzsKPiAtCQl9Cj4gKwkJcGxhbmVfd20tPndtW2xldmVsXS5wbGFu ZV9lbiA9IGlzX2VuYWJsZWQ7Cj4gKwkJcGxhbmVfd20tPndtW2xldmVsXS5wbGFuZV9yZXNfYiA9 IHZhbCAmCj4gUExBTkVfV01fQkxPQ0tTX01BU0s7Cj4gKwkJcGxhbmVfd20tPndtW2xldmVsXS5w bGFuZV9yZXNfbCA9Cj4gKwkJCSh2YWwgPj4gUExBTkVfV01fTElORVNfU0hJRlQpICYKPiBQTEFO RV9XTV9MSU5FU19NQVNLOwo+IMKgCX0gZWxzZSB7Cj4gLQkJaWYgKCFpc19jdXJzb3IpIHsKPiAt CQkJYWN0aXZlLT5wbGFuZXNbaV0udHJhbnNfd20ucGxhbmVfZW4gPQo+IGlzX2VuYWJsZWQ7Cj4g LQkJCWFjdGl2ZS0+cGxhbmVzW2ldLnRyYW5zX3dtLnBsYW5lX3Jlc19iID0KPiAtCQkJCXZhbCAm IFBMQU5FX1dNX0JMT0NLU19NQVNLOwo+IC0JCQlhY3RpdmUtPnBsYW5lc1tpXS50cmFuc193bS5w bGFuZV9yZXNfbCA9Cj4gLQkJCQkodmFsID4+IFBMQU5FX1dNX0xJTkVTX1NISUZUKSAmCj4gLQkJ CQlQTEFORV9XTV9MSU5FU19NQVNLOwo+IC0JCX0gZWxzZSB7Cj4gLQkJCWFjdGl2ZS0KPiA+cGxh bmVzW1BMQU5FX0NVUlNPUl0udHJhbnNfd20ucGxhbmVfZW4gPQo+IC0JCQkJaXNfZW5hYmxlZDsK PiAtCQkJYWN0aXZlLQo+ID5wbGFuZXNbUExBTkVfQ1VSU09SXS50cmFuc193bS5wbGFuZV9yZXNf YiA9Cj4gLQkJCQl2YWwgJiBQTEFORV9XTV9CTE9DS1NfTUFTSzsKPiAtCQkJYWN0aXZlLQo+ID5w bGFuZXNbUExBTkVfQ1VSU09SXS50cmFuc193bS5wbGFuZV9yZXNfbCA9Cj4gLQkJCQkodmFsID4+ IFBMQU5FX1dNX0xJTkVTX1NISUZUKSAmCj4gLQkJCQlQTEFORV9XTV9MSU5FU19NQVNLOwo+IC0J CX0KPiArCQlwbGFuZV93bS0+dHJhbnNfd20ucGxhbmVfZW4gPSBpc19lbmFibGVkOwo+ICsJCXBs YW5lX3dtLT50cmFuc193bS5wbGFuZV9yZXNfYiA9IHZhbCAmCj4gUExBTkVfV01fQkxPQ0tTX01B U0s7Cj4gKwkJcGxhbmVfd20tPnRyYW5zX3dtLnBsYW5lX3Jlc19sID0KPiArCQkJKHZhbCA+PiBQ TEFORV9XTV9MSU5FU19TSElGVCkgJgo+IFBMQU5FX1dNX0xJTkVTX01BU0s7Cj4gwqAJfQo+IMKg fQo+IMKgCj4gQEAgLTQzNDUsMjAgKzQzMjEsMjAgQEAgc3RhdGljIHZvaWQgc2tsX3BpcGVfd21f Z2V0X2h3X3N0YXRlKHN0cnVjdAo+IGRybV9jcnRjICpjcnRjKQo+IMKgCWZvciAobGV2ZWwgPSAw OyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspIHsKPiDCoAkJZm9yIChpID0gMDsgaSA8IGlu dGVsX251bV9wbGFuZXMoaW50ZWxfY3J0Yyk7IGkrKykgewo+IMKgCQkJdGVtcCA9IGh3LT5wbGFu ZVtwaXBlXVtpXVtsZXZlbF07Cj4gLQkJCXNrbF9waXBlX3dtX2FjdGl2ZV9zdGF0ZSh0ZW1wLCBh Y3RpdmUsCj4gZmFsc2UsCj4gLQkJCQkJCWZhbHNlLCBpLCBsZXZlbCk7Cj4gKwkJCXNrbF9waXBl X3dtX2FjdGl2ZV9zdGF0ZSh0ZW1wLCBhY3RpdmUsCj4gZmFsc2UsIGksIGxldmVsKTsKPiDCoAkJ fQo+IMKgCQl0ZW1wID0gaHctPnBsYW5lW3BpcGVdW1BMQU5FX0NVUlNPUl1bbGV2ZWxdOwo+IC0J CXNrbF9waXBlX3dtX2FjdGl2ZV9zdGF0ZSh0ZW1wLCBhY3RpdmUsIGZhbHNlLCB0cnVlLAo+IGks IGxldmVsKTsKPiArCQlza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodGVtcCwgYWN0aXZlLCBmYWxz ZSwKPiBQTEFORV9DVVJTT1IsCj4gKwkJCQkJwqBsZXZlbCk7Cj4gwqAJfQo+IMKgCj4gwqAJZm9y IChpID0gMDsgaSA8IGludGVsX251bV9wbGFuZXMoaW50ZWxfY3J0Yyk7IGkrKykgewo+IMKgCQl0 ZW1wID0gaHctPnBsYW5lX3RyYW5zW3BpcGVdW2ldOwo+IC0JCXNrbF9waXBlX3dtX2FjdGl2ZV9z dGF0ZSh0ZW1wLCBhY3RpdmUsIHRydWUsIGZhbHNlLAo+IGksIDApOwo+ICsJCXNrbF9waXBlX3dt X2FjdGl2ZV9zdGF0ZSh0ZW1wLCBhY3RpdmUsIHRydWUsIGksIDApOwo+IMKgCX0KPiDCoAo+IMKg CXRlbXAgPSBody0+cGxhbmVfdHJhbnNbcGlwZV1bUExBTkVfQ1VSU09SXTsKPiAtCXNrbF9waXBl X3dtX2FjdGl2ZV9zdGF0ZSh0ZW1wLCBhY3RpdmUsIHRydWUsIHRydWUsIGksIDApOwo+ICsJc2ts X3BpcGVfd21fYWN0aXZlX3N0YXRlKHRlbXAsIGFjdGl2ZSwgdHJ1ZSwgUExBTkVfQ1VSU09SLAo+ IDApOwo+IMKgCj4gwqAJaW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCA9ICphY3RpdmU7Cj4gwqB9 Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=