From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754466AbeDPJG7 (ORCPT ); Mon, 16 Apr 2018 05:06:59 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:33471 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754116AbeDPJG4 (ORCPT ); Mon, 16 Apr 2018 05:06:56 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180416090653euoutp0150a2e4c7bda971a330d993be44dffa64~l31cC2x4k0138701387euoutp01v X-AuditID: cbfec7f4-b4fc79c0000043e4-58-5ad467ac3df3 Subject: Re: [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback To: Enric Balletbo i Serra , architt@codeaurora.org, inki.dae@samsung.com, thierry.reding@gmail.com, hjc@rock-chips.com, seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org, heiko@sntech.de Cc: dri-devel@lists.freedesktop.org, dianders@chromium.org, ykk@rock-chips.com, kernel@collabora.com, m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org, jy0922.shim@samsung.com, rydberg@bitmath.org, krzk@kernel.org, linux-rockchip@lists.infradead.org, kgene@kernel.org, linux-input@vger.kernel.org, orjan.eide@arm.com, wxt@rock-chips.com, jeffy.chen@rock-chips.com, linux-arm-kernel@lists.infradead.org, mark.yao@rock-chips.com, wzz@rock-chips.com, hl@rock-chips.com, jingoohan1@gmail.com, sw0312.kim@samsung.com, linux-kernel@vger.kernel.org, kyungmin.park@samsung.com, Laurent.pinchart@ideasonboard.com, kuankuan.y@gmail.com, hshi@chromium.org From: Andrzej Hajda Message-ID: Date: Mon, 16 Apr 2018 11:06:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180405095000.9756-27-enric.balletbo@collabora.com> Content-Transfer-Encoding: 7bit Content-Language: en-US X-Brightmail-Tracker: H4sIAAAAAAAAA01SbUxbZRjde7/brPOlTHnCjGadJGIUEGbyGnFRN7Mbf+2Pipi4XceVLUKH vWOKC7OpAh0wYGzqKBPJxiojmJUW+WgisOJWcZaOdE7QVCYj4xvNCow6AWkvi/w7z3nOyXNO 8gi0/g4XLxw0HpZNRinHwGmZtqth/zPN2TcyU4JdT5AT/X0UsVhnWOKzX+bIjfm/ONL8uweR lZEplnxVXUgWHT/RpKR1hCLVw1UMuTfo40jjXA1Pxv8YYIirv5wllbenaOL3O3hyvfsaRXyW aZ4cP9nAE+ftmywZurvAkoD7LEfu3lqhyRl/F0W+/SHIk47TPRTpcvUy5MeFLygSdPgQOXNq giOhomWOhN11DCn51E6R4l8fIf3mU/xL28TmumYkhpomWbHWPMCIgYoTlNgRbEBipy3Ii7XW GlZ0Nh3nxPaFW6w4XOalRFfDJ+KSrZsRK1qbkNh+s44WQ87H9jyUqU3PknMOHpFNyTv2aQ+U BxLzrMkf3WuxM2ZUmVCKNALg7dA2V8aVIq2gx40IxjzVrDrMIag799naEEKwZL3PPbAsTttp dfENgp7pruhCj2cQDLbyERyL34Y7V2b5iGgznkDguDJFRQYan2dh5JcKNqLicCIsuYaibh3e AUWNnVE3gxPgsqWPieCHcQZYxsK8qomBvprRKK/Br4C71xzlafw4tM+cpVUcB7+Nfh09Brhb A+cmy2k19y6wlDoZFcfCpFeNCvhRWOmMGCL4KAyNWxjVbEUwfL9krfQL0OsdWE0trF5IhEvu ZJV+EWov/cxFaMCbYHAmRs2wCarbvqRVWgfWYr2q3grDvu/W0sTBhevzXBXaZlvXzLaujW1d G9v/d+sR04Ti5HwlN1tWUo3yh0mKlKvkG7OT9h/KdaLV77+27J3rQO5/3/UgLCDDRl2HL5Cp Z6UjSkGuB4FAGzbr7NIqpcuSCj6WTYf2mvJzZMWDtgiMIU73zpPHMvU4Wzosvy/LebLpwZYS NPFmZNvzz1vHiir+nK/cQm8d3zCfN42zdo89V7UrDT1vNHa+9kY3/eYIfrVsY+EGsfj12Q96 CnHL0bT6nDRNeuvk6Xq/8vdO7fdJqedjyOLUxGx4e0HGe+GarAv6FK/2ZcnzdMru0EX/5/HF gYvKyf3a2NHU0M50V3A5oX1vrPdqRotjn4FRDkjPPkWbFOk/IbZgX/kDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA02Sa0xTZxzG955rMas7FpA3JDpXQpQlFspl/HGKiybLScaHbfpBIeqqHouR UuxpEYxuTb1wv+m2SGVgBKtBjFBQKhpQvKIrHaI4QKgB4w0KgQKC4SIFTfj2e5/n+X14k7+E lE3Q/pK9iXpBl6hKkDOLqEfT97tXX1Q/iQ05awuCnOYmAkzpLhrsllsMPBkdZKCisxHBTE8f Df+cOAzjlQ9JSKvpIeCEM5+C9//bGbgwUsjCm+4WCqqbs2nI6+0jweGoZOG/hkcE2E39LGQU lLFg7W2joX14jIbWuiIGhl/MkHDKUU/ApTtdLNj+vElAffVtCh6M/U1AV6UdwamTbxlwH5tm YKKumIK0IxYCjj9bCs3Gk+wPAXxFcQXi3eXvaP60sYXiW3NzCN7WVYb4a+Yulj+dXkjz1vIM hq8de0Hzzqz7BF9d9gc/ZW6g+NyacsTXthWTvNu6/OevYhVrdVqDXlgRrxX16+RxSghVKKNA ERoepVCGRW5bExohD45eu1tI2Jss6IKjf1PEZ7cGJaUHp7yvslBGlBeYibwkmAvH4/0WMhMt ksi4cwjfGLAS84Ufvl7iIufZG0+2ZTLzoz6ErVmTyFN4c3H41d0B1lP4cG8Rbsp5N/cguVIa d3T+xXhWMu5fhEt7fT3McEF4qrp9Lpdy0fjYhWushykuEN8yNVEe9uW24G7H8KfNEtxU+HIu 9+I24Lrbxrk9ya3Ek8WPyXn+Gte6ij6xH+54WULkI5l5gW5eoJgXKOYFyhlElSMfwSBq1Box VCGqNKIhUa3YpdVY0ezZXb03UWNDmQObGhEnQfIvpTZ7a6yMViWLqZpGhCWk3EdqUc1G0t2q 1IOCTrtDZ0gQxEYUMfu5AtLfd5d29ogT9TuUEcpIiFJGhkWGfQdyP6kjJDVWxqlVemGfICQJ us8eIfHyNyLvbSU7H2b8vnXom4LXpTGbDWXOJTE3qjoHHdsH21YFfTE+MzPxPG7ggNrvvDt/ VcvU+rwr4WfiqtQhW2MCbFqu39lR5Xh9Ntm5uOKiy70/ZfzpocBfj34fPGnKOn95SLNnrPKZ +cd254grYTjZm0j7JZ9NGf2px5nVP7pso5ZOmjZ9kFNivEr5LakTVR8BvBx4HIwDAAA= X-CMS-MailID: 20180416090652eucas1p1de9f6fa001d37a109e5587395653ae11 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-MTR: 20180416090652eucas1p1de9f6fa001d37a109e5587395653ae11 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180405095305epcas1p11a5082d2f0df9d35b953a4932827be0e X-RootMTR: 20180405095305epcas1p11a5082d2f0df9d35b953a4932827be0e References: <20180405095000.9756-1-enric.balletbo@collabora.com> <20180405095000.9756-27-enric.balletbo@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05.04.2018 11:49, Enric Balletbo i Serra wrote: > From: Tomasz Figa > > The first time after we call rockchip_drm_do_flush() after > rockchip_drm_psr_register(), we go from PSR_DISABLE to PSR_FLUSH. The > difference between PSR_DISABLE and PSR_FLUSH is whether or not we have a > delayed work pending - PSR is off in either state. However > psr_set_state() only catches the transition from PSR_FLUSH to > PSR_DISABLE (which never happens), while going from PSR_DISABLE to > PSR_FLUSH triggers a call to psr->set() to disable PSR while it's > already disabled. This triggers the eDP PHY power-on sequence without > being shut down first and this seems to occasionally leave the encoder > unable to later enable PSR. Let's just simplify the state machine and > simply consider PSR_DISABLE and PSR_FLUSH the same state. This lets us > represent the hardware state by a simple boolean called "enabled" and, > while at it, rename the misleading "active" boolean to "inhibit", which > represents the purpose much better. This phrase has no corresponding part in the patch. > > Also, userspace can (and does) trigger the rockchip_drm_do_flush() path > from drmModeDirtyFB() at any time, whether or the encoder is active. If > no mode is set, we call into analogix_dp_psr_set() which returns -EINVAL > because encoder->crtc is NULL. Avoid this by starting out with > psr->allowed set to false. ditto > > Signed-off-by: Kristian H. Kristensen > Signed-off-by: Tomasz Figa Original author should be first, 1st line of the patch "From:...." suggests it should be Tomasz. Regards Andrzej > Signed-off-by: Thierry Escande > Signed-off-by: Enric Balletbo i Serra > Tested-by: Marek Szyprowski > --- > > drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 79 +++++++++-------------------- > 1 file changed, 23 insertions(+), 56 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c > index c8655e625ba2..448c5fde241c 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c > @@ -22,19 +22,13 @@ > > #define PSR_FLUSH_TIMEOUT_MS 100 > > -enum psr_state { > - PSR_FLUSH, > - PSR_ENABLE, > - PSR_DISABLE, > -}; > - > struct psr_drv { > struct list_head list; > struct drm_encoder *encoder; > > struct mutex lock; > bool active; > - enum psr_state state; > + bool enabled; > > struct delayed_work flush_work; > struct work_struct disable_work; > @@ -78,52 +72,22 @@ static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder) > return psr; > } > > -static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state) > +static int psr_set_state_locked(struct psr_drv *psr, bool enable) > { > - /* > - * Allowed finite state machine: > - * > - * PSR_ENABLE < = = = = = > PSR_FLUSH > - * | ^ | > - * | | | > - * v | | > - * PSR_DISABLE < - - - - - - - - - > - */ > - if (state == psr->state || !psr->active) > - return; > - > - /* Already disabled in flush, change the state, but not the hardware */ > - if (state == PSR_DISABLE && psr->state == PSR_FLUSH) { > - psr->state = state; > - return; > - } > + int ret; > > - /* Actually commit the state change to hardware */ > - switch (state) { > - case PSR_ENABLE: > - if (psr->set(psr->encoder, true)) > - return; > - break; > - > - case PSR_DISABLE: > - case PSR_FLUSH: > - if (psr->set(psr->encoder, false)) > - return; > - break; > - > - default: > - pr_err("%s: Unknown state %d\n", __func__, state); > - return; > - } > + if (!psr->active) > + return -EINVAL; > > - psr->state = state; > -} > + if (enable == psr->enabled) > + return 0; > > -static void psr_set_state(struct psr_drv *psr, enum psr_state state) > -{ > - mutex_lock(&psr->lock); > - psr_set_state_locked(psr, state); > - mutex_unlock(&psr->lock); > + ret = psr->set(psr->encoder, enable); > + if (ret) > + return ret; > + > + psr->enabled = enable; > + return 0; > } > > static void psr_flush_handler(struct work_struct *work) > @@ -131,10 +95,8 @@ static void psr_flush_handler(struct work_struct *work) > struct psr_drv *psr = container_of(to_delayed_work(work), > struct psr_drv, flush_work); > > - /* If the state has changed since we initiated the flush, do nothing */ > mutex_lock(&psr->lock); > - if (psr->state == PSR_FLUSH) > - psr_set_state_locked(psr, PSR_ENABLE); > + psr_set_state_locked(psr, true); > mutex_unlock(&psr->lock); > } > > @@ -176,6 +138,7 @@ int rockchip_drm_psr_deactivate(struct drm_encoder *encoder) > > mutex_lock(&psr->lock); > psr->active = false; > + psr->enabled = false; > mutex_unlock(&psr->lock); > cancel_delayed_work_sync(&psr->flush_work); > cancel_work_sync(&psr->disable_work); > @@ -187,8 +150,12 @@ EXPORT_SYMBOL(rockchip_drm_psr_deactivate); > static void rockchip_drm_do_flush(struct psr_drv *psr) > { > cancel_delayed_work_sync(&psr->flush_work); > - psr_set_state(psr, PSR_FLUSH); > - mod_delayed_work(system_wq, &psr->flush_work, PSR_FLUSH_TIMEOUT_MS); > + > + mutex_lock(&psr->lock); > + if (!psr_set_state_locked(psr, false)) > + mod_delayed_work(system_wq, &psr->flush_work, > + PSR_FLUSH_TIMEOUT_MS); > + mutex_unlock(&psr->lock); > } > > /** > @@ -355,8 +322,8 @@ int rockchip_drm_psr_register(struct drm_encoder *encoder, > INIT_WORK(&psr->disable_work, psr_disable_handler); > mutex_init(&psr->lock); > > - psr->active = true; > - psr->state = PSR_DISABLE; > + psr->active = false; > + psr->enabled = false; > psr->encoder = encoder; > psr->set = psr_set; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrzej Hajda Subject: Re: [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback Date: Mon, 16 Apr 2018 11:06:49 +0200 Message-ID: References: <20180405095000.9756-1-enric.balletbo@collabora.com> <20180405095000.9756-27-enric.balletbo@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180405095000.9756-27-enric.balletbo@collabora.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Enric Balletbo i Serra , architt@codeaurora.org, inki.dae@samsung.com, thierry.reding@gmail.com, hjc@rock-chips.com, seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org, heiko@sntech.de Cc: dri-devel@lists.freedesktop.org, dianders@chromium.org, Laurent.pinchart@ideasonboard.com, ykk@rock-chips.com, kernel@collabora.com, m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org, rydberg@bitmath.org, krzk@kernel.org, linux-rockchip@lists.infradead.org, kgene@kernel.org, linux-input@vger.kernel.org, orjan.eide@arm.com, wxt@rock-chips.com, jeffy.chen@rock-chips.com, linux-arm-kernel@lists.infradead.org, mark.yao@rock-chips.com, wzz@rock-chips.com, hl@rock-chips.com, jingoohan1@gmail.com, sw0312.kim@samsung.com, linux-kernel@vger.kernel.org, kyungmin.park@samsung.com, kuankuan.y@gmail.com, hshi@chromium.org List-Id: linux-input@vger.kernel.org T24gMDUuMDQuMjAxOCAxMTo0OSwgRW5yaWMgQmFsbGV0Ym8gaSBTZXJyYSB3cm90ZToKPiBGcm9t OiBUb21hc3ogRmlnYSA8dGZpZ2FAY2hyb21pdW0ub3JnPgo+Cj4gVGhlIGZpcnN0IHRpbWUgYWZ0 ZXIgd2UgY2FsbCByb2NrY2hpcF9kcm1fZG9fZmx1c2goKSBhZnRlcgo+IHJvY2tjaGlwX2RybV9w c3JfcmVnaXN0ZXIoKSwgd2UgZ28gZnJvbSBQU1JfRElTQUJMRSB0byBQU1JfRkxVU0guIFRoZQo+ IGRpZmZlcmVuY2UgYmV0d2VlbiBQU1JfRElTQUJMRSBhbmQgUFNSX0ZMVVNIIGlzIHdoZXRoZXIg b3Igbm90IHdlIGhhdmUgYQo+IGRlbGF5ZWQgd29yayBwZW5kaW5nIC0gUFNSIGlzIG9mZiBpbiBl aXRoZXIgc3RhdGUuICBIb3dldmVyCj4gcHNyX3NldF9zdGF0ZSgpIG9ubHkgY2F0Y2hlcyB0aGUg dHJhbnNpdGlvbiBmcm9tIFBTUl9GTFVTSCB0bwo+IFBTUl9ESVNBQkxFICh3aGljaCBuZXZlciBo YXBwZW5zKSwgd2hpbGUgZ29pbmcgZnJvbSBQU1JfRElTQUJMRSB0bwo+IFBTUl9GTFVTSCB0cmln Z2VycyBhIGNhbGwgdG8gcHNyLT5zZXQoKSB0byBkaXNhYmxlIFBTUiB3aGlsZSBpdCdzCj4gYWxy ZWFkeSBkaXNhYmxlZC4gVGhpcyB0cmlnZ2VycyB0aGUgZURQIFBIWSBwb3dlci1vbiBzZXF1ZW5j ZSB3aXRob3V0Cj4gYmVpbmcgc2h1dCBkb3duIGZpcnN0IGFuZCB0aGlzIHNlZW1zIHRvIG9jY2Fz aW9uYWxseSBsZWF2ZSB0aGUgZW5jb2Rlcgo+IHVuYWJsZSB0byBsYXRlciBlbmFibGUgUFNSLiBM ZXQncyBqdXN0IHNpbXBsaWZ5IHRoZSBzdGF0ZSBtYWNoaW5lIGFuZAo+IHNpbXBseSBjb25zaWRl ciBQU1JfRElTQUJMRSBhbmQgUFNSX0ZMVVNIIHRoZSBzYW1lIHN0YXRlLiBUaGlzIGxldHMgdXMK PiByZXByZXNlbnQgdGhlIGhhcmR3YXJlIHN0YXRlIGJ5IGEgc2ltcGxlIGJvb2xlYW4gY2FsbGVk ICJlbmFibGVkIiBhbmQsCj4gd2hpbGUgYXQgaXQsIHJlbmFtZSB0aGUgbWlzbGVhZGluZyAiYWN0 aXZlIiBib29sZWFuIHRvICJpbmhpYml0Iiwgd2hpY2gKPiByZXByZXNlbnRzIHRoZSBwdXJwb3Nl IG11Y2ggYmV0dGVyLgoKVGhpcyBwaHJhc2UgaGFzIG5vIGNvcnJlc3BvbmRpbmcgcGFydCBpbiB0 aGUgcGF0Y2guCgo+Cj4gQWxzbywgdXNlcnNwYWNlIGNhbiAoYW5kIGRvZXMpIHRyaWdnZXIgdGhl IHJvY2tjaGlwX2RybV9kb19mbHVzaCgpIHBhdGgKPiBmcm9tIGRybU1vZGVEaXJ0eUZCKCkgYXQg YW55IHRpbWUsIHdoZXRoZXIgb3IgdGhlIGVuY29kZXIgaXMgYWN0aXZlLiBJZgo+IG5vIG1vZGUg aXMgc2V0LCB3ZSBjYWxsIGludG8gYW5hbG9naXhfZHBfcHNyX3NldCgpIHdoaWNoIHJldHVybnMg LUVJTlZBTAo+IGJlY2F1c2UgZW5jb2Rlci0+Y3J0YyBpcyBOVUxMLiBBdm9pZCB0aGlzIGJ5IHN0 YXJ0aW5nIG91dCB3aXRoCj4gcHNyLT5hbGxvd2VkIHNldCB0byBmYWxzZS4KCmRpdHRvCgo+Cj4g U2lnbmVkLW9mZi1ieTogS3Jpc3RpYW4gSC4gS3Jpc3RlbnNlbiA8aG9lZ3NiZXJnQGNocm9taXVt Lm9yZz4KPiBTaWduZWQtb2ZmLWJ5OiBUb21hc3ogRmlnYSA8dGZpZ2FAY2hyb21pdW0ub3JnPgoK T3JpZ2luYWwgYXV0aG9yIHNob3VsZCBiZSBmaXJzdCwgMXN0IGxpbmUgb2YgdGhlIHBhdGNoICJG cm9tOi4uLi4iCnN1Z2dlc3RzIGl0IHNob3VsZCBiZSBUb21hc3ouCgpSZWdhcmRzCkFuZHJ6ZWoK Cj4gU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBFc2NhbmRlIDx0aGllcnJ5LmVzY2FuZGVAY29sbGFi b3JhLmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBFbnJpYyBCYWxsZXRibyBpIFNlcnJhIDxlbnJpYy5i YWxsZXRib0Bjb2xsYWJvcmEuY29tPgo+IFRlc3RlZC1ieTogTWFyZWsgU3p5cHJvd3NraSA8bS5z enlwcm93c2tpQHNhbXN1bmcuY29tPgo+IC0tLQo+Cj4gIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hp cC9yb2NrY2hpcF9kcm1fcHNyLmMgfCA3OSArKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQo+ ICAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRpb25zKC0pCj4KPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9wc3IuYyBi L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fcHNyLmMKPiBpbmRleCBjODY1 NWU2MjViYTIuLjQ0OGM1ZmRlMjQxYyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvcm9ja2NoaXBfZHJtX3Bzci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L3JvY2tjaGlwX2RybV9wc3IuYwo+IEBAIC0yMiwxOSArMjIsMTMgQEAKPiAgCj4gICNkZWZpbmUg UFNSX0ZMVVNIX1RJTUVPVVRfTVMJMTAwCj4gIAo+IC1lbnVtIHBzcl9zdGF0ZSB7Cj4gLQlQU1Jf RkxVU0gsCj4gLQlQU1JfRU5BQkxFLAo+IC0JUFNSX0RJU0FCTEUsCj4gLX07Cj4gLQo+ICBzdHJ1 Y3QgcHNyX2RydiB7Cj4gIAlzdHJ1Y3QgbGlzdF9oZWFkCWxpc3Q7Cj4gIAlzdHJ1Y3QgZHJtX2Vu Y29kZXIJKmVuY29kZXI7Cj4gIAo+ICAJc3RydWN0IG11dGV4CQlsb2NrOwo+ICAJYm9vbAkJCWFj dGl2ZTsKPiAtCWVudW0gcHNyX3N0YXRlCQlzdGF0ZTsKPiArCWJvb2wJCQllbmFibGVkOwo+ICAK PiAgCXN0cnVjdCBkZWxheWVkX3dvcmsJZmx1c2hfd29yazsKPiAgCXN0cnVjdCB3b3JrX3N0cnVj dAlkaXNhYmxlX3dvcms7Cj4gQEAgLTc4LDUyICs3MiwyMiBAQCBzdGF0aWMgc3RydWN0IHBzcl9k cnYgKmZpbmRfcHNyX2J5X2VuY29kZXIoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQo+ICAJ cmV0dXJuIHBzcjsKPiAgfQo+ICAKPiAtc3RhdGljIHZvaWQgcHNyX3NldF9zdGF0ZV9sb2NrZWQo c3RydWN0IHBzcl9kcnYgKnBzciwgZW51bSBwc3Jfc3RhdGUgc3RhdGUpCj4gK3N0YXRpYyBpbnQg cHNyX3NldF9zdGF0ZV9sb2NrZWQoc3RydWN0IHBzcl9kcnYgKnBzciwgYm9vbCBlbmFibGUpCj4g IHsKPiAtCS8qCj4gLQkgKiBBbGxvd2VkIGZpbml0ZSBzdGF0ZSBtYWNoaW5lOgo+IC0JICoKPiAt CSAqICAgUFNSX0VOQUJMRSAgPCA9ID0gPSA9ID0gPiAgUFNSX0ZMVVNICj4gLQkgKiAgICAgICB8 IF4gICAgICAgICAgICAgICAgICAgICAgICB8Cj4gLQkgKiAgICAgICB8IHwgICAgICAgICAgICAg ICAgICAgICAgICB8Cj4gLQkgKiAgICAgICB2IHwgICAgICAgICAgICAgICAgICAgICAgICB8Cj4g LQkgKiAgIFBTUl9ESVNBQkxFIDwgLSAtIC0gLSAtIC0gLSAtIC0KPiAtCSAqLwo+IC0JaWYgKHN0 YXRlID09IHBzci0+c3RhdGUgfHwgIXBzci0+YWN0aXZlKQo+IC0JCXJldHVybjsKPiAtCj4gLQkv KiBBbHJlYWR5IGRpc2FibGVkIGluIGZsdXNoLCBjaGFuZ2UgdGhlIHN0YXRlLCBidXQgbm90IHRo ZSBoYXJkd2FyZSAqLwo+IC0JaWYgKHN0YXRlID09IFBTUl9ESVNBQkxFICYmIHBzci0+c3RhdGUg PT0gUFNSX0ZMVVNIKSB7Cj4gLQkJcHNyLT5zdGF0ZSA9IHN0YXRlOwo+IC0JCXJldHVybjsKPiAt CX0KPiArCWludCByZXQ7Cj4gIAo+IC0JLyogQWN0dWFsbHkgY29tbWl0IHRoZSBzdGF0ZSBjaGFu Z2UgdG8gaGFyZHdhcmUgKi8KPiAtCXN3aXRjaCAoc3RhdGUpIHsKPiAtCWNhc2UgUFNSX0VOQUJM RToKPiAtCQlpZiAocHNyLT5zZXQocHNyLT5lbmNvZGVyLCB0cnVlKSkKPiAtCQkJcmV0dXJuOwo+ IC0JCWJyZWFrOwo+IC0KPiAtCWNhc2UgUFNSX0RJU0FCTEU6Cj4gLQljYXNlIFBTUl9GTFVTSDoK PiAtCQlpZiAocHNyLT5zZXQocHNyLT5lbmNvZGVyLCBmYWxzZSkpCj4gLQkJCXJldHVybjsKPiAt CQlicmVhazsKPiAtCj4gLQlkZWZhdWx0Ogo+IC0JCXByX2VycigiJXM6IFVua25vd24gc3RhdGUg JWRcbiIsIF9fZnVuY19fLCBzdGF0ZSk7Cj4gLQkJcmV0dXJuOwo+IC0JfQo+ICsJaWYgKCFwc3It PmFjdGl2ZSkKPiArCQlyZXR1cm4gLUVJTlZBTDsKPiAgCj4gLQlwc3ItPnN0YXRlID0gc3RhdGU7 Cj4gLX0KPiArCWlmIChlbmFibGUgPT0gcHNyLT5lbmFibGVkKQo+ICsJCXJldHVybiAwOwo+ICAK PiAtc3RhdGljIHZvaWQgcHNyX3NldF9zdGF0ZShzdHJ1Y3QgcHNyX2RydiAqcHNyLCBlbnVtIHBz cl9zdGF0ZSBzdGF0ZSkKPiAtewo+IC0JbXV0ZXhfbG9jaygmcHNyLT5sb2NrKTsKPiAtCXBzcl9z ZXRfc3RhdGVfbG9ja2VkKHBzciwgc3RhdGUpOwo+IC0JbXV0ZXhfdW5sb2NrKCZwc3ItPmxvY2sp Owo+ICsJcmV0ID0gcHNyLT5zZXQocHNyLT5lbmNvZGVyLCBlbmFibGUpOwo+ICsJaWYgKHJldCkK PiArCQlyZXR1cm4gcmV0Owo+ICsKPiArCXBzci0+ZW5hYmxlZCA9IGVuYWJsZTsKPiArCXJldHVy biAwOwo+ICB9Cj4gIAo+ICBzdGF0aWMgdm9pZCBwc3JfZmx1c2hfaGFuZGxlcihzdHJ1Y3Qgd29y a19zdHJ1Y3QgKndvcmspCj4gQEAgLTEzMSwxMCArOTUsOCBAQCBzdGF0aWMgdm9pZCBwc3JfZmx1 c2hfaGFuZGxlcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gIAlzdHJ1Y3QgcHNyX2RydiAq cHNyID0gY29udGFpbmVyX29mKHRvX2RlbGF5ZWRfd29yayh3b3JrKSwKPiAgCQkJCQkgICBzdHJ1 Y3QgcHNyX2RydiwgZmx1c2hfd29yayk7Cj4gIAo+IC0JLyogSWYgdGhlIHN0YXRlIGhhcyBjaGFu Z2VkIHNpbmNlIHdlIGluaXRpYXRlZCB0aGUgZmx1c2gsIGRvIG5vdGhpbmcgKi8KPiAgCW11dGV4 X2xvY2soJnBzci0+bG9jayk7Cj4gLQlpZiAocHNyLT5zdGF0ZSA9PSBQU1JfRkxVU0gpCj4gLQkJ cHNyX3NldF9zdGF0ZV9sb2NrZWQocHNyLCBQU1JfRU5BQkxFKTsKPiArCXBzcl9zZXRfc3RhdGVf bG9ja2VkKHBzciwgdHJ1ZSk7Cj4gIAltdXRleF91bmxvY2soJnBzci0+bG9jayk7Cj4gIH0KPiAg Cj4gQEAgLTE3Niw2ICsxMzgsNyBAQCBpbnQgcm9ja2NoaXBfZHJtX3Bzcl9kZWFjdGl2YXRlKHN0 cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKPiAgCj4gIAltdXRleF9sb2NrKCZwc3ItPmxvY2sp Owo+ICAJcHNyLT5hY3RpdmUgPSBmYWxzZTsKPiArCXBzci0+ZW5hYmxlZCA9IGZhbHNlOwo+ICAJ bXV0ZXhfdW5sb2NrKCZwc3ItPmxvY2spOwo+ICAJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZw c3ItPmZsdXNoX3dvcmspOwo+ICAJY2FuY2VsX3dvcmtfc3luYygmcHNyLT5kaXNhYmxlX3dvcmsp Owo+IEBAIC0xODcsOCArMTUwLDEyIEBAIEVYUE9SVF9TWU1CT0wocm9ja2NoaXBfZHJtX3Bzcl9k ZWFjdGl2YXRlKTsKPiAgc3RhdGljIHZvaWQgcm9ja2NoaXBfZHJtX2RvX2ZsdXNoKHN0cnVjdCBw c3JfZHJ2ICpwc3IpCj4gIHsKPiAgCWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmcHNyLT5mbHVz aF93b3JrKTsKPiAtCXBzcl9zZXRfc3RhdGUocHNyLCBQU1JfRkxVU0gpOwo+IC0JbW9kX2RlbGF5 ZWRfd29yayhzeXN0ZW1fd3EsICZwc3ItPmZsdXNoX3dvcmssIFBTUl9GTFVTSF9USU1FT1VUX01T KTsKPiArCj4gKwltdXRleF9sb2NrKCZwc3ItPmxvY2spOwo+ICsJaWYgKCFwc3Jfc2V0X3N0YXRl X2xvY2tlZChwc3IsIGZhbHNlKSkKPiArCQltb2RfZGVsYXllZF93b3JrKHN5c3RlbV93cSwgJnBz ci0+Zmx1c2hfd29yaywKPiArCQkJCSBQU1JfRkxVU0hfVElNRU9VVF9NUyk7Cj4gKwltdXRleF91 bmxvY2soJnBzci0+bG9jayk7Cj4gIH0KPiAgCj4gIC8qKgo+IEBAIC0zNTUsOCArMzIyLDggQEAg aW50IHJvY2tjaGlwX2RybV9wc3JfcmVnaXN0ZXIoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVy LAo+ICAJSU5JVF9XT1JLKCZwc3ItPmRpc2FibGVfd29yaywgcHNyX2Rpc2FibGVfaGFuZGxlcik7 Cj4gIAltdXRleF9pbml0KCZwc3ItPmxvY2spOwo+ICAKPiAtCXBzci0+YWN0aXZlID0gdHJ1ZTsK PiAtCXBzci0+c3RhdGUgPSBQU1JfRElTQUJMRTsKPiArCXBzci0+YWN0aXZlID0gZmFsc2U7Cj4g Kwlwc3ItPmVuYWJsZWQgPSBmYWxzZTsKPiAgCXBzci0+ZW5jb2RlciA9IGVuY29kZXI7Cj4gIAlw c3ItPnNldCA9IHBzcl9zZXQ7Cj4gIAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: a.hajda@samsung.com (Andrzej Hajda) Date: Mon, 16 Apr 2018 11:06:49 +0200 Subject: [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback In-Reply-To: <20180405095000.9756-27-enric.balletbo@collabora.com> References: <20180405095000.9756-1-enric.balletbo@collabora.com> <20180405095000.9756-27-enric.balletbo@collabora.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 05.04.2018 11:49, Enric Balletbo i Serra wrote: > From: Tomasz Figa > > The first time after we call rockchip_drm_do_flush() after > rockchip_drm_psr_register(), we go from PSR_DISABLE to PSR_FLUSH. The > difference between PSR_DISABLE and PSR_FLUSH is whether or not we have a > delayed work pending - PSR is off in either state. However > psr_set_state() only catches the transition from PSR_FLUSH to > PSR_DISABLE (which never happens), while going from PSR_DISABLE to > PSR_FLUSH triggers a call to psr->set() to disable PSR while it's > already disabled. This triggers the eDP PHY power-on sequence without > being shut down first and this seems to occasionally leave the encoder > unable to later enable PSR. Let's just simplify the state machine and > simply consider PSR_DISABLE and PSR_FLUSH the same state. This lets us > represent the hardware state by a simple boolean called "enabled" and, > while at it, rename the misleading "active" boolean to "inhibit", which > represents the purpose much better. This phrase has no corresponding part in the patch. > > Also, userspace can (and does) trigger the rockchip_drm_do_flush() path > from drmModeDirtyFB() at any time, whether or the encoder is active. If > no mode is set, we call into analogix_dp_psr_set() which returns -EINVAL > because encoder->crtc is NULL. Avoid this by starting out with > psr->allowed set to false. ditto > > Signed-off-by: Kristian H. Kristensen > Signed-off-by: Tomasz Figa Original author should be first, 1st line of the patch "From:...." suggests it should be Tomasz. Regards Andrzej > Signed-off-by: Thierry Escande > Signed-off-by: Enric Balletbo i Serra > Tested-by: Marek Szyprowski > --- > > drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 79 +++++++++-------------------- > 1 file changed, 23 insertions(+), 56 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c > index c8655e625ba2..448c5fde241c 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c > @@ -22,19 +22,13 @@ > > #define PSR_FLUSH_TIMEOUT_MS 100 > > -enum psr_state { > - PSR_FLUSH, > - PSR_ENABLE, > - PSR_DISABLE, > -}; > - > struct psr_drv { > struct list_head list; > struct drm_encoder *encoder; > > struct mutex lock; > bool active; > - enum psr_state state; > + bool enabled; > > struct delayed_work flush_work; > struct work_struct disable_work; > @@ -78,52 +72,22 @@ static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder) > return psr; > } > > -static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state) > +static int psr_set_state_locked(struct psr_drv *psr, bool enable) > { > - /* > - * Allowed finite state machine: > - * > - * PSR_ENABLE < = = = = = > PSR_FLUSH > - * | ^ | > - * | | | > - * v | | > - * PSR_DISABLE < - - - - - - - - - > - */ > - if (state == psr->state || !psr->active) > - return; > - > - /* Already disabled in flush, change the state, but not the hardware */ > - if (state == PSR_DISABLE && psr->state == PSR_FLUSH) { > - psr->state = state; > - return; > - } > + int ret; > > - /* Actually commit the state change to hardware */ > - switch (state) { > - case PSR_ENABLE: > - if (psr->set(psr->encoder, true)) > - return; > - break; > - > - case PSR_DISABLE: > - case PSR_FLUSH: > - if (psr->set(psr->encoder, false)) > - return; > - break; > - > - default: > - pr_err("%s: Unknown state %d\n", __func__, state); > - return; > - } > + if (!psr->active) > + return -EINVAL; > > - psr->state = state; > -} > + if (enable == psr->enabled) > + return 0; > > -static void psr_set_state(struct psr_drv *psr, enum psr_state state) > -{ > - mutex_lock(&psr->lock); > - psr_set_state_locked(psr, state); > - mutex_unlock(&psr->lock); > + ret = psr->set(psr->encoder, enable); > + if (ret) > + return ret; > + > + psr->enabled = enable; > + return 0; > } > > static void psr_flush_handler(struct work_struct *work) > @@ -131,10 +95,8 @@ static void psr_flush_handler(struct work_struct *work) > struct psr_drv *psr = container_of(to_delayed_work(work), > struct psr_drv, flush_work); > > - /* If the state has changed since we initiated the flush, do nothing */ > mutex_lock(&psr->lock); > - if (psr->state == PSR_FLUSH) > - psr_set_state_locked(psr, PSR_ENABLE); > + psr_set_state_locked(psr, true); > mutex_unlock(&psr->lock); > } > > @@ -176,6 +138,7 @@ int rockchip_drm_psr_deactivate(struct drm_encoder *encoder) > > mutex_lock(&psr->lock); > psr->active = false; > + psr->enabled = false; > mutex_unlock(&psr->lock); > cancel_delayed_work_sync(&psr->flush_work); > cancel_work_sync(&psr->disable_work); > @@ -187,8 +150,12 @@ EXPORT_SYMBOL(rockchip_drm_psr_deactivate); > static void rockchip_drm_do_flush(struct psr_drv *psr) > { > cancel_delayed_work_sync(&psr->flush_work); > - psr_set_state(psr, PSR_FLUSH); > - mod_delayed_work(system_wq, &psr->flush_work, PSR_FLUSH_TIMEOUT_MS); > + > + mutex_lock(&psr->lock); > + if (!psr_set_state_locked(psr, false)) > + mod_delayed_work(system_wq, &psr->flush_work, > + PSR_FLUSH_TIMEOUT_MS); > + mutex_unlock(&psr->lock); > } > > /** > @@ -355,8 +322,8 @@ int rockchip_drm_psr_register(struct drm_encoder *encoder, > INIT_WORK(&psr->disable_work, psr_disable_handler); > mutex_init(&psr->lock); > > - psr->active = true; > - psr->state = PSR_DISABLE; > + psr->active = false; > + psr->enabled = false; > psr->encoder = encoder; > psr->set = psr_set; >