From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: Re: [PATCH v5 2/7] drm/rockchip: vop: move write_relaxed flags to vop register Date: Tue, 25 Jul 2017 23:47:09 +0200 Message-ID: <2048476.V4PpOSpEqb@phil> References: <1500518564-30371-1-git-send-email-mark.yao@rock-chips.com> <1500518608-30538-1-git-send-email-mark.yao@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1500518608-30538-1-git-send-email-mark.yao@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mark Yao Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org SGkgTWFyaywKCkFtIERvbm5lcnN0YWcsIDIwLiBKdWxpIDIwMTcsIDEwOjQzOjI3IENFU1Qgc2No cmllYiBNYXJrIFlhbzoKPiBTaW5jZSB0aGUgZHJtIGF0b21pYyBmcmFtZXdvcmssIG9ubHkgYSBz bWFsbCBwYXJ0IG9mIHRoZSB2b3AKPiByZWdpc3RlciBuZWVkcyBzeW5jIHdyaXRlLCBDdXJyZW50 bHkgc2VlbXMgb25seSBmb2xsb3dpbmcgcmVnaXN0ZXJzCj4gbmVlZCBzeW5jIHdyaXRlOgo+ICAg IGNmZ19kb25lLCBzdGFuZGJ5IGFuZCBpbnRlcnJ1cHQgcmVsYXRlZCByZWdpc3Rlci4KPiAKPiBB bGwgY3RybCByZWdpc3RlcnMgYXJlIHVzaW5nIHRoZSBzeW5jIHdyaXRlIG1ldGhvZCB0aGF0IGlz Cj4gaW5lZmZpY2llbnQsIGhhcmRjb2RlIHRoZSB3cml0ZV9yZWxheGVkIGZsYWdzIHRvIHZvcCBy ZWdpc3RlcnMsCj4gdGhlbiBjYW4gb25seSBkbyBzeW5jaHJvbml6ZSB3cml0ZSBmb3IgdGhvc2Ug YWN0dWFsIG5lZWRlZCByZWdpc3Rlci4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYXJrIFlhbyA8bWFy ay55YW9Acm9jay1jaGlwcy5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9y b2NrY2hpcF9kcm1fdm9wLmMgfCAxNCArKystLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9yb2NrY2hpcF92b3BfcmVnLmMgfCA0MiArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LQo+ICAyIGZpbGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQo+ IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3Zv cC5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYwo+IGluZGV4 IDgxMTY0ZDYuLjc4NGEyYjcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L3JvY2tjaGlwX2RybV92b3AuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2Nr Y2hpcF9kcm1fdm9wLmMKPiBAQCAtNDIsMTggKzQyLDEyIEBACj4gICNpbmNsdWRlICJyb2NrY2hp cF9kcm1fcHNyLmgiCj4gICNpbmNsdWRlICJyb2NrY2hpcF9kcm1fdm9wLmgiCj4gIAo+IC0jZGVm aW5lIF9fUkVHX1NFVF9SRUxBWEVEKHgsIG9mZiwgbWFzaywgc2hpZnQsIHYsIHdyaXRlX21hc2sp IFwKPiAtCQl2b3BfbWFza193cml0ZSh4LCBvZmYsIG1hc2ssIHNoaWZ0LCB2LCB3cml0ZV9tYXNr LCB0cnVlKQo+IC0KPiAtI2RlZmluZSBfX1JFR19TRVRfTk9STUFMKHgsIG9mZiwgbWFzaywgc2hp ZnQsIHYsIHdyaXRlX21hc2spIFwKPiAtCQl2b3BfbWFza193cml0ZSh4LCBvZmYsIG1hc2ssIHNo aWZ0LCB2LCB3cml0ZV9tYXNrLCBmYWxzZSkKPiAtCj4gICNkZWZpbmUgUkVHX1NFVCh4LCBiYXNl LCByZWcsIHYsIG1vZGUpIFwKPiAtCQlfX1JFR19TRVRfIyNtb2RlKHgsIGJhc2UgKyByZWcub2Zm c2V0LCBcCj4gLQkJCQkgcmVnLm1hc2ssIHJlZy5zaGlmdCwgdiwgcmVnLndyaXRlX21hc2spCj4g KwkJdm9wX21hc2tfd3JpdGUoeCwgYmFzZSArIHJlZy5vZmZzZXQsIHJlZy5tYXNrLCByZWcuc2hp ZnQsIFwKPiArCQkJICAgICAgIHYsIHJlZy53cml0ZV9tYXNrLCByZWcucmVsYXhlZCkKPiAgI2Rl ZmluZSBSRUdfU0VUX01BU0soeCwgYmFzZSwgcmVnLCBtYXNrLCB2LCBtb2RlKSBcCj4gLQkJX19S RUdfU0VUXyMjbW9kZSh4LCBiYXNlICsgcmVnLm9mZnNldCwgXAo+IC0JCQkJIG1hc2ssIHJlZy5z aGlmdCwgdiwgcmVnLndyaXRlX21hc2spCj4gKwkJdm9wX21hc2tfd3JpdGUoeCwgYmFzZSArIHJl Zy5vZmZzZXQsIFwKPiArCQkJICAgICAgIG1hc2ssIHJlZy5zaGlmdCwgdiwgcmVnLndyaXRlX21h c2ssIHJlZy5yZWxheGVkKQoKeW91IG9ubHkgaW50cm9kdWNlIHRoZSByZWxheGVkIGVsZW1lbnQg b2Ygc3RydWN0IHZvcF9yZWcgaW4gcGF0Y2g0LgpTbyB1c2luZyBpdCBoZXJlIHByb2R1Y2VzIGEg Y29tcGlsZSBlcnJvcgoKLi4vZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92 b3AuYzogSW4gZnVuY3Rpb24g4oCYdm9wX2NmZ19kb25l4oCZOgouLi9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jOjQ3OjMzOiBlcnJvcjog4oCYY29uc3Qgc3RydWN0 IHZvcF9yZWfigJkgaGFzIG5vIG1lbWJlciBuYW1lZCDigJhyZWxheGVk4oCZCiAgICAgICAgICAg diwgcmVnLndyaXRlX21hc2ssIHJlZy5yZWxheGVkKQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBeCi4uL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmM6 NTk6Mzogbm90ZTogaW4gZXhwYW5zaW9uIG9mIG1hY3JvIOKAmFJFR19TRVTigJkKICAgUkVHX1NF VCh4LCAwLCAoeCktPmRhdGEtPmN0cmwtPm5hbWUsIHYsIE5PUk1BTCkKICAgXn5+fn5+fgouLi9k cml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jOjIwMToyOiBub3RlOiBp biBleHBhbnNpb24gb2YgbWFjcm8g4oCYVk9QX0NUUkxfU0VU4oCZCiAgVk9QX0NUUkxfU0VUKHZv cCwgY2ZnX2RvbmUsIDEpOwogIF5+fn5+fn5+fn5+fgoKd2hlbiBvbmx5IHBhdGNoZXMgMSsyIGFy ZSBhcHBsaWVkLiBTbyB0aGUgcmVsYXhlZCBmaWVsZCBhZGRpdGlvbiBzaG91bGQKZGVmaW5pdGx5 IG1vdmUgaW50byB0aGlzIHBhdGNoIHRvIG5vdCBicmVhayBiaXNlY3RhYmlsaXR5LgoKCkhlaWtv CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko Stuebner) Date: Tue, 25 Jul 2017 23:47:09 +0200 Subject: [PATCH v5 2/7] drm/rockchip: vop: move write_relaxed flags to vop register In-Reply-To: <1500518608-30538-1-git-send-email-mark.yao@rock-chips.com> References: <1500518564-30371-1-git-send-email-mark.yao@rock-chips.com> <1500518608-30538-1-git-send-email-mark.yao@rock-chips.com> Message-ID: <2048476.V4PpOSpEqb@phil> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Mark, Am Donnerstag, 20. Juli 2017, 10:43:27 CEST schrieb Mark Yao: > Since the drm atomic framework, only a small part of the vop > register needs sync write, Currently seems only following registers > need sync write: > cfg_done, standby and interrupt related register. > > All ctrl registers are using the sync write method that is > inefficient, hardcode the write_relaxed flags to vop registers, > then can only do synchronize write for those actual needed register. > > Signed-off-by: Mark Yao > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 14 +++------- > drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 42 ++++++++++++++++------------- > 2 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 81164d6..784a2b7 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -42,18 +42,12 @@ > #include "rockchip_drm_psr.h" > #include "rockchip_drm_vop.h" > > -#define __REG_SET_RELAXED(x, off, mask, shift, v, write_mask) \ > - vop_mask_write(x, off, mask, shift, v, write_mask, true) > - > -#define __REG_SET_NORMAL(x, off, mask, shift, v, write_mask) \ > - vop_mask_write(x, off, mask, shift, v, write_mask, false) > - > #define REG_SET(x, base, reg, v, mode) \ > - __REG_SET_##mode(x, base + reg.offset, \ > - reg.mask, reg.shift, v, reg.write_mask) > + vop_mask_write(x, base + reg.offset, reg.mask, reg.shift, \ > + v, reg.write_mask, reg.relaxed) > #define REG_SET_MASK(x, base, reg, mask, v, mode) \ > - __REG_SET_##mode(x, base + reg.offset, \ > - mask, reg.shift, v, reg.write_mask) > + vop_mask_write(x, base + reg.offset, \ > + mask, reg.shift, v, reg.write_mask, reg.relaxed) you only introduce the relaxed element of struct vop_reg in patch4. So using it here produces a compile error ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c: In function ?vop_cfg_done?: ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:47:33: error: ?const struct vop_reg? has no member named ?relaxed? v, reg.write_mask, reg.relaxed) ^ ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:59:3: note: in expansion of macro ?REG_SET? REG_SET(x, 0, (x)->data->ctrl->name, v, NORMAL) ^~~~~~~ ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:201:2: note: in expansion of macro ?VOP_CTRL_SET? VOP_CTRL_SET(vop, cfg_done, 1); ^~~~~~~~~~~~ when only patches 1+2 are applied. So the relaxed field addition should definitly move into this patch to not break bisectability. Heiko From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751367AbdGYVrT convert rfc822-to-8bit (ORCPT ); Tue, 25 Jul 2017 17:47:19 -0400 Received: from gloria.sntech.de ([95.129.55.99]:48464 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbdGYVrS (ORCPT ); Tue, 25 Jul 2017 17:47:18 -0400 From: Heiko Stuebner To: Mark Yao Cc: David Airlie , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 2/7] drm/rockchip: vop: move write_relaxed flags to vop register Date: Tue, 25 Jul 2017 23:47:09 +0200 Message-ID: <2048476.V4PpOSpEqb@phil> User-Agent: KMail/5.2.3 (Linux/4.9.0-2-amd64; KDE/5.28.0; x86_64; ; ) In-Reply-To: <1500518608-30538-1-git-send-email-mark.yao@rock-chips.com> References: <1500518564-30371-1-git-send-email-mark.yao@rock-chips.com> <1500518608-30538-1-git-send-email-mark.yao@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mark, Am Donnerstag, 20. Juli 2017, 10:43:27 CEST schrieb Mark Yao: > Since the drm atomic framework, only a small part of the vop > register needs sync write, Currently seems only following registers > need sync write: > cfg_done, standby and interrupt related register. > > All ctrl registers are using the sync write method that is > inefficient, hardcode the write_relaxed flags to vop registers, > then can only do synchronize write for those actual needed register. > > Signed-off-by: Mark Yao > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 14 +++------- > drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 42 ++++++++++++++++------------- > 2 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 81164d6..784a2b7 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -42,18 +42,12 @@ > #include "rockchip_drm_psr.h" > #include "rockchip_drm_vop.h" > > -#define __REG_SET_RELAXED(x, off, mask, shift, v, write_mask) \ > - vop_mask_write(x, off, mask, shift, v, write_mask, true) > - > -#define __REG_SET_NORMAL(x, off, mask, shift, v, write_mask) \ > - vop_mask_write(x, off, mask, shift, v, write_mask, false) > - > #define REG_SET(x, base, reg, v, mode) \ > - __REG_SET_##mode(x, base + reg.offset, \ > - reg.mask, reg.shift, v, reg.write_mask) > + vop_mask_write(x, base + reg.offset, reg.mask, reg.shift, \ > + v, reg.write_mask, reg.relaxed) > #define REG_SET_MASK(x, base, reg, mask, v, mode) \ > - __REG_SET_##mode(x, base + reg.offset, \ > - mask, reg.shift, v, reg.write_mask) > + vop_mask_write(x, base + reg.offset, \ > + mask, reg.shift, v, reg.write_mask, reg.relaxed) you only introduce the relaxed element of struct vop_reg in patch4. So using it here produces a compile error ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c: In function ‘vop_cfg_done’: ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:47:33: error: ‘const struct vop_reg’ has no member named ‘relaxed’ v, reg.write_mask, reg.relaxed) ^ ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:59:3: note: in expansion of macro ‘REG_SET’ REG_SET(x, 0, (x)->data->ctrl->name, v, NORMAL) ^~~~~~~ ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:201:2: note: in expansion of macro ‘VOP_CTRL_SET’ VOP_CTRL_SET(vop, cfg_done, 1); ^~~~~~~~~~~~ when only patches 1+2 are applied. So the relaxed field addition should definitly move into this patch to not break bisectability. Heiko