From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeffy Subject: Re: [PATCH v2] drm/rockchip: Set line flag config register in vop_crtc_enable Date: Sat, 29 Apr 2017 21:11:49 +0800 Message-ID: <59049115.2090804@rock-chips.com> References: <1493365067-29541-1-git-send-email-jeffy.chen@rock-chips.com> <20170428150317.tpnj6obddfz5dzng@art_vandelay> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170428150317.tpnj6obddfz5dzng@art_vandelay> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sean Paul Cc: dianders@chromium.org, dbasehore@chromium.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, hoegsberg@chromium.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org SGkgU2VhbiwKCk9uIDA0LzI4LzIwMTcgMTE6MDMgUE0sIFNlYW4gUGF1bCB3cm90ZToKPiBPbiBG cmksIEFwciAyOCwgMjAxNyBhdCAwMzozNzo0N1BNICswODAwLCBKZWZmeSBDaGVuIHdyb3RlOgo+ PiBXZSBuZWVkIHRvIHNldCB2b3AgY29uZmlnIGRvbmUgYWZ0ZXIgdXBkYXRlIGxpbmUgZmxhZyBj b25maWcsIGl0J3MgYQo+PiBuZXcgcmVxdWlyZW1lbnQgZm9yIGNoaXBzIG5ld2VyIHRoYW4gcmsz MzY4Lgo+Pgo+PiBTaW5jZSB3ZSB3b3VsZCBvbmx5IHVzZSBsaW5lIGZsYWcgaXJxIGZvciB2YWN0 X2VuZCwgbGV0J3MgbW92ZSBpdCB0bwo+PiB2b3BfY3J0Y19lbmFibGUuCj4+Cj4+IHYyOiBSZW1v dmUgdW51c2VkIGNoZWNrIGFuZCB2YXJpYWJsZXMuCj4KPiBIaSBKZWZmeSwKPiB2MSB3YXMgYWxy ZWFkeSBhcHBsaWVkLiBQbGVhc2Ugc2VuZCBhIGZvbGxvdy1vbiBwYXRjaCB0byBjbGVhbiB0aGlz IHVwLgpPaywgd2lsbCBkby4KPgo+IFNlYW4KPgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBKZWZmeSBD aGVuIDxqZWZmeS5jaGVuQHJvY2stY2hpcHMuY29tPgo+Pgo+PiAtLS0KPj4KPj4gQ2hhbmdlcyBp biB2MjoKPj4gUmVtb3ZlIHVudXNlZCBjaGVjayBhbmQgdmFyaWFibGVzLgo+Pgo+PiAgIGRyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5jIHwgMTQgKysrLS0tLS0t LS0tLS0KPj4gICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oICAg ICB8ICAzICstLQo+PiAgIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9w LmMgICAgIHwgMjAgKysrKysrKysrLS0tLS0tLS0tLS0KPj4gICAzIGZpbGVzIGNoYW5nZWQsIDEz IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMgYi9kcml2ZXJzL2dwdS9k cm0vcm9ja2NoaXAvYW5hbG9naXhfZHAtcm9ja2NoaXAuYwo+PiBpbmRleCBkOGZhN2E5Li4xYmNj ZDgyIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvYW5hbG9naXhfZHAt cm9ja2NoaXAuYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvYW5hbG9naXhfZHAt cm9ja2NoaXAuYwo+PiBAQCAtMTA0LDI2ICsxMDQsMTggQEAgc3RhdGljIHZvaWQgYW5hbG9naXhf ZHBfcHNyX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+PiAgIHsKPj4gICAJc3RydWN0 IHJvY2tjaGlwX2RwX2RldmljZSAqZHAgPQo+PiAgIAkJCQljb250YWluZXJfb2Yod29yaywgdHlw ZW9mKCpkcCksIHBzcl93b3JrKTsKPj4gLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBkcC0+ZW5j b2Rlci5jcnRjOwo+PiAtCWludCBwc3Jfc3RhdGUgPSBkcC0+cHNyX3N0YXRlOwo+PiAtCWludCB2 YWN0X2VuZDsKPj4gICAJaW50IHJldDsKPj4gICAJdW5zaWduZWQgbG9uZyBmbGFnczsKPj4KPj4g LQlpZiAoIWNydGMpCj4+IC0JCXJldHVybjsKPj4gLQo+PiAtCXZhY3RfZW5kID0gY3J0Yy0+bW9k ZS52dG90YWwgLSBjcnRjLT5tb2RlLnZzeW5jX3N0YXJ0ICsgY3J0Yy0+bW9kZS52ZGlzcGxheTsK Pj4gLQo+PiAtCXJldCA9IHJvY2tjaGlwX2RybV93YWl0X2xpbmVfZmxhZyhkcC0+ZW5jb2Rlci5j cnRjLCB2YWN0X2VuZCwKPj4gLQkJCQkJICBQU1JfV0FJVF9MSU5FX0ZMQUdfVElNRU9VVF9NUyk7 Cj4+ICsJcmV0ID0gcm9ja2NoaXBfZHJtX3dhaXRfdmFjdF9lbmQoZHAtPmVuY29kZXIuY3J0YywK Pj4gKwkJCQkJIFBTUl9XQUlUX0xJTkVfRkxBR19USU1FT1VUX01TKTsKPj4gICAJaWYgKHJldCkg ewo+PiAgIAkJZGV2X2VycihkcC0+ZGV2LCAibGluZSBmbGFnIGludGVycnVwdCBkaWQgbm90IGFy cml2ZVxuIik7Cj4+ICAgCQlyZXR1cm47Cj4+ICAgCX0KPj4KPj4gICAJc3Bpbl9sb2NrX2lycXNh dmUoJmRwLT5wc3JfbG9jaywgZmxhZ3MpOwo+PiAtCWlmIChwc3Jfc3RhdGUgPT0gRURQX1ZTQ19Q U1JfU1RBVEVfQUNUSVZFKQo+PiArCWlmIChkcC0+cHNyX3N0YXRlID09IEVEUF9WU0NfUFNSX1NU QVRFX0FDVElWRSkKPj4gICAJCWFuYWxvZ2l4X2RwX2VuYWJsZV9wc3IoZHAtPmRldik7Cj4+ICAg CWVsc2UKPj4gICAJCWFuYWxvZ2l4X2RwX2Rpc2FibGVfcHNyKGRwLT5kZXYpOwo+PiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmgKPj4gaW5kZXggYTQ4ZmNjZS4u NDc5MDVmYSAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlw X2RybV9kcnYuaAo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJt X2Rydi5oCj4+IEBAIC02Miw4ICs2Miw3IEBAIGludCByb2NrY2hpcF9kcm1fZG1hX2F0dGFjaF9k ZXZpY2Uoc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYsCj4+ICAgCQkJCSAgIHN0cnVjdCBkZXZp Y2UgKmRldik7Cj4+ICAgdm9pZCByb2NrY2hpcF9kcm1fZG1hX2RldGFjaF9kZXZpY2Uoc3RydWN0 IGRybV9kZXZpY2UgKmRybV9kZXYsCj4+ICAgCQkJCSAgICBzdHJ1Y3QgZGV2aWNlICpkZXYpOwo+ PiAtaW50IHJvY2tjaGlwX2RybV93YWl0X2xpbmVfZmxhZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMs IHVuc2lnbmVkIGludCBsaW5lX251bSwKPj4gLQkJCQl1bnNpZ25lZCBpbnQgbXN0aW1lb3V0KTsK Pj4gK2ludCByb2NrY2hpcF9kcm1fd2FpdF92YWN0X2VuZChzdHJ1Y3QgZHJtX2NydGMgKmNydGMs IHVuc2lnbmVkIGludCBtc3RpbWVvdXQpOwo+Pgo+PiAgIGV4dGVybiBzdHJ1Y3QgcGxhdGZvcm1f ZHJpdmVyIGNkbl9kcF9kcml2ZXI7Cj4+ICAgZXh0ZXJuIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIg ZHdfaGRtaV9yb2NrY2hpcF9wbHRmbV9kcml2ZXI7Cj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL3JvY2tjaGlwX2RybV92b3AuYwo+PiBpbmRleCAzZjdhODJkLi40MGE1ZTZlIDEwMDY0NAo+ PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCj4+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKPj4gQEAgLTQ2 OCw3ICs0NjgsNyBAQCBzdGF0aWMgYm9vbCB2b3BfbGluZV9mbGFnX2lycV9pc19lbmFibGVkKHN0 cnVjdCB2b3AgKnZvcCkKPj4gICAJcmV0dXJuICEhbGluZV9mbGFnX2lycTsKPj4gICB9Cj4+Cj4+ IC1zdGF0aWMgdm9pZCB2b3BfbGluZV9mbGFnX2lycV9lbmFibGUoc3RydWN0IHZvcCAqdm9wLCBp bnQgbGluZV9udW0pCj4+ICtzdGF0aWMgdm9pZCB2b3BfbGluZV9mbGFnX2lycV9lbmFibGUoc3Ry dWN0IHZvcCAqdm9wKQo+PiAgIHsKPj4gICAJdW5zaWduZWQgbG9uZyBmbGFnczsKPj4KPj4gQEAg LTQ3Nyw3ICs0NzcsNiBAQCBzdGF0aWMgdm9pZCB2b3BfbGluZV9mbGFnX2lycV9lbmFibGUoc3Ry dWN0IHZvcCAqdm9wLCBpbnQgbGluZV9udW0pCj4+Cj4+ICAgCXNwaW5fbG9ja19pcnFzYXZlKCZ2 b3AtPmlycV9sb2NrLCBmbGFncyk7Cj4+Cj4+IC0JVk9QX0NUUkxfU0VUKHZvcCwgbGluZV9mbGFn X251bVswXSwgbGluZV9udW0pOwo+PiAgIAlWT1BfSU5UUl9TRVRfVFlQRSh2b3AsIGNsZWFyLCBM SU5FX0ZMQUdfSU5UUiwgMSk7Cj4+ICAgCVZPUF9JTlRSX1NFVF9UWVBFKHZvcCwgZW5hYmxlLCBM SU5FX0ZMQUdfSU5UUiwgMSk7Cj4+Cj4+IEBAIC05ODEsNiArOTgwLDggQEAgc3RhdGljIHZvaWQg dm9wX2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPj4gICAJVk9QX0NUUkxfU0VU KHZvcCwgdmFjdF9zdF9lbmQsIHZhbCk7Cj4+ICAgCVZPUF9DVFJMX1NFVCh2b3AsIHZwb3N0X3N0 X2VuZCwgdmFsKTsKPj4KPj4gKwlWT1BfQ1RSTF9TRVQodm9wLCBsaW5lX2ZsYWdfbnVtWzBdLCB2 YWN0X2VuZCk7Cj4+ICsKPj4gICAJY2xrX3NldF9yYXRlKHZvcC0+ZGNsaywgYWRqdXN0ZWRfbW9k ZS0+Y2xvY2sgKiAxMDAwKTsKPj4KPj4gICAJVk9QX0NUUkxfU0VUKHZvcCwgc3RhbmRieSwgMCk7 Cj4+IEBAIC0xNTA3LDE5ICsxNTA4LDE2IEBAIHN0YXRpYyB2b2lkIHZvcF93aW5faW5pdChzdHJ1 Y3Qgdm9wICp2b3ApCj4+ICAgfQo+Pgo+PiAgIC8qKgo+PiAtICogcm9ja2NoaXBfZHJtX3dhaXRf bGluZV9mbGFnIC0gYWNxaXVyZSB0aGUgZ2l2ZSBsaW5lIGZsYWcgZXZlbnQKPj4gKyAqIHJvY2tj aGlwX2RybV93YWl0X3ZhY3RfZW5kCj4+ICAgICogQGNydGM6IENSVEMgdG8gZW5hYmxlIGxpbmUg ZmxhZwo+PiAtICogQGxpbmVfbnVtOiBpbnRlcmVzdGVkIGxpbmUgbnVtYmVyCj4+ICAgICogQG1z dGltZW91dDogbWlsbGlzZWNvbmQgZm9yIHRpbWVvdXQKPj4gICAgKgo+PiAtICogRHJpdmVyIHdv dWxkIGhvbGQgaGVyZSB1bnRpbCB0aGUgaW50ZXJlc3RlZCBsaW5lIGZsYWcgaW50ZXJydXB0IGhh dmUKPj4gLSAqIGhhcHBlbmVkIG9yIHRpbWVvdXQgdG8gd2FpdC4KPj4gKyAqIFdhaXQgZm9yIHZh Y3RfZW5kIGxpbmUgZmxhZyBpcnEgb3IgdGltZW91dC4KPj4gICAgKgo+PiAgICAqIFJldHVybnM6 Cj4+ICAgICogWmVybyBvbiBzdWNjZXNzLCBuZWdhdGl2ZSBlcnJubyBvbiBmYWlsdXJlLgo+PiAg ICAqLwo+PiAtaW50IHJvY2tjaGlwX2RybV93YWl0X2xpbmVfZmxhZyhzdHJ1Y3QgZHJtX2NydGMg KmNydGMsIHVuc2lnbmVkIGludCBsaW5lX251bSwKPj4gLQkJCQl1bnNpZ25lZCBpbnQgbXN0aW1l b3V0KQo+PiAraW50IHJvY2tjaGlwX2RybV93YWl0X3ZhY3RfZW5kKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywgdW5zaWduZWQgaW50IG1zdGltZW91dCkKPj4gICB7Cj4+ICAgCXN0cnVjdCB2b3AgKnZv cCA9IHRvX3ZvcChjcnRjKTsKPj4gICAJdW5zaWduZWQgbG9uZyBqaWZmaWVzX2xlZnQ7Cj4+IEBA IC0xNTI3LDE0ICsxNTI1LDE0IEBAIGludCByb2NrY2hpcF9kcm1fd2FpdF9saW5lX2ZsYWcoc3Ry dWN0IGRybV9jcnRjICpjcnRjLCB1bnNpZ25lZCBpbnQgbGluZV9udW0sCj4+ICAgCWlmICghY3J0 YyB8fCAhdm9wLT5pc19lbmFibGVkKQo+PiAgIAkJcmV0dXJuIC1FTk9ERVY7Cj4+Cj4+IC0JaWYg KGxpbmVfbnVtID4gY3J0Yy0+bW9kZS52dG90YWwgfHwgbXN0aW1lb3V0IDw9IDApCj4+ICsJaWYg KG1zdGltZW91dCA8PSAwKQo+PiAgIAkJcmV0dXJuIC1FSU5WQUw7Cj4+Cj4+ICAgCWlmICh2b3Bf bGluZV9mbGFnX2lycV9pc19lbmFibGVkKHZvcCkpCj4+ICAgCQlyZXR1cm4gLUVCVVNZOwo+Pgo+ PiAgIAlyZWluaXRfY29tcGxldGlvbigmdm9wLT5saW5lX2ZsYWdfY29tcGxldGlvbik7Cj4+IC0J dm9wX2xpbmVfZmxhZ19pcnFfZW5hYmxlKHZvcCwgbGluZV9udW0pOwo+PiArCXZvcF9saW5lX2Zs YWdfaXJxX2VuYWJsZSh2b3ApOwo+Pgo+PiAgIAlqaWZmaWVzX2xlZnQgPSB3YWl0X2Zvcl9jb21w bGV0aW9uX3RpbWVvdXQoJnZvcC0+bGluZV9mbGFnX2NvbXBsZXRpb24sCj4+ICAgCQkJCQkJICAg bXNlY3NfdG9famlmZmllcyhtc3RpbWVvdXQpKTsKPj4gQEAgLTE1NDcsNyArMTU0NSw3IEBAIGlu dCByb2NrY2hpcF9kcm1fd2FpdF9saW5lX2ZsYWcoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1bnNp Z25lZCBpbnQgbGluZV9udW0sCj4+Cj4+ICAgCXJldHVybiAwOwo+PiAgIH0KPj4gLUVYUE9SVF9T WU1CT0wocm9ja2NoaXBfZHJtX3dhaXRfbGluZV9mbGFnKTsKPj4gK0VYUE9SVF9TWU1CT0wocm9j a2NoaXBfZHJtX3dhaXRfdmFjdF9lbmQpOwo+Pgo+PiAgIHN0YXRpYyBpbnQgdm9wX2JpbmQoc3Ry dWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQgKmRhdGEpCj4+ICAg ewo+PiAtLQo+PiAyLjEuNAo+Pgo+CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeffy.chen@rock-chips.com (jeffy) Date: Sat, 29 Apr 2017 21:11:49 +0800 Subject: [PATCH v2] drm/rockchip: Set line flag config register in vop_crtc_enable In-Reply-To: <20170428150317.tpnj6obddfz5dzng@art_vandelay> References: <1493365067-29541-1-git-send-email-jeffy.chen@rock-chips.com> <20170428150317.tpnj6obddfz5dzng@art_vandelay> Message-ID: <59049115.2090804@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Sean, On 04/28/2017 11:03 PM, Sean Paul wrote: > On Fri, Apr 28, 2017 at 03:37:47PM +0800, Jeffy Chen wrote: >> We need to set vop config done after update line flag config, it's a >> new requirement for chips newer than rk3368. >> >> Since we would only use line flag irq for vact_end, let's move it to >> vop_crtc_enable. >> >> v2: Remove unused check and variables. > > Hi Jeffy, > v1 was already applied. Please send a follow-on patch to clean this up. Ok, will do. > > Sean > >> >> Signed-off-by: Jeffy Chen >> >> --- >> >> Changes in v2: >> Remove unused check and variables. >> >> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 14 +++----------- >> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +-- >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 20 +++++++++----------- >> 3 files changed, 13 insertions(+), 24 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> index d8fa7a9..1bccd82 100644 >> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> @@ -104,26 +104,18 @@ static void analogix_dp_psr_work(struct work_struct *work) >> { >> struct rockchip_dp_device *dp = >> container_of(work, typeof(*dp), psr_work); >> - struct drm_crtc *crtc = dp->encoder.crtc; >> - int psr_state = dp->psr_state; >> - int vact_end; >> int ret; >> unsigned long flags; >> >> - if (!crtc) >> - return; >> - >> - vact_end = crtc->mode.vtotal - crtc->mode.vsync_start + crtc->mode.vdisplay; >> - >> - ret = rockchip_drm_wait_line_flag(dp->encoder.crtc, vact_end, >> - PSR_WAIT_LINE_FLAG_TIMEOUT_MS); >> + ret = rockchip_drm_wait_vact_end(dp->encoder.crtc, >> + PSR_WAIT_LINE_FLAG_TIMEOUT_MS); >> if (ret) { >> dev_err(dp->dev, "line flag interrupt did not arrive\n"); >> return; >> } >> >> spin_lock_irqsave(&dp->psr_lock, flags); >> - if (psr_state == EDP_VSC_PSR_STATE_ACTIVE) >> + if (dp->psr_state == EDP_VSC_PSR_STATE_ACTIVE) >> analogix_dp_enable_psr(dp->dev); >> else >> analogix_dp_disable_psr(dp->dev); >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h >> index a48fcce..47905fa 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h >> @@ -62,8 +62,7 @@ int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, >> struct device *dev); >> void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, >> struct device *dev); >> -int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> - unsigned int mstimeout); >> +int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout); >> >> extern struct platform_driver cdn_dp_driver; >> extern struct platform_driver dw_hdmi_rockchip_pltfm_driver; >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> index 3f7a82d..40a5e6e 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> @@ -468,7 +468,7 @@ static bool vop_line_flag_irq_is_enabled(struct vop *vop) >> return !!line_flag_irq; >> } >> >> -static void vop_line_flag_irq_enable(struct vop *vop, int line_num) >> +static void vop_line_flag_irq_enable(struct vop *vop) >> { >> unsigned long flags; >> >> @@ -477,7 +477,6 @@ static void vop_line_flag_irq_enable(struct vop *vop, int line_num) >> >> spin_lock_irqsave(&vop->irq_lock, flags); >> >> - VOP_CTRL_SET(vop, line_flag_num[0], line_num); >> VOP_INTR_SET_TYPE(vop, clear, LINE_FLAG_INTR, 1); >> VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 1); >> >> @@ -981,6 +980,8 @@ static void vop_crtc_enable(struct drm_crtc *crtc) >> VOP_CTRL_SET(vop, vact_st_end, val); >> VOP_CTRL_SET(vop, vpost_st_end, val); >> >> + VOP_CTRL_SET(vop, line_flag_num[0], vact_end); >> + >> clk_set_rate(vop->dclk, adjusted_mode->clock * 1000); >> >> VOP_CTRL_SET(vop, standby, 0); >> @@ -1507,19 +1508,16 @@ static void vop_win_init(struct vop *vop) >> } >> >> /** >> - * rockchip_drm_wait_line_flag - acqiure the give line flag event >> + * rockchip_drm_wait_vact_end >> * @crtc: CRTC to enable line flag >> - * @line_num: interested line number >> * @mstimeout: millisecond for timeout >> * >> - * Driver would hold here until the interested line flag interrupt have >> - * happened or timeout to wait. >> + * Wait for vact_end line flag irq or timeout. >> * >> * Returns: >> * Zero on success, negative errno on failure. >> */ >> -int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> - unsigned int mstimeout) >> +int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout) >> { >> struct vop *vop = to_vop(crtc); >> unsigned long jiffies_left; >> @@ -1527,14 +1525,14 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> if (!crtc || !vop->is_enabled) >> return -ENODEV; >> >> - if (line_num > crtc->mode.vtotal || mstimeout <= 0) >> + if (mstimeout <= 0) >> return -EINVAL; >> >> if (vop_line_flag_irq_is_enabled(vop)) >> return -EBUSY; >> >> reinit_completion(&vop->line_flag_completion); >> - vop_line_flag_irq_enable(vop, line_num); >> + vop_line_flag_irq_enable(vop); >> >> jiffies_left = wait_for_completion_timeout(&vop->line_flag_completion, >> msecs_to_jiffies(mstimeout)); >> @@ -1547,7 +1545,7 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> >> return 0; >> } >> -EXPORT_SYMBOL(rockchip_drm_wait_line_flag); >> +EXPORT_SYMBOL(rockchip_drm_wait_vact_end); >> >> static int vop_bind(struct device *dev, struct device *master, void *data) >> { >> -- >> 2.1.4 >> > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1166833AbdD2NMH (ORCPT ); Sat, 29 Apr 2017 09:12:07 -0400 Received: from regular1.263xmail.com ([211.150.99.141]:35280 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1166811AbdD2NMC (ORCPT ); Sat, 29 Apr 2017 09:12:02 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: seanpaul@chromium.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <59049115.2090804@rock-chips.com> Date: Sat, 29 Apr 2017 21:11:49 +0800 From: jeffy User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:19.0) Gecko/20130126 Thunderbird/19.0 MIME-Version: 1.0 To: Sean Paul CC: linux-kernel@vger.kernel.org, dbasehore@chromium.org, dianders@chromium.org, tfiga@chromium.org, hoegsberg@chromium.org, mark.yao@rock-chips.com, Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, David Airlie , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2] drm/rockchip: Set line flag config register in vop_crtc_enable References: <1493365067-29541-1-git-send-email-jeffy.chen@rock-chips.com> <20170428150317.tpnj6obddfz5dzng@art_vandelay> In-Reply-To: <20170428150317.tpnj6obddfz5dzng@art_vandelay> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sean, On 04/28/2017 11:03 PM, Sean Paul wrote: > On Fri, Apr 28, 2017 at 03:37:47PM +0800, Jeffy Chen wrote: >> We need to set vop config done after update line flag config, it's a >> new requirement for chips newer than rk3368. >> >> Since we would only use line flag irq for vact_end, let's move it to >> vop_crtc_enable. >> >> v2: Remove unused check and variables. > > Hi Jeffy, > v1 was already applied. Please send a follow-on patch to clean this up. Ok, will do. > > Sean > >> >> Signed-off-by: Jeffy Chen >> >> --- >> >> Changes in v2: >> Remove unused check and variables. >> >> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 14 +++----------- >> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +-- >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 20 +++++++++----------- >> 3 files changed, 13 insertions(+), 24 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> index d8fa7a9..1bccd82 100644 >> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> @@ -104,26 +104,18 @@ static void analogix_dp_psr_work(struct work_struct *work) >> { >> struct rockchip_dp_device *dp = >> container_of(work, typeof(*dp), psr_work); >> - struct drm_crtc *crtc = dp->encoder.crtc; >> - int psr_state = dp->psr_state; >> - int vact_end; >> int ret; >> unsigned long flags; >> >> - if (!crtc) >> - return; >> - >> - vact_end = crtc->mode.vtotal - crtc->mode.vsync_start + crtc->mode.vdisplay; >> - >> - ret = rockchip_drm_wait_line_flag(dp->encoder.crtc, vact_end, >> - PSR_WAIT_LINE_FLAG_TIMEOUT_MS); >> + ret = rockchip_drm_wait_vact_end(dp->encoder.crtc, >> + PSR_WAIT_LINE_FLAG_TIMEOUT_MS); >> if (ret) { >> dev_err(dp->dev, "line flag interrupt did not arrive\n"); >> return; >> } >> >> spin_lock_irqsave(&dp->psr_lock, flags); >> - if (psr_state == EDP_VSC_PSR_STATE_ACTIVE) >> + if (dp->psr_state == EDP_VSC_PSR_STATE_ACTIVE) >> analogix_dp_enable_psr(dp->dev); >> else >> analogix_dp_disable_psr(dp->dev); >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h >> index a48fcce..47905fa 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h >> @@ -62,8 +62,7 @@ int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, >> struct device *dev); >> void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, >> struct device *dev); >> -int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> - unsigned int mstimeout); >> +int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout); >> >> extern struct platform_driver cdn_dp_driver; >> extern struct platform_driver dw_hdmi_rockchip_pltfm_driver; >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> index 3f7a82d..40a5e6e 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> @@ -468,7 +468,7 @@ static bool vop_line_flag_irq_is_enabled(struct vop *vop) >> return !!line_flag_irq; >> } >> >> -static void vop_line_flag_irq_enable(struct vop *vop, int line_num) >> +static void vop_line_flag_irq_enable(struct vop *vop) >> { >> unsigned long flags; >> >> @@ -477,7 +477,6 @@ static void vop_line_flag_irq_enable(struct vop *vop, int line_num) >> >> spin_lock_irqsave(&vop->irq_lock, flags); >> >> - VOP_CTRL_SET(vop, line_flag_num[0], line_num); >> VOP_INTR_SET_TYPE(vop, clear, LINE_FLAG_INTR, 1); >> VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 1); >> >> @@ -981,6 +980,8 @@ static void vop_crtc_enable(struct drm_crtc *crtc) >> VOP_CTRL_SET(vop, vact_st_end, val); >> VOP_CTRL_SET(vop, vpost_st_end, val); >> >> + VOP_CTRL_SET(vop, line_flag_num[0], vact_end); >> + >> clk_set_rate(vop->dclk, adjusted_mode->clock * 1000); >> >> VOP_CTRL_SET(vop, standby, 0); >> @@ -1507,19 +1508,16 @@ static void vop_win_init(struct vop *vop) >> } >> >> /** >> - * rockchip_drm_wait_line_flag - acqiure the give line flag event >> + * rockchip_drm_wait_vact_end >> * @crtc: CRTC to enable line flag >> - * @line_num: interested line number >> * @mstimeout: millisecond for timeout >> * >> - * Driver would hold here until the interested line flag interrupt have >> - * happened or timeout to wait. >> + * Wait for vact_end line flag irq or timeout. >> * >> * Returns: >> * Zero on success, negative errno on failure. >> */ >> -int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> - unsigned int mstimeout) >> +int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout) >> { >> struct vop *vop = to_vop(crtc); >> unsigned long jiffies_left; >> @@ -1527,14 +1525,14 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> if (!crtc || !vop->is_enabled) >> return -ENODEV; >> >> - if (line_num > crtc->mode.vtotal || mstimeout <= 0) >> + if (mstimeout <= 0) >> return -EINVAL; >> >> if (vop_line_flag_irq_is_enabled(vop)) >> return -EBUSY; >> >> reinit_completion(&vop->line_flag_completion); >> - vop_line_flag_irq_enable(vop, line_num); >> + vop_line_flag_irq_enable(vop); >> >> jiffies_left = wait_for_completion_timeout(&vop->line_flag_completion, >> msecs_to_jiffies(mstimeout)); >> @@ -1547,7 +1545,7 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, >> >> return 0; >> } >> -EXPORT_SYMBOL(rockchip_drm_wait_line_flag); >> +EXPORT_SYMBOL(rockchip_drm_wait_vact_end); >> >> static int vop_bind(struct device *dev, struct device *master, void *data) >> { >> -- >> 2.1.4 >> >