From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: Question: Re: [PATCH] drm/bridge: analogix: protect power when get_modes or detect Date: Thu, 13 Oct 2016 09:56:50 +0800 Message-ID: <57FEE9E2.20505@rock-chips.com> References: <1476266442-29803-1-git-send-email-mark.yao@rock-chips.com> <57FE0EF5.7010207@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: 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: Linux Kernel Mailing List , dri-devel , linux-rockchip@lists.infradead.org, Gustavo Padovan , Linux ARM Kernel List-Id: linux-rockchip.vger.kernel.org T24gMjAxNuW5tDEw5pyIMTLml6UgMjI6NTEsIFNlYW4gUGF1bCB3cm90ZToKPiBPbiBXZWQsIE9j dCAxMiwgMjAxNiBhdCA2OjIyIEFNLCBNYXJrIHlhbyA8bWFyay55YW9Acm9jay1jaGlwcy5jb20+ IHdyb3RlOgo+PiBJJ20gbm90IGZhbWlsaWFyIHdpdGggdGhlIGFuYWxvZ2l4IGRyaXZlciwgbWF5 YmUgdXNlIGEgcG93ZXIgcmVmZXJlbmNlIGNvdW50Cj4+IHdvdWxkIGJldHRlciB0aGVuIGRpcmVj dCBwb3dlciBvbi9vZmYgYW5hbG9naXhfZHAuCj4+Cj4+IERvZXMgYW55b25lIGhhcyB0aGUgaWRl YSB0byBwcm90ZWN0IGRldGVjdCBhbmQgZ2V0X21vZGVzIGNvbnRleHQ/Cj4+Cj4gSSdtIG5vdCBz dXJlIGEgcmVmZXJlbmNlIGNvdW50IGlzIGdvaW5nIHRvIGhlbHAgaGVyZS4gVGhlIGNvbW1vbgo+ IHBhdHRlcm4gaXMgdG8gY2FsbCBkZXRlY3QoKSBmb2xsb3dlZCBieSBnZXRfbW9kZXMoKSBhbmQg dGhlbiBtb2Rlc2V0Lgo+IEhvd2V2ZXIsIGl0J3Mgbm90IGd1YXJhbnRlZWQgdGhhdCBhbnkgb25l IG9mIHRob3NlIGZ1bmN0aW9ucyB3aWxsIGJlCj4gY2FsbGVkIGFmdGVyIHRoZSBvdGhlci4gU28s IGlmIHlvdSBsZWF2ZSB0aGluZ3Mgb24gYWZ0ZXIgZGV0ZWN0IG9yCj4gZ2V0X21vZGVzLCB5b3Ug bWlnaHQgYmUgd2FzdGluZyBwb3dlciAob3Igd29yc2UpLgo+Cj4gSSByZWNlbnRseSByYW4gaW50 byB0aGlzIGV4YWN0IHByb2JsZW0gd2l0aCBhIHBhbmVsIHdlJ3JlIHVzaW5nLiBDaGVjawo+IG91 dCAiMGI4YjA1OWE3OiBkcm0vYnJpZGdlOiBhbmFsb2dpeF9kcDogRW5zdXJlIHRoZSBwYW5lbCBp cyBwcm9wZXJseQo+IHByZXBhcmVkL3VucHJlcGFyZWQiLiBQZXJoYXBzIHlvdSBjYW4gcGlnZ3li YWNrIG9uIHRoYXQgZnVuY3Rpb24gdG8KPiBhZGQgeW91ciBwbV9ydW50aW1lIGFuZCBwbGF0X2Rh dGEgY2FsbGJhY2tzIChzaW5jZSB1c2luZyBkcG1zX21vZGUKPiBtaWdodCBiZSByYWNleSkuCj4K PiBTZWFuCkhpIFNlYW4KClRoYW5rcyBmb3IgeW91ciBhZHZpY2UuCgpJIHJlLXRlc3QgdGhlIGRl dGVjdCBhbmQgZ2V0X21vZGVzLCBvbmx5IHVzZSBwbV9ydW50aW1lX2dldC9wdXQgYWxzbyBjYW4g CmZpeCBteSBwcm9ibGVtLgp3aXRob3V0IHBsYXRfZGF0YSBjYWxsYmFja3MgY2FuIGF2b2lkIHJh Y2UgdG8gZHBtc19tb2RlLgoKSSBoYWQgc2VuZCB2MiBwYXRjaCwgIHlvdSBjYW4gcmV2aWV3IGl0 LgoKVGhhbmtzLgoKPgo+PiBJIGZvdW5kIG1hbnkgb3RoZXIgY29ubmVjdG9yIGRyaXZlciBhbHNv IGRpcmVjdCBhY2Nlc3MgcmVnaXN0ZXIgb24gZGV0ZWN0IG9yCj4+IGdldF9tb2Rlcywgbm8gcHJv YmxlbSBmb3IgaXQ/Cj4+Cj4+IE9uIDIwMTblubQxMOaciDEy5pelIDE4OjAwLCBNYXJrIFlhbyB3 cm90ZToKPj4KPj4gVGhlIGRybSBjYWxsYmFjayAtPmRldGVjdCBhbmQgLT5nZXRfbW9kZXMgc2Vl bXMgaXMgbm90IHBvd2VyIHNhZmUsCj4+IHRoZXkgbWF5IGJlIGNhbGxlZCB3aGVuIGRldmljZSBp cyBwb3dlciBvZmYsIGRvIHJlZ2lzdGVyIGFjY2VzcyBvbgo+PiBkZXRlY3Qgb3IgZ2V0X21vZGVz IHdpbGwgY2F1c2Ugc3lzdGVtIGRpZS4KPj4KPj4gSGVyZSBpcyB0aGUgcGF0aCBjYWxsIC0+ZGV0 ZWN0IGJlZm9yZSBhbmFsb2dpeF9kcCBwb3dlciBvbgo+PiBbPGZmZmZmZjgwMDg0M2JhYmM+XSBh bmFsb2dpeF9kcF9kZXRlY3QrMHg0NC8weGRjCj4+IFs8ZmZmZmZmODAwODNmZDg0MD5dCj4+IGRy bV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2Rlc19tZXJnZV9iaXRzKzB4ZTgvMHg0 MWMKPj4gWzxmZmZmZmY4MDA4M2ZkYjg0Pl0gZHJtX2hlbHBlcl9wcm9iZV9zaW5nbGVfY29ubmVj dG9yX21vZGVzKzB4MTAvMHgxOAo+PiBbPGZmZmZmZjgwMDg0MThkMjQ+XSBkcm1fbW9kZV9nZXRj b25uZWN0b3IrMHhmNC8weDMwNAo+PiBbPGZmZmZmZjgwMDg0MGNmZjA+XSBkcm1faW9jdGwrMHgy M2MvMHgzOTAKPj4gWzxmZmZmZmY4MDA4MWE4YWRjPl0gZG9fdmZzX2lvY3RsKzB4NGI4LzB4NThj Cj4+IFs8ZmZmZmZmODAwODFhOGMxMD5dIFN5U19pb2N0bCsweDYwLzB4ODgKPj4KPj4gQ2M6IElu a2kgRGFlIDxpbmtpLmRhZUBzYW1zdW5nLmNvbT4KPj4gQ2M6IFNlYW4gUGF1bCA8c2VhbnBhdWxA Y2hyb21pdW0ub3JnPgo+PiBDYzogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29s bGFib3JhLmNvLnVrPgo+PiBDYzogIlZpbGxlIFN5cmrDpGzDpCIgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBNYXJrIFlhbyA8bWFyay55YW9Acm9j ay1jaGlwcy5jb20+Cj4+IC0tLQo+PiAgIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgv YW5hbG9naXhfZHBfY29yZS5jIHwgMjgKPj4gKysrKysrKysrKysrKysrKysrKysrKwo+PiAgIDEg ZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspCj4+Cj4+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYnJpZGdlL2FuYWxvZ2l4L2FuYWxvZ2l4X2RwX2NvcmUuYwo+PiBiL2RyaXZlcnMv Z3B1L2RybS9icmlkZ2UvYW5hbG9naXgvYW5hbG9naXhfZHBfY29yZS5jCj4+IGluZGV4IGVmYWM4 YWIuLjA5ZGVjZTIgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9n aXgvYW5hbG9naXhfZHBfY29yZS5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5h bG9naXgvYW5hbG9naXhfZHBfY29yZS5jCj4+IEBAIC0xMDYyLDYgKzEwNjIsMTMgQEAgaW50IGFu YWxvZ2l4X2RwX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcgo+PiAqY29ubmVjdG9yKQo+ PiAgICByZXR1cm4gMDsKPj4gICAgfQo+Pgo+PiArIGlmIChkcC0+ZHBtc19tb2RlICE9IERSTV9N T0RFX0RQTVNfT04pIHsKPj4gKyBwbV9ydW50aW1lX2dldF9zeW5jKGRwLT5kZXYpOwo+PiArCj4+ ICsgaWYgKGRwLT5wbGF0X2RhdGEtPnBvd2VyX29uKQo+PiArIGRwLT5wbGF0X2RhdGEtPnBvd2Vy X29uKGRwLT5wbGF0X2RhdGEpOwo+PiArIH0KPj4gKwo+PiAgICBpZiAoYW5hbG9naXhfZHBfaGFu ZGxlX2VkaWQoZHApID09IDApIHsKPj4gICAgZHJtX21vZGVfY29ubmVjdG9yX3VwZGF0ZV9lZGlk X3Byb3BlcnR5KCZkcC0+Y29ubmVjdG9yLCBlZGlkKTsKPj4gICAgbnVtX21vZGVzICs9IGRybV9h ZGRfZWRpZF9tb2RlcygmZHAtPmNvbm5lY3RvciwgZWRpZCk7Cj4+IEBAIC0xMDczLDYgKzEwODAs MTMgQEAgaW50IGFuYWxvZ2l4X2RwX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcgo+PiAq Y29ubmVjdG9yKQo+PiAgICBpZiAoZHAtPnBsYXRfZGF0YS0+Z2V0X21vZGVzKQo+PiAgICBudW1f bW9kZXMgKz0gZHAtPnBsYXRfZGF0YS0+Z2V0X21vZGVzKGRwLT5wbGF0X2RhdGEsIGNvbm5lY3Rv cik7Cj4+Cj4+ICsgaWYgKGRwLT5kcG1zX21vZGUgIT0gRFJNX01PREVfRFBNU19PTikgewo+PiAr IGlmIChkcC0+cGxhdF9kYXRhLT5wb3dlcl9vZmYpCj4+ICsgZHAtPnBsYXRfZGF0YS0+cG93ZXJf b2ZmKGRwLT5wbGF0X2RhdGEpOwo+PiArCj4+ICsgcG1fcnVudGltZV9wdXRfc3luYyhkcC0+ZGV2 KTsKPj4gKyB9Cj4+ICsKPj4gICAgcmV0ID0gYW5hbG9naXhfZHBfcHJlcGFyZV9wYW5lbChkcCwg ZmFsc2UsIGZhbHNlKTsKPj4gICAgaWYgKHJldCkKPj4gICAgRFJNX0VSUk9SKCJGYWlsZWQgdG8g dW5wcmVwYXJlIHBhbmVsICglZClcbiIsIHJldCk7Cj4+IEBAIC0xMTA2LDkgKzExMjAsMjMgQEAg YW5hbG9naXhfZHBfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCj4+IGJv b2wgZm9yY2UpCj4+ICAgIHJldHVybiBjb25uZWN0b3Jfc3RhdHVzX2Rpc2Nvbm5lY3RlZDsKPj4g ICAgfQo+Pgo+PiArIGlmIChkcC0+ZHBtc19tb2RlICE9IERSTV9NT0RFX0RQTVNfT04pIHsKPj4g KyBwbV9ydW50aW1lX2dldF9zeW5jKGRwLT5kZXYpOwo+PiArCj4+ICsgaWYgKGRwLT5wbGF0X2Rh dGEtPnBvd2VyX29uKQo+PiArIGRwLT5wbGF0X2RhdGEtPnBvd2VyX29uKGRwLT5wbGF0X2RhdGEp Owo+PiArIH0KPj4gKwo+PiAgICBpZiAoIWFuYWxvZ2l4X2RwX2RldGVjdF9ocGQoZHApKQo+PiAg ICBzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKPj4KPj4gKyBpZiAoZHAtPmRw bXNfbW9kZSAhPSBEUk1fTU9ERV9EUE1TX09OKSB7Cj4+ICsgaWYgKGRwLT5wbGF0X2RhdGEtPnBv d2VyX29mZikKPj4gKyBkcC0+cGxhdF9kYXRhLT5wb3dlcl9vZmYoZHAtPnBsYXRfZGF0YSk7Cj4+ ICsKPj4gKyBwbV9ydW50aW1lX3B1dF9zeW5jKGRwLT5kZXYpOwo+PiArIH0KPj4gKwo+PiAgICBy ZXQgPSBhbmFsb2dpeF9kcF9wcmVwYXJlX3BhbmVsKGRwLCBmYWxzZSwgZmFsc2UpOwo+PiAgICBp ZiAocmV0KQo+PiAgICBEUk1fRVJST1IoIkZhaWxlZCB0byB1bnByZXBhcmUgcGFuZWwgKCVkKVxu IiwgcmV0KTsKPj4KPj4KPj4KPj4gLS0KPj4g77ytYXJrIFlhbwo+Cj4KCgotLSAK77ytYXJrIFlh bwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Thu, 13 Oct 2016 09:56:50 +0800 Subject: Question: Re: [PATCH] drm/bridge: analogix: protect power when get_modes or detect In-Reply-To: References: <1476266442-29803-1-git-send-email-mark.yao@rock-chips.com> <57FE0EF5.7010207@rock-chips.com> Message-ID: <57FEE9E2.20505@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2016?10?12? 22:51, Sean Paul wrote: > On Wed, Oct 12, 2016 at 6:22 AM, Mark yao wrote: >> I'm not familiar with the analogix driver, maybe use a power reference count >> would better then direct power on/off analogix_dp. >> >> Does anyone has the idea to protect detect and get_modes context? >> > I'm not sure a reference count is going to help here. The common > pattern is to call detect() followed by get_modes() and then modeset. > However, it's not guaranteed that any one of those functions will be > called after the other. So, if you leave things on after detect or > get_modes, you might be wasting power (or worse). > > I recently ran into this exact problem with a panel we're using. Check > out "0b8b059a7: drm/bridge: analogix_dp: Ensure the panel is properly > prepared/unprepared". Perhaps you can piggyback on that function to > add your pm_runtime and plat_data callbacks (since using dpms_mode > might be racey). > > Sean Hi Sean Thanks for your advice. I re-test the detect and get_modes, only use pm_runtime_get/put also can fix my problem. without plat_data callbacks can avoid race to dpms_mode. I had send v2 patch, you can review it. Thanks. > >> I found many other connector driver also direct access register on detect or >> get_modes, no problem for it? >> >> On 2016?10?12? 18:00, Mark Yao wrote: >> >> The drm callback ->detect and ->get_modes seems is not power safe, >> they may be called when device is power off, do register access on >> detect or get_modes will cause system die. >> >> Here is the path call ->detect before analogix_dp power on >> [] analogix_dp_detect+0x44/0xdc >> [] >> drm_helper_probe_single_connector_modes_merge_bits+0xe8/0x41c >> [] drm_helper_probe_single_connector_modes+0x10/0x18 >> [] drm_mode_getconnector+0xf4/0x304 >> [] drm_ioctl+0x23c/0x390 >> [] do_vfs_ioctl+0x4b8/0x58c >> [] SyS_ioctl+0x60/0x88 >> >> Cc: Inki Dae >> Cc: Sean Paul >> Cc: Gustavo Padovan >> Cc: "Ville Syrj?l?" >> >> Signed-off-by: Mark Yao >> --- >> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 28 >> ++++++++++++++++++++++ >> 1 file changed, 28 insertions(+) >> >> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> index efac8ab..09dece2 100644 >> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> @@ -1062,6 +1062,13 @@ int analogix_dp_get_modes(struct drm_connector >> *connector) >> return 0; >> } >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + pm_runtime_get_sync(dp->dev); >> + >> + if (dp->plat_data->power_on) >> + dp->plat_data->power_on(dp->plat_data); >> + } >> + >> if (analogix_dp_handle_edid(dp) == 0) { >> drm_mode_connector_update_edid_property(&dp->connector, edid); >> num_modes += drm_add_edid_modes(&dp->connector, edid); >> @@ -1073,6 +1080,13 @@ int analogix_dp_get_modes(struct drm_connector >> *connector) >> if (dp->plat_data->get_modes) >> num_modes += dp->plat_data->get_modes(dp->plat_data, connector); >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + if (dp->plat_data->power_off) >> + dp->plat_data->power_off(dp->plat_data); >> + >> + pm_runtime_put_sync(dp->dev); >> + } >> + >> ret = analogix_dp_prepare_panel(dp, false, false); >> if (ret) >> DRM_ERROR("Failed to unprepare panel (%d)\n", ret); >> @@ -1106,9 +1120,23 @@ analogix_dp_detect(struct drm_connector *connector, >> bool force) >> return connector_status_disconnected; >> } >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + pm_runtime_get_sync(dp->dev); >> + >> + if (dp->plat_data->power_on) >> + dp->plat_data->power_on(dp->plat_data); >> + } >> + >> if (!analogix_dp_detect_hpd(dp)) >> status = connector_status_connected; >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + if (dp->plat_data->power_off) >> + dp->plat_data->power_off(dp->plat_data); >> + >> + pm_runtime_put_sync(dp->dev); >> + } >> + >> ret = analogix_dp_prepare_panel(dp, false, false); >> if (ret) >> DRM_ERROR("Failed to unprepare panel (%d)\n", ret); >> >> >> >> -- >> ?ark Yao > > -- ?ark Yao From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933919AbcJMB5L (ORCPT ); Wed, 12 Oct 2016 21:57:11 -0400 Received: from regular1.263xmail.com ([211.150.99.130]:45851 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933475AbcJMB5C (ORCPT ); Wed, 12 Oct 2016 21:57:02 -0400 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED4: 1 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: ville.syrjala@linux.intel.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: Question: Re: [PATCH] drm/bridge: analogix: protect power when get_modes or detect To: Sean Paul References: <1476266442-29803-1-git-send-email-mark.yao@rock-chips.com> <57FE0EF5.7010207@rock-chips.com> Cc: David Airlie , Heiko Stuebner , dri-devel , Linux ARM Kernel , linux-rockchip@lists.infradead.org, Linux Kernel Mailing List , Inki Dae , Gustavo Padovan , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= From: Mark yao Message-ID: <57FEE9E2.20505@rock-chips.com> Date: Thu, 13 Oct 2016 09:56:50 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016年10月12日 22:51, Sean Paul wrote: > On Wed, Oct 12, 2016 at 6:22 AM, Mark yao wrote: >> I'm not familiar with the analogix driver, maybe use a power reference count >> would better then direct power on/off analogix_dp. >> >> Does anyone has the idea to protect detect and get_modes context? >> > I'm not sure a reference count is going to help here. The common > pattern is to call detect() followed by get_modes() and then modeset. > However, it's not guaranteed that any one of those functions will be > called after the other. So, if you leave things on after detect or > get_modes, you might be wasting power (or worse). > > I recently ran into this exact problem with a panel we're using. Check > out "0b8b059a7: drm/bridge: analogix_dp: Ensure the panel is properly > prepared/unprepared". Perhaps you can piggyback on that function to > add your pm_runtime and plat_data callbacks (since using dpms_mode > might be racey). > > Sean Hi Sean Thanks for your advice. I re-test the detect and get_modes, only use pm_runtime_get/put also can fix my problem. without plat_data callbacks can avoid race to dpms_mode. I had send v2 patch, you can review it. Thanks. > >> I found many other connector driver also direct access register on detect or >> get_modes, no problem for it? >> >> On 2016年10月12日 18:00, Mark Yao wrote: >> >> The drm callback ->detect and ->get_modes seems is not power safe, >> they may be called when device is power off, do register access on >> detect or get_modes will cause system die. >> >> Here is the path call ->detect before analogix_dp power on >> [] analogix_dp_detect+0x44/0xdc >> [] >> drm_helper_probe_single_connector_modes_merge_bits+0xe8/0x41c >> [] drm_helper_probe_single_connector_modes+0x10/0x18 >> [] drm_mode_getconnector+0xf4/0x304 >> [] drm_ioctl+0x23c/0x390 >> [] do_vfs_ioctl+0x4b8/0x58c >> [] SyS_ioctl+0x60/0x88 >> >> Cc: Inki Dae >> Cc: Sean Paul >> Cc: Gustavo Padovan >> Cc: "Ville Syrjälä" >> >> Signed-off-by: Mark Yao >> --- >> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 28 >> ++++++++++++++++++++++ >> 1 file changed, 28 insertions(+) >> >> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> index efac8ab..09dece2 100644 >> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c >> @@ -1062,6 +1062,13 @@ int analogix_dp_get_modes(struct drm_connector >> *connector) >> return 0; >> } >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + pm_runtime_get_sync(dp->dev); >> + >> + if (dp->plat_data->power_on) >> + dp->plat_data->power_on(dp->plat_data); >> + } >> + >> if (analogix_dp_handle_edid(dp) == 0) { >> drm_mode_connector_update_edid_property(&dp->connector, edid); >> num_modes += drm_add_edid_modes(&dp->connector, edid); >> @@ -1073,6 +1080,13 @@ int analogix_dp_get_modes(struct drm_connector >> *connector) >> if (dp->plat_data->get_modes) >> num_modes += dp->plat_data->get_modes(dp->plat_data, connector); >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + if (dp->plat_data->power_off) >> + dp->plat_data->power_off(dp->plat_data); >> + >> + pm_runtime_put_sync(dp->dev); >> + } >> + >> ret = analogix_dp_prepare_panel(dp, false, false); >> if (ret) >> DRM_ERROR("Failed to unprepare panel (%d)\n", ret); >> @@ -1106,9 +1120,23 @@ analogix_dp_detect(struct drm_connector *connector, >> bool force) >> return connector_status_disconnected; >> } >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + pm_runtime_get_sync(dp->dev); >> + >> + if (dp->plat_data->power_on) >> + dp->plat_data->power_on(dp->plat_data); >> + } >> + >> if (!analogix_dp_detect_hpd(dp)) >> status = connector_status_connected; >> >> + if (dp->dpms_mode != DRM_MODE_DPMS_ON) { >> + if (dp->plat_data->power_off) >> + dp->plat_data->power_off(dp->plat_data); >> + >> + pm_runtime_put_sync(dp->dev); >> + } >> + >> ret = analogix_dp_prepare_panel(dp, false, false); >> if (ret) >> DRM_ERROR("Failed to unprepare panel (%d)\n", ret); >> >> >> >> -- >> Ｍark Yao > > -- Ｍark Yao