From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yakir Yang Subject: Re: [PATCH v4 4/4] drm/rockchip: analogix_dp: implement PSR function Date: Fri, 15 Jul 2016 13:45:59 +0800 Message-ID: <57887897.2090303@rock-chips.com> References: <1468469704-12440-1-git-send-email-ykk@rock-chips.com> <1468469758-12722-1-git-send-email-ykk@rock-chips.com> <20160714152640.GD13857@seanpaul0.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160714152640.GD13857@seanpaul0.roam.corp.google.com> 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: Thierry Reding , Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Javier Martinez Canillas , Mark Yao , Jingoo Han , emil.l.velikov@gmail.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, dianders@chromium.org, linux-rockchip@lists.infradead.org, daniel.vetter@ffwll.ch, =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Tomasz Figa , Dan Carpenter List-Id: linux-rockchip.vger.kernel.org U2VhbiwKCk9uIDA3LzE0LzIwMTYgMTE6MjYgUE0sIFNlYW4gUGF1bCB3cm90ZToKPiBPbiBUaHUs IEp1bCAxNCwgMjAxNiBhdCAxMjoxNTo1OFBNICswODAwLCBZYWtpciBZYW5nIHdyb3RlOgo+PiBB bHdheSBlbmFibGUgdGhlIFBTUiBmdW5jdGlvbiBmb3IgUm9ja2NoaXAgYW5hbG9naXhfZHAgZHJp dmVyLiBJZiBwYW5lbAo+PiBkb24ndCBzdXBwb3J0IFBTUiwgdGhlbiB0aGUgY29yZSBhbmFsb2dp eF9kcCB3b3VsZCBpZ25vcmUgdGhpcyBzZXR0aW5nLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBZYWtp ciBZYW5nIDx5a2tAcm9jay1jaGlwcy5jb20+Cj4gUmV2aWV3ZWQtYnk6IFNlYW4gUGF1bCA8c2Vh bnBhdWxAY2hyb21pdW0ub3JnPgoKVGhhbmtzIDotRAoKLSBZYWtpcgoKPj4gLS0tCj4+IENoYW5n ZXMgaW4gdjQ6Cj4+IC0gUmV0dXJuICd2b2lkJyBpbnN0ZWFkIG9mICdpbnQnIGluIGFuYWxvZ2l4 X2RwX3Bzcl9zZXQoKS4gKFNlYW4pCj4+IC0gUHVsbCB0aGUgMTBtcyBkZWxheSB0aW1lIG91dCBp bnRvIGEgI2RlZmluZS4gKFNlYW4pCj4+IC0gSW1wcm92ZWQgdGhlIGNvZGUgb2YgYW5hbG9naXhf ZHBfcHNyX3dvcmsoKS4gKFNlYW4pCj4+IC0gSW5kZW50ZWQgd2l0aCBzcGFjZXMgZm9yIG5ldyBu dW1iZXJzIGluIHJvY2tjaGlwX2RwX2RldmljZSBzdHJ1Y3QuIChTdMOpcGhhbmUsIHJldmlld2Vk IGF0IEdvb2dsZSBnZXJyaXQpCj4+ICAgICAgW2h0dHBzOi8vY2hyb21pdW0tcmV2aWV3Lmdvb2ds ZXNvdXJjZS5jb20vIy9jLzM0OTA4NS8zMy9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvYW5hbG9n aXhfZHAtcm9ja2NoaXAuY0A4M10KPj4KPj4gQ2hhbmdlcyBpbiB2MzoKPj4gLSBzcGxpdCB0aGUg Y29tbW9uIHBzciBsb2dpYyBpbnRvIGEgc2VwZXJhdGUgZHJpdmVyLCBtYWtlIHRoaXMgdG8gYQo+ PiAgICBzaW1wbGUgc3ViLXBzciBkZXZpY2UgZHJpdmVyLgo+Pgo+PiBDaGFuZ2VzIGluIHYyOgo+ PiAtIHJlbW92ZSB2Ymxhbmsgbm90aWZ5IG91dCAoRGFuaWVsKQo+PiAtIGNyZWF0ZSBhIHBzcl9h Y3RpdmUoKSBjYWxsYmFjayBpbiB2b3AgZGF0YSBzdHJ1Y3QuCj4+Cj4+ICAgZHJpdmVycy9ncHUv ZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMgfCA1NyArKysrKysrKysrKysrKysr KysrKysrKysrCj4+ICAgMSBmaWxlIGNoYW5nZWQsIDU3IGluc2VydGlvbnMoKykKPj4KPj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5j IGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMKPj4gaW5k ZXggZTgxZTE5YS4uYWE5MTZmNCAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMKPj4gQEAgLTMyLDYgKzMyLDcgQEAKPj4gICAjaW5j bHVkZSA8ZHJtL2JyaWRnZS9hbmFsb2dpeF9kcC5oPgo+PiAgIAo+PiAgICNpbmNsdWRlICJyb2Nr Y2hpcF9kcm1fZHJ2LmgiCj4+ICsjaW5jbHVkZSAicm9ja2NoaXBfZHJtX3Bzci5oIgo+PiAgICNp bmNsdWRlICJyb2NrY2hpcF9kcm1fdm9wLmgiCj4+ICAgCj4+ICAgI2RlZmluZSBSSzMyODhfR1JG X1NPQ19DT042CQkweDI1Ywo+PiBAQCAtNDEsNiArNDIsOSBAQAo+PiAgIAo+PiAgICNkZWZpbmUg SElXT1JEX1VQREFURSh2YWwsIG1hc2spCSh2YWwgfCAobWFzaykgPDwgMTYpCj4+ICAgCj4+ICsj ZGVmaW5lIFBTUl9TRVRfREVMQVlfVElNRQkJbXNlY3NfdG9famlmZmllcygxMCkKPj4gKyNkZWZp bmUgUFNSX1dBSVRfTElORV9GTEFHX1RJTUVPVVRfTVMJMTAwCj4+ICsKPj4gICAjZGVmaW5lIHRv X2RwKG5tKQljb250YWluZXJfb2Yobm0sIHN0cnVjdCByb2NrY2hpcF9kcF9kZXZpY2UsIG5tKQo+ PiAgIAo+PiAgIC8qKgo+PiBAQCAtNjgsMTEgKzcyLDU1IEBAIHN0cnVjdCByb2NrY2hpcF9kcF9k ZXZpY2Ugewo+PiAgIAlzdHJ1Y3QgcmVnbWFwICAgICAgICAgICAgKmdyZjsKPj4gICAJc3RydWN0 IHJlc2V0X2NvbnRyb2wgICAgICpyc3Q7Cj4+ICAgCj4+ICsJc3RydWN0IGRlbGF5ZWRfd29yayAg ICAgIHBzcl93b3JrOwo+PiArCXVuc2lnbmVkIGludCAgICAgICAgICAgICBwc3Jfc3RhdGU7Cj4+ ICsKPj4gICAJY29uc3Qgc3RydWN0IHJvY2tjaGlwX2RwX2NoaXBfZGF0YSAqZGF0YTsKPj4gICAK Pj4gICAJc3RydWN0IGFuYWxvZ2l4X2RwX3BsYXRfZGF0YSBwbGF0X2RhdGE7Cj4+ICAgfTsKPj4g ICAKPj4gK3N0YXRpYyB2b2lkIGFuYWxvZ2l4X2RwX3Bzcl9zZXQoc3RydWN0IGRybV9lbmNvZGVy ICplbmNvZGVyLCBib29sIGVuYWJsZWQpCj4+ICt7Cj4+ICsJc3RydWN0IHJvY2tjaGlwX2RwX2Rl dmljZSAqZHAgPSB0b19kcChlbmNvZGVyKTsKPj4gKwo+PiArCWRldl9kYmcoZHAtPmRldiwgIiVz IFBTUi4uLlxuIiwgZW5hYmxlZCA/ICJFbnRyeSIgOiAiRXhpdCIpOwo+PiArCj4+ICsJaWYgKGVu YWJsZWQpCj4+ICsJCWRwLT5wc3Jfc3RhdGUgPSBFRFBfVlNDX1BTUl9TVEFURV9BQ1RJVkU7Cj4+ ICsJZWxzZQo+PiArCQlkcC0+cHNyX3N0YXRlID0gfkVEUF9WU0NfUFNSX1NUQVRFX0FDVElWRTsK Pj4gKwo+PiArCXNjaGVkdWxlX2RlbGF5ZWRfd29yaygmZHAtPnBzcl93b3JrLCBQU1JfU0VUX0RF TEFZX1RJTUUpOwo+PiArfQo+PiArCj4+ICtzdGF0aWMgdm9pZCBhbmFsb2dpeF9kcF9wc3Jfd29y ayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4+ICt7Cj4+ICsJc3RydWN0IHJvY2tjaGlwX2Rw X2RldmljZSAqZHAgPQo+PiArCQkJCWNvbnRhaW5lcl9vZih3b3JrLCB0eXBlb2YoKmRwKSwgcHNy X3dvcmsud29yayk7Cj4+ICsJc3RydWN0IGRybV9jcnRjICpjcnRjID0gZHAtPmVuY29kZXIuY3J0 YzsKPj4gKwlpbnQgcHNyX3N0YXRlID0gZHAtPnBzcl9zdGF0ZTsKPj4gKwlpbnQgdmFjdF9lbmQ7 Cj4+ICsJaW50IHJldDsKPj4gKwo+PiArCWlmICghY3J0YykKPj4gKwkJcmV0dXJuOwo+PiArCj4+ ICsJdmFjdF9lbmQgPSBjcnRjLT5tb2RlLnZ0b3RhbCAtIGNydGMtPm1vZGUudnN5bmNfc3RhcnQg KyBjcnRjLT5tb2RlLnZkaXNwbGF5Owo+PiArCj4+ICsJcmV0ID0gcm9ja2NoaXBfZHJtX3dhaXRf bGluZV9mbGFnKGRwLT5lbmNvZGVyLmNydGMsIHZhY3RfZW5kLAo+PiArCQkJCQkgIFBTUl9XQUlU X0xJTkVfRkxBR19USU1FT1VUX01TKTsKPj4gKwlpZiAocmV0KSB7Cj4+ICsJCWRldl9lcnIoZHAt PmRldiwgImxpbmUgZmxhZyBpbnRlcnJ1cHQgZGlkIG5vdCBhcnJpdmVcbiIpOwo+PiArCQlyZXR1 cm47Cj4+ICsJfQo+PiArCj4+ICsJaWYgKHBzcl9zdGF0ZSA9PSBFRFBfVlNDX1BTUl9TVEFURV9B Q1RJVkUpCj4+ICsJCWFuYWxvZ2l4X2RwX2VuYWJsZV9wc3IoZHAtPmRldik7Cj4+ICsJZWxzZQo+ PiArCQlhbmFsb2dpeF9kcF9kaXNhYmxlX3BzcihkcC0+ZGV2KTsKPj4gK30KPj4gKwo+PiAgIHN0 YXRpYyBpbnQgcm9ja2NoaXBfZHBfcHJlX2luaXQoc3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSAq ZHApCj4+ICAgewo+PiAgIAlyZXNldF9jb250cm9sX2Fzc2VydChkcC0+cnN0KTsKPj4gQEAgLTM0 MCwxMiArMzg4LDIxIEBAIHN0YXRpYyBpbnQgcm9ja2NoaXBfZHBfYmluZChzdHJ1Y3QgZGV2aWNl ICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKPj4gICAJZHAtPnBsYXRfZGF0YS5wb3dlcl9v ZmYgPSByb2NrY2hpcF9kcF9wb3dlcmRvd247Cj4+ICAgCWRwLT5wbGF0X2RhdGEuZ2V0X21vZGVz ID0gcm9ja2NoaXBfZHBfZ2V0X21vZGVzOwo+PiAgIAo+PiArCWRwLT5wc3Jfc3RhdGUgPSB+RURQ X1ZTQ19QU1JfU1RBVEVfQUNUSVZFOwo+PiArCUlOSVRfREVMQVlFRF9XT1JLKCZkcC0+cHNyX3dv cmssIGFuYWxvZ2l4X2RwX3Bzcl93b3JrKTsKPj4gKwo+PiArCXJvY2tjaGlwX2RybV9wc3JfcmVn aXN0ZXIoJmRwLT5lbmNvZGVyLCBhbmFsb2dpeF9kcF9wc3Jfc2V0KTsKPj4gKwo+PiAgIAlyZXR1 cm4gYW5hbG9naXhfZHBfYmluZChkZXYsIGRwLT5kcm1fZGV2LCAmZHAtPnBsYXRfZGF0YSk7Cj4+ ICAgfQo+PiAgIAo+PiAgIHN0YXRpYyB2b2lkIHJvY2tjaGlwX2RwX3VuYmluZChzdHJ1Y3QgZGV2 aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKPj4gICAJCQkgICAgICAgdm9pZCAqZGF0 YSkKPj4gICB7Cj4+ICsJc3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSAqZHAgPSBkZXZfZ2V0X2Ry dmRhdGEoZGV2KTsKPj4gKwo+PiArCXJvY2tjaGlwX2RybV9wc3JfdW5yZWdpc3RlcigmZHAtPmVu Y29kZXIpOwo+PiArCj4+ICAgCXJldHVybiBhbmFsb2dpeF9kcF91bmJpbmQoZGV2LCBtYXN0ZXIs IGRhdGEpOwo+PiAgIH0KPj4gICAKPj4gLS0gCj4+IDEuOS4xCj4+Cj4+Cj4+IF9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4+IGRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKPj4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+PiBodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo+Cj4KCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624AbcGOFqZ (ORCPT ); Fri, 15 Jul 2016 01:46:25 -0400 Received: from lucky1.263xmail.com ([211.157.147.130]:45230 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677AbcGOFqW (ORCPT ); Fri, 15 Jul 2016 01:46:22 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: dan.carpenter@oracle.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: <01314c41284aec23dafd8f06cdd70549> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v4 4/4] drm/rockchip: analogix_dp: implement PSR function To: Sean Paul References: <1468469704-12440-1-git-send-email-ykk@rock-chips.com> <1468469758-12722-1-git-send-email-ykk@rock-chips.com> <20160714152640.GD13857@seanpaul0.roam.corp.google.com> Cc: Mark Yao , Inki Dae , Jingoo Han , Heiko Stuebner , Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, daniel.vetter@ffwll.ch, emil.l.velikov@gmail.com, dianders@chromium.org, dri-devel@lists.freedesktop.org, Tomasz Figa , Javier Martinez Canillas , =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Thierry Reding , Dan Carpenter From: Yakir Yang Message-ID: <57887897.2090303@rock-chips.com> Date: Fri, 15 Jul 2016 13:45:59 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <20160714152640.GD13857@seanpaul0.roam.corp.google.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean, On 07/14/2016 11:26 PM, Sean Paul wrote: > On Thu, Jul 14, 2016 at 12:15:58PM +0800, Yakir Yang wrote: >> Alway enable the PSR function for Rockchip analogix_dp driver. If panel >> don't support PSR, then the core analogix_dp would ignore this setting. >> >> Signed-off-by: Yakir Yang > Reviewed-by: Sean Paul Thanks :-D - Yakir >> --- >> Changes in v4: >> - Return 'void' instead of 'int' in analogix_dp_psr_set(). (Sean) >> - Pull the 10ms delay time out into a #define. (Sean) >> - Improved the code of analogix_dp_psr_work(). (Sean) >> - Indented with spaces for new numbers in rockchip_dp_device struct. (Stéphane, reviewed at Google gerrit) >> [https://chromium-review.googlesource.com/#/c/349085/33/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c@83] >> >> Changes in v3: >> - split the common psr logic into a seperate driver, make this to a >> simple sub-psr device driver. >> >> Changes in v2: >> - remove vblank notify out (Daniel) >> - create a psr_active() callback in vop data struct. >> >> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 57 +++++++++++++++++++++++++ >> 1 file changed, 57 insertions(+) >> >> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> index e81e19a..aa916f4 100644 >> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> @@ -32,6 +32,7 @@ >> #include >> >> #include "rockchip_drm_drv.h" >> +#include "rockchip_drm_psr.h" >> #include "rockchip_drm_vop.h" >> >> #define RK3288_GRF_SOC_CON6 0x25c >> @@ -41,6 +42,9 @@ >> >> #define HIWORD_UPDATE(val, mask) (val | (mask) << 16) >> >> +#define PSR_SET_DELAY_TIME msecs_to_jiffies(10) >> +#define PSR_WAIT_LINE_FLAG_TIMEOUT_MS 100 >> + >> #define to_dp(nm) container_of(nm, struct rockchip_dp_device, nm) >> >> /** >> @@ -68,11 +72,55 @@ struct rockchip_dp_device { >> struct regmap *grf; >> struct reset_control *rst; >> >> + struct delayed_work psr_work; >> + unsigned int psr_state; >> + >> const struct rockchip_dp_chip_data *data; >> >> struct analogix_dp_plat_data plat_data; >> }; >> >> +static void analogix_dp_psr_set(struct drm_encoder *encoder, bool enabled) >> +{ >> + struct rockchip_dp_device *dp = to_dp(encoder); >> + >> + dev_dbg(dp->dev, "%s PSR...\n", enabled ? "Entry" : "Exit"); >> + >> + if (enabled) >> + dp->psr_state = EDP_VSC_PSR_STATE_ACTIVE; >> + else >> + dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE; >> + >> + schedule_delayed_work(&dp->psr_work, PSR_SET_DELAY_TIME); >> +} >> + >> +static void analogix_dp_psr_work(struct work_struct *work) >> +{ >> + struct rockchip_dp_device *dp = >> + container_of(work, typeof(*dp), psr_work.work); >> + struct drm_crtc *crtc = dp->encoder.crtc; >> + int psr_state = dp->psr_state; >> + int vact_end; >> + int ret; >> + >> + 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); >> + if (ret) { >> + dev_err(dp->dev, "line flag interrupt did not arrive\n"); >> + return; >> + } >> + >> + if (psr_state == EDP_VSC_PSR_STATE_ACTIVE) >> + analogix_dp_enable_psr(dp->dev); >> + else >> + analogix_dp_disable_psr(dp->dev); >> +} >> + >> static int rockchip_dp_pre_init(struct rockchip_dp_device *dp) >> { >> reset_control_assert(dp->rst); >> @@ -340,12 +388,21 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, >> dp->plat_data.power_off = rockchip_dp_powerdown; >> dp->plat_data.get_modes = rockchip_dp_get_modes; >> >> + dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE; >> + INIT_DELAYED_WORK(&dp->psr_work, analogix_dp_psr_work); >> + >> + rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set); >> + >> return analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data); >> } >> >> static void rockchip_dp_unbind(struct device *dev, struct device *master, >> void *data) >> { >> + struct rockchip_dp_device *dp = dev_get_drvdata(dev); >> + >> + rockchip_drm_psr_unregister(&dp->encoder); >> + >> return analogix_dp_unbind(dev, master, data); >> } >> >> -- >> 1.9.1 >> >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >