From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1434555AbdDZOlV (ORCPT ); Wed, 26 Apr 2017 10:41:21 -0400 Received: from foss.arm.com ([217.140.101.70]:56934 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1040667AbdDZOlL (ORCPT ); Wed, 26 Apr 2017 10:41:11 -0400 Date: Wed, 26 Apr 2017 15:41:08 +0100 From: Liviu Dudau To: Arnd Bergmann Cc: Brian Starkey , Mali DP Maintainers , David Airlie , Mihail Atanassov , Daniel Vetter , Shawn Guo , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm: mali-dp: use div_u64 for expensive 64-bit divisions Message-ID: <20170426144108.GD7170@e110455-lin.cambridge.arm.com> Mail-Followup-To: Arnd Bergmann , Brian Starkey , Mali DP Maintainers , David Airlie , Mihail Atanassov , Daniel Vetter , Shawn Guo , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20170425195712.2017230-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170425195712.2017230-1-arnd@arndb.de> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 25, 2017 at 09:56:53PM +0200, Arnd Bergmann wrote: > On 32-bit machines, we can't divide 64-bit integers: > > drivers/gpu/drm/arm/malidp_crtc.o: In function `malidp_crtc_atomic_check': > malidp_crtc.c:(.text.malidp_crtc_atomic_check+0x3c0): undefined reference to `__aeabi_uldivmod' > malidp_crtc.c:(.text.malidp_crtc_atomic_check+0x3dc): undefined reference to `__aeabi_uldivmod' > > This calls the div_u64 function explicitly instead. > > Fixes: 4cea4e9f6690 ("drm: mali-dp: Add plane upscaling support") > Signed-off-by: Arnd Bergmann Acked-by: Liviu Dudau I'll push the patch to the mali-dp repository. Dave A., if you have pulled the mali-dp patches then this will need to go in as well, otherwise I will send an updated pull request soon. Best regards, Liviu > --- > drivers/gpu/drm/arm/malidp_crtc.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c > index 19f1f3b34691..9446a673d469 100644 > --- a/drivers/gpu/drm/arm/malidp_crtc.c > +++ b/drivers/gpu/drm/arm/malidp_crtc.c > @@ -266,7 +266,6 @@ static int malidp_crtc_atomic_check_scaling(struct drm_crtc *crtc, > > drm_atomic_crtc_state_for_each_plane_state(plane, pstate, state) { > struct malidp_plane *mp = to_malidp_plane(plane); > - u64 crtc_w, crtc_h; > u32 phase; > > if (!(mp->layer->id & scaling)) > @@ -276,10 +275,10 @@ static int malidp_crtc_atomic_check_scaling(struct drm_crtc *crtc, > * Convert crtc_[w|h] to U32.32, then divide by U16.16 src_[w|h] > * to get the U16.16 result. > */ > - crtc_w = (u64)pstate->crtc_w << 32; > - crtc_h = (u64)pstate->crtc_h << 32; > - h_upscale_factor = (u32)(crtc_w / pstate->src_w); > - v_upscale_factor = (u32)(crtc_h / pstate->src_h); > + h_upscale_factor = div_u64((u64)pstate->crtc_w << 32, > + pstate->src_w); > + v_upscale_factor = div_u64((u64)pstate->crtc_h << 32, > + pstate->src_h); > > s->enhancer_enable = ((h_upscale_factor >> 16) >= 2 || > (v_upscale_factor >> 16) >= 2); > -- > 2.9.0 > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu Dudau Subject: Re: [PATCH] drm: mali-dp: use div_u64 for expensive 64-bit divisions Date: Wed, 26 Apr 2017 15:41:08 +0100 Message-ID: <20170426144108.GD7170@e110455-lin.cambridge.arm.com> References: <20170425195712.2017230-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id BDB2589D5C for ; Wed, 26 Apr 2017 14:41:10 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170425195712.2017230-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Arnd Bergmann Cc: Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Mali DP Maintainers , Mihail Atanassov List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBBcHIgMjUsIDIwMTcgYXQgMDk6NTY6NTNQTSArMDIwMCwgQXJuZCBCZXJnbWFubiB3 cm90ZToKPiBPbiAzMi1iaXQgbWFjaGluZXMsIHdlIGNhbid0IGRpdmlkZSA2NC1iaXQgaW50ZWdl cnM6Cj4gCj4gZHJpdmVycy9ncHUvZHJtL2FybS9tYWxpZHBfY3J0Yy5vOiBJbiBmdW5jdGlvbiBg bWFsaWRwX2NydGNfYXRvbWljX2NoZWNrJzoKPiBtYWxpZHBfY3J0Yy5jOigudGV4dC5tYWxpZHBf Y3J0Y19hdG9taWNfY2hlY2srMHgzYzApOiB1bmRlZmluZWQgcmVmZXJlbmNlIHRvIGBfX2FlYWJp X3VsZGl2bW9kJwo+IG1hbGlkcF9jcnRjLmM6KC50ZXh0Lm1hbGlkcF9jcnRjX2F0b21pY19jaGVj aysweDNkYyk6IHVuZGVmaW5lZCByZWZlcmVuY2UgdG8gYF9fYWVhYmlfdWxkaXZtb2QnCj4gCj4g VGhpcyBjYWxscyB0aGUgZGl2X3U2NCBmdW5jdGlvbiBleHBsaWNpdGx5IGluc3RlYWQuCj4gCj4g Rml4ZXM6IDRjZWE0ZTlmNjY5MCAoImRybTogbWFsaS1kcDogQWRkIHBsYW5lIHVwc2NhbGluZyBz dXBwb3J0IikKPiBTaWduZWQtb2ZmLWJ5OiBBcm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgoK QWNrZWQtYnk6IExpdml1IER1ZGF1IDxsaXZpdS5kdWRhdUBhcm0uY29tPgoKSSdsbCBwdXNoIHRo ZSBwYXRjaCB0byB0aGUgbWFsaS1kcCByZXBvc2l0b3J5LiBEYXZlIEEuLCBpZiB5b3UgaGF2ZSBw dWxsZWQgdGhlIG1hbGktZHAKcGF0Y2hlcyB0aGVuIHRoaXMgd2lsbCBuZWVkIHRvIGdvIGluIGFz IHdlbGwsIG90aGVyd2lzZSBJIHdpbGwgc2VuZCBhbiB1cGRhdGVkIHB1bGwKcmVxdWVzdCBzb29u LgoKQmVzdCByZWdhcmRzLApMaXZpdQoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2FybS9tYWxp ZHBfY3J0Yy5jIHwgOSArKysrLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygr KSwgNSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FybS9t YWxpZHBfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2FybS9tYWxpZHBfY3J0Yy5jCj4gaW5kZXgg MTlmMWYzYjM0NjkxLi45NDQ2YTY3M2Q0NjkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FybS9tYWxpZHBfY3J0Yy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2FybS9tYWxpZHBfY3J0 Yy5jCj4gQEAgLTI2Niw3ICsyNjYsNiBAQCBzdGF0aWMgaW50IG1hbGlkcF9jcnRjX2F0b21pY19j aGVja19zY2FsaW5nKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgCj4gIAlkcm1fYXRvbWljX2Ny dGNfc3RhdGVfZm9yX2VhY2hfcGxhbmVfc3RhdGUocGxhbmUsIHBzdGF0ZSwgc3RhdGUpIHsKPiAg CQlzdHJ1Y3QgbWFsaWRwX3BsYW5lICptcCA9IHRvX21hbGlkcF9wbGFuZShwbGFuZSk7Cj4gLQkJ dTY0IGNydGNfdywgY3J0Y19oOwo+ICAJCXUzMiBwaGFzZTsKPiAgCj4gIAkJaWYgKCEobXAtPmxh eWVyLT5pZCAmIHNjYWxpbmcpKQo+IEBAIC0yNzYsMTAgKzI3NSwxMCBAQCBzdGF0aWMgaW50IG1h bGlkcF9jcnRjX2F0b21pY19jaGVja19zY2FsaW5nKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAg CQkgKiBDb252ZXJ0IGNydGNfW3d8aF0gdG8gVTMyLjMyLCB0aGVuIGRpdmlkZSBieSBVMTYuMTYg c3JjX1t3fGhdCj4gIAkJICogdG8gZ2V0IHRoZSBVMTYuMTYgcmVzdWx0Lgo+ICAJCSAqLwo+IC0J CWNydGNfdyA9ICh1NjQpcHN0YXRlLT5jcnRjX3cgPDwgMzI7Cj4gLQkJY3J0Y19oID0gKHU2NClw c3RhdGUtPmNydGNfaCA8PCAzMjsKPiAtCQloX3Vwc2NhbGVfZmFjdG9yID0gKHUzMikoY3J0Y193 IC8gcHN0YXRlLT5zcmNfdyk7Cj4gLQkJdl91cHNjYWxlX2ZhY3RvciA9ICh1MzIpKGNydGNfaCAv IHBzdGF0ZS0+c3JjX2gpOwo+ICsJCWhfdXBzY2FsZV9mYWN0b3IgPSBkaXZfdTY0KCh1NjQpcHN0 YXRlLT5jcnRjX3cgPDwgMzIsCj4gKwkJCQkJICAgcHN0YXRlLT5zcmNfdyk7Cj4gKwkJdl91cHNj YWxlX2ZhY3RvciA9IGRpdl91NjQoKHU2NClwc3RhdGUtPmNydGNfaCA8PCAzMiwKPiArCQkJCQkg ICBwc3RhdGUtPnNyY19oKTsKPiAgCj4gIAkJcy0+ZW5oYW5jZXJfZW5hYmxlID0gKChoX3Vwc2Nh bGVfZmFjdG9yID4+IDE2KSA+PSAyIHx8Cj4gIAkJCQkgICAgICAodl91cHNjYWxlX2ZhY3RvciA+ PiAxNikgPj0gMik7Cj4gLS0gCj4gMi45LjAKPiAKCi0tIAo9PT09PT09PT09PT09PT09PT09PQp8 IEkgd291bGQgbGlrZSB0byB8CnwgZml4IHRoZSB3b3JsZCwgIHwKfCBidXQgdGhleSdyZSBub3Qg fAp8IGdpdmluZyBtZSB0aGUgICB8CiBcIHNvdXJjZSBjb2RlISAgLwogIC0tLS0tLS0tLS0tLS0t LQogICAgwq9cXyjjg4QpXy/CrwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK