From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752633AbeDSKiQ (ORCPT ); Thu, 19 Apr 2018 06:38:16 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:52901 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752546AbeDSKiP (ORCPT ); Thu, 19 Apr 2018 06:38:15 -0400 From: Philippe CORNU To: Vincent ABRIOU , Yannick FERTRE , Benjamin Gaignard , David Airlie , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" CC: Fabien DESSENNE , Mickael REULIER , Alexandre TORGUE Subject: Re: [PATCH] drm/stm: ltdc: add user update info in plane print state Thread-Topic: [PATCH] drm/stm: ltdc: add user update info in plane print state Thread-Index: AQHTzrhWwCZmriDzrESJEFIN65KdyqQDB7SAgATOVAA= Date: Thu, 19 Apr 2018 10:38:06 +0000 Message-ID: <5d6c7997-190a-2015-59f6-156e156cbbb7@st.com> References: <20180407213503.30932-1-philippe.cornu@st.com> <8843fede-9859-7332-1e34-515efe58024c@st.com> In-Reply-To: <8843fede-9859-7332-1e34-515efe58024c@st.com> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.75.127.123] Content-Type: text/plain; charset="utf-8" Content-ID: MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-19_04:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id w3JAcMOs021064 Applied on drm-misc-next. Many thanks, Philippe :-) On 04/16/2018 11:14 AM, Vincent ABRIOU wrote: > Hi Philippe, > > Reviewed-by: Vincent Abriou > > On 04/07/2018 11:35 PM, Philippe Cornu wrote: >> This patch adds the user update information in >> frames-per-second into the drm debugfs plane state. >> >> Signed-off-by: Philippe Cornu >> --- >> drivers/gpu/drm/stm/ltdc.c | 22 ++++++++++++++++++++++ >> drivers/gpu/drm/stm/ltdc.h | 8 ++++++++ >> 2 files changed, 30 insertions(+) >> >> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c >> index 2b745cfc9000..061d2b6e5157 100644 >> --- a/drivers/gpu/drm/stm/ltdc.c >> +++ b/drivers/gpu/drm/stm/ltdc.c >> @@ -729,6 +729,8 @@ static void ltdc_plane_atomic_update(struct drm_plane *plane, >> reg_update_bits(ldev->regs, LTDC_L1CR + lofs, >> LXCR_LEN | LXCR_CLUTEN, val); >> >> + ldev->plane_fpsi[plane->index].counter++; >> + >> mutex_lock(&ldev->err_lock); >> if (ldev->error_status & ISR_FUIF) { >> DRM_DEBUG_DRIVER("Fifo underrun\n"); >> @@ -754,6 +756,25 @@ static void ltdc_plane_atomic_disable(struct drm_plane *plane, >> oldstate->crtc->base.id, plane->base.id); >> } >> >> +static void ltdc_plane_atomic_print_state(struct drm_printer *p, >> + const struct drm_plane_state *state) >> +{ >> + struct drm_plane *plane = state->plane; >> + struct ltdc_device *ldev = plane_to_ltdc(plane); >> + struct fps_info *fpsi = &ldev->plane_fpsi[plane->index]; >> + int ms_since_last; >> + ktime_t now; >> + >> + now = ktime_get(); >> + ms_since_last = ktime_to_ms(ktime_sub(now, fpsi->last_timestamp)); >> + >> + drm_printf(p, "\tuser_updates=%dfps\n", >> + DIV_ROUND_CLOSEST(fpsi->counter * 1000, ms_since_last)); >> + >> + fpsi->last_timestamp = now; >> + fpsi->counter = 0; >> +} >> + >> static const struct drm_plane_funcs ltdc_plane_funcs = { >> .update_plane = drm_atomic_helper_update_plane, >> .disable_plane = drm_atomic_helper_disable_plane, >> @@ -761,6 +782,7 @@ static const struct drm_plane_funcs ltdc_plane_funcs = { >> .reset = drm_atomic_helper_plane_reset, >> .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, >> .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, >> + .atomic_print_state = ltdc_plane_atomic_print_state, >> }; >> >> static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs = { >> diff --git a/drivers/gpu/drm/stm/ltdc.h b/drivers/gpu/drm/stm/ltdc.h >> index 61a80d00bc3b..1e16d6afb0d2 100644 >> --- a/drivers/gpu/drm/stm/ltdc.h >> +++ b/drivers/gpu/drm/stm/ltdc.h >> @@ -20,6 +20,13 @@ struct ltdc_caps { >> bool non_alpha_only_l1; /* non-native no-alpha formats on layer 1 */ >> }; >> >> +#define LTDC_MAX_LAYER 4 >> + >> +struct fps_info { >> + unsigned int counter; >> + ktime_t last_timestamp; >> +}; >> + >> struct ltdc_device { >> void __iomem *regs; >> struct clk *pixel_clk; /* lcd pixel clock */ >> @@ -27,6 +34,7 @@ struct ltdc_device { >> struct ltdc_caps caps; >> u32 error_status; >> u32 irq_status; >> + struct fps_info plane_fpsi[LTDC_MAX_LAYER]; >> }; >> >> int ltdc_load(struct drm_device *ddev); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philippe CORNU Subject: Re: [PATCH] drm/stm: ltdc: add user update info in plane print state Date: Thu, 19 Apr 2018 10:38:06 +0000 Message-ID: <5d6c7997-190a-2015-59f6-156e156cbbb7@st.com> References: <20180407213503.30932-1-philippe.cornu@st.com> <8843fede-9859-7332-1e34-515efe58024c@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 845466E61F for ; Thu, 19 Apr 2018 10:38:13 +0000 (UTC) In-Reply-To: <8843fede-9859-7332-1e34-515efe58024c@st.com> Content-Language: en-US Content-ID: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Vincent ABRIOU , Yannick FERTRE , Benjamin Gaignard , David Airlie , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" Cc: Mickael REULIER , Alexandre TORGUE , Fabien DESSENNE List-Id: dri-devel@lists.freedesktop.org QXBwbGllZCBvbiBkcm0tbWlzYy1uZXh0Lg0KTWFueSB0aGFua3MsDQpQaGlsaXBwZSA6LSkNCg0K T24gMDQvMTYvMjAxOCAxMToxNCBBTSwgVmluY2VudCBBQlJJT1Ugd3JvdGU6DQo+IEhpIFBoaWxp cHBlLA0KPiANCj4gUmV2aWV3ZWQtYnk6IFZpbmNlbnQgQWJyaW91IDx2aW5jZW50LmFicmlvdUBz dC5jb20+DQo+IA0KPiBPbiAwNC8wNy8yMDE4IDExOjM1IFBNLCBQaGlsaXBwZSBDb3JudSB3cm90 ZToNCj4+IFRoaXMgcGF0Y2ggYWRkcyB0aGUgdXNlciB1cGRhdGUgaW5mb3JtYXRpb24gaW4NCj4+ IGZyYW1lcy1wZXItc2Vjb25kIGludG8gdGhlIGRybSBkZWJ1Z2ZzIHBsYW5lIHN0YXRlLg0KPj4N Cj4+IFNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIENvcm51IDxwaGlsaXBwZS5jb3JudUBzdC5jb20+ DQo+PiAtLS0NCj4+ICAgIGRyaXZlcnMvZ3B1L2RybS9zdG0vbHRkYy5jIHwgMjIgKysrKysrKysr KysrKysrKysrKysrKw0KPj4gICAgZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmggfCAgOCArKysr KysrKw0KPj4gICAgMiBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspDQo+Pg0KPj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9zdG0vbHRkYy5jIGIvZHJpdmVycy9ncHUvZHJtL3N0 bS9sdGRjLmMNCj4+IGluZGV4IDJiNzQ1Y2ZjOTAwMC4uMDYxZDJiNmU1MTU3IDEwMDY0NA0KPj4g LS0tIGEvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmMNCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9zdG0vbHRkYy5jDQo+PiBAQCAtNzI5LDYgKzcyOSw4IEBAIHN0YXRpYyB2b2lkIGx0ZGNfcGxh bmVfYXRvbWljX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwNCj4+ICAgIAlyZWdfdXBk YXRlX2JpdHMobGRldi0+cmVncywgTFREQ19MMUNSICsgbG9mcywNCj4+ICAgIAkJCUxYQ1JfTEVO IHwgTFhDUl9DTFVURU4sIHZhbCk7DQo+PiAgICANCj4+ICsJbGRldi0+cGxhbmVfZnBzaVtwbGFu ZS0+aW5kZXhdLmNvdW50ZXIrKzsNCj4+ICsNCj4+ICAgIAltdXRleF9sb2NrKCZsZGV2LT5lcnJf bG9jayk7DQo+PiAgICAJaWYgKGxkZXYtPmVycm9yX3N0YXR1cyAmIElTUl9GVUlGKSB7DQo+PiAg ICAJCURSTV9ERUJVR19EUklWRVIoIkZpZm8gdW5kZXJydW5cbiIpOw0KPj4gQEAgLTc1NCw2ICs3 NTYsMjUgQEAgc3RhdGljIHZvaWQgbHRkY19wbGFuZV9hdG9taWNfZGlzYWJsZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwNCj4+ICAgIAkJCSBvbGRzdGF0ZS0+Y3J0Yy0+YmFzZS5pZCwgcGxhbmUt PmJhc2UuaWQpOw0KPj4gICAgfQ0KPj4gICAgDQo+PiArc3RhdGljIHZvaWQgbHRkY19wbGFuZV9h dG9taWNfcHJpbnRfc3RhdGUoc3RydWN0IGRybV9wcmludGVyICpwLA0KPj4gKwkJCQkJICBjb25z dCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkNCj4+ICt7DQo+PiArCXN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lID0gc3RhdGUtPnBsYW5lOw0KPj4gKwlzdHJ1Y3QgbHRkY19kZXZpY2UgKmxk ZXYgPSBwbGFuZV90b19sdGRjKHBsYW5lKTsNCj4+ICsJc3RydWN0IGZwc19pbmZvICpmcHNpID0g JmxkZXYtPnBsYW5lX2Zwc2lbcGxhbmUtPmluZGV4XTsNCj4+ICsJaW50IG1zX3NpbmNlX2xhc3Q7 DQo+PiArCWt0aW1lX3Qgbm93Ow0KPj4gKw0KPj4gKwlub3cgPSBrdGltZV9nZXQoKTsNCj4+ICsJ bXNfc2luY2VfbGFzdCA9IGt0aW1lX3RvX21zKGt0aW1lX3N1Yihub3csIGZwc2ktPmxhc3RfdGlt ZXN0YW1wKSk7DQo+PiArDQo+PiArCWRybV9wcmludGYocCwgIlx0dXNlcl91cGRhdGVzPSVkZnBz XG4iLA0KPj4gKwkJICAgRElWX1JPVU5EX0NMT1NFU1QoZnBzaS0+Y291bnRlciAqIDEwMDAsIG1z X3NpbmNlX2xhc3QpKTsNCj4+ICsNCj4+ICsJZnBzaS0+bGFzdF90aW1lc3RhbXAgPSBub3c7DQo+ PiArCWZwc2ktPmNvdW50ZXIgPSAwOw0KPj4gK30NCj4+ICsNCj4+ICAgIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGx0ZGNfcGxhbmVfZnVuY3MgPSB7DQo+PiAgICAJLnVwZGF0 ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwNCj4+ICAgIAkuZGlzYWJs ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUsDQo+PiBAQCAtNzYxLDYg Kzc4Miw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGx0ZGNfcGxhbmVf ZnVuY3MgPSB7DQo+PiAgICAJLnJlc2V0ID0gZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfcmVzZXQs DQo+PiAgICAJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9wbGFu ZV9kdXBsaWNhdGVfc3RhdGUsDQo+PiAgICAJLmF0b21pY19kZXN0cm95X3N0YXRlID0gZHJtX2F0 b21pY19oZWxwZXJfcGxhbmVfZGVzdHJveV9zdGF0ZSwNCj4+ICsJLmF0b21pY19wcmludF9zdGF0 ZSA9IGx0ZGNfcGxhbmVfYXRvbWljX3ByaW50X3N0YXRlLA0KPj4gICAgfTsNCj4+ICAgIA0KPj4g ICAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzIGx0ZGNfcGxhbmVf aGVscGVyX2Z1bmNzID0gew0KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9zdG0vbHRk Yy5oIGIvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmgNCj4+IGluZGV4IDYxYTgwZDAwYmMzYi4u MWUxNmQ2YWZiMGQyIDEwMDY0NA0KPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmgN Cj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9zdG0vbHRkYy5oDQo+PiBAQCAtMjAsNiArMjAsMTMg QEAgc3RydWN0IGx0ZGNfY2FwcyB7DQo+PiAgICAJYm9vbCBub25fYWxwaGFfb25seV9sMTsgLyog bm9uLW5hdGl2ZSBuby1hbHBoYSBmb3JtYXRzIG9uIGxheWVyIDEgKi8NCj4+ICAgIH07DQo+PiAg ICANCj4+ICsjZGVmaW5lIExURENfTUFYX0xBWUVSCTQNCj4+ICsNCj4+ICtzdHJ1Y3QgZnBzX2lu Zm8gew0KPj4gKwl1bnNpZ25lZCBpbnQgY291bnRlcjsNCj4+ICsJa3RpbWVfdCBsYXN0X3RpbWVz dGFtcDsNCj4+ICt9Ow0KPj4gKw0KPj4gICAgc3RydWN0IGx0ZGNfZGV2aWNlIHsNCj4+ICAgIAl2 b2lkIF9faW9tZW0gKnJlZ3M7DQo+PiAgICAJc3RydWN0IGNsayAqcGl4ZWxfY2xrOwkvKiBsY2Qg cGl4ZWwgY2xvY2sgKi8NCj4+IEBAIC0yNyw2ICszNCw3IEBAIHN0cnVjdCBsdGRjX2RldmljZSB7 DQo+PiAgICAJc3RydWN0IGx0ZGNfY2FwcyBjYXBzOw0KPj4gICAgCXUzMiBlcnJvcl9zdGF0dXM7 DQo+PiAgICAJdTMyIGlycV9zdGF0dXM7DQo+PiArCXN0cnVjdCBmcHNfaW5mbyBwbGFuZV9mcHNp W0xURENfTUFYX0xBWUVSXTsNCj4+ICAgIH07DQo+PiAgICANCj4+ICAgIGludCBsdGRjX2xvYWQo c3RydWN0IGRybV9kZXZpY2UgKmRkZXYpOwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK