From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A67CFC433E0 for ; Tue, 2 Jun 2020 03:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7322E207DF for ; Tue, 2 Jun 2020 03:15:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PPzN38p6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbgFBDPc (ORCPT ); Mon, 1 Jun 2020 23:15:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725841AbgFBDPc (ORCPT ); Mon, 1 Jun 2020 23:15:32 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDCB0C061A0E; Mon, 1 Jun 2020 20:15:31 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id n24so11291816ejd.0; Mon, 01 Jun 2020 20:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=1zA7vzfVV7uc5rZLCKmjvmtN9YrzTYU7uysspI8RouA=; b=PPzN38p6xS/1rWQfEtCi0O4QOug9WQQjXD1XbMet0iS1e8JQ30GJuGTJXnW5x6FE0H DrpcZpa6Ty1PQw9sS88mbWVxJEgW1X29azUSSaTZ3BPOxI/ZHijKeGUnb5z0ZJw0r+BQ zO3RIZfWe62ImNCqCKm4XbgkqDkq4IMyF8uCfxM/Mg0BqZUCtlLcfycgbtY9dnp6PPIY E0ouKgSPN3+reQ6t9tFW0JLGrh3U7YTEEM5bQ/8wW/AkNmhjG8yg9q9GfB2g2rsZmfa7 nP2DC9+Lr4olNjir+hBUf6adj7y8PKYt3VIfQHZ1rTY2zZBhCVsZLi4eL1AQqrTCRZ8q zLRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=1zA7vzfVV7uc5rZLCKmjvmtN9YrzTYU7uysspI8RouA=; b=KsTj/ld1Z8ClblwTuUqqDV8760Hg6G1UWIPDRPLJaShFGc2JGofwg6aSBRJbQqV+4j UbZRKSdrGiuwTAyasvWp0CyCQ+lPwD4D2E05vDHeqvJTQrJnqUpLhPGEwAsCPetbqttO j/XzSRSGSNPXjDbbo6rvLImU//x9gqinN7HenqWlRU3zEOvQbEXX8rN39zmVUd6TyIW+ VoHpaadrAT18qOqDnx0YlIar88RCicGz/EhWfCinYO2hfynZBj41jtBmPCKfr6m4ZMlh pULTlVMAScmZMY8eXAYQiOmuSseK0wQHtYHpdNwRmHgTZ1lZupiLY3cspDn6ybrYJP+y NEOQ== X-Gm-Message-State: AOAM533ID5u5RE1lEIRdTmezZahuymNsAveAKEmnwoWlXJUjJWftHpu4 IvrlgpQVb1TmhBwUc1lLosQqWpwBZBJ4k1Zd2hQ= X-Google-Smtp-Source: ABdhPJyq02skMdvnbFgxH+Z85m5rZGTGbYhnfGy3YwKQggLUpS4n22iGbzy6okTBJstef/6wnAtmGUglzx2G1145j1s= X-Received: by 2002:a17:906:4d04:: with SMTP id r4mr20985523eju.317.1591067730468; Mon, 01 Jun 2020 20:15:30 -0700 (PDT) MIME-Version: 1.0 References: <20200519150955.1667566a@canb.auug.org.au> <20200526140841.0a1d5c7b@canb.auug.org.au> <20200529141056.000f78ba@canb.auug.org.au> <20200602081532.653091c8@canb.auug.org.au> In-Reply-To: <20200602081532.653091c8@canb.auug.org.au> From: Dave Airlie Date: Tue, 2 Jun 2020 13:15:19 +1000 Message-ID: Subject: Re: inux-next: build failure after merge of the drm-msm tree To: Stephen Rothwell Cc: Dave Airlie , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Sean Paul , Kalyan Thota Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2 Jun 2020 at 08:15, Stephen Rothwell wrote: > > Hi Dave, > > On Fri, 29 May 2020 14:10:56 +1000 Stephen Rothwell wrote: > > > > On Tue, 26 May 2020 14:08:41 +1000 Stephen Rothwell wrote: > > > > > > On Tue, 19 May 2020 15:09:55 +1000 Stephen Rothwell wrote: > > > > > > > > After merging the drm-msm tree, today's linux-next build (arm > > > > multi_v7_defconfig) failed like this: > > > > > > > > ERROR: modpost: "__aeabi_ldivmod" [drivers/gpu/drm/msm/msm.ko] undefined! > > > > ERROR: modpost: "__aeabi_uldivmod" [drivers/gpu/drm/msm/msm.ko] undefined! > > > > > > > > Caused by commit > > > > > > > > 04d9044f6c57 ("drm/msm/dpu: add support for clk and bw scaling for display") > > > > > > > > I applied the following patch for today (this is mechanical, there may > > > > be a better way): > > > > > > > > From: Stephen Rothwell > > > > Date: Tue, 19 May 2020 14:12:39 +1000 > > > > Subject: [PATCH] drm/msm/dpu: fix up u64/u32 division for 32 bit architectures > > > > > > > > Signed-off-by: Stephen Rothwell > > > > --- > > > > drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 23 ++++++++++++++----- > > > > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 15 ++++++++---- > > > > 2 files changed, 28 insertions(+), 10 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c > > > > index 9697abcbec3f..85c2a4190840 100644 > > > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c > > > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c > > > > @@ -10,6 +10,7 @@ > > > > #include > > > > #include > > > > #include > > > > +#include > > > > > > > > #include "dpu_kms.h" > > > > #include "dpu_trace.h" > > > > @@ -53,8 +54,11 @@ static u64 _dpu_core_perf_calc_bw(struct dpu_kms *kms, > > > > } > > > > > > > > bw_factor = kms->catalog->perf.bw_inefficiency_factor; > > > > - if (bw_factor) > > > > - crtc_plane_bw = mult_frac(crtc_plane_bw, bw_factor, 100); > > > > + if (bw_factor) { > > > > + u64 quot = crtc_plane_bw; > > > > + u32 rem = do_div(quot, 100); > > > > + crtc_plane_bw = (quot * bw_factor) + ((rem * bw_factor) / 100); > > > > + } > > > > > > > > return crtc_plane_bw; > > > > } > > > > @@ -89,8 +93,11 @@ static u64 _dpu_core_perf_calc_clk(struct dpu_kms *kms, > > > > } > > > > > > > > clk_factor = kms->catalog->perf.clk_inefficiency_factor; > > > > - if (clk_factor) > > > > - crtc_clk = mult_frac(crtc_clk, clk_factor, 100); > > > > + if (clk_factor) { > > > > + u64 quot = crtc_clk; > > > > + u32 rem = do_div(quot, 100); > > > > + crtc_clk = (quot * clk_factor) + ((rem * clk_factor) / 100); > > > > + } > > > > > > > > return crtc_clk; > > > > } > > > > @@ -234,8 +241,12 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms, > > > > } > > > > } > > > > > > > > - avg_bw = kms->num_paths ? > > > > - perf.bw_ctl / kms->num_paths : 0; > > > > + if (kms->num_paths) { > > > > + avg_bw = perf.bw_ctl; > > > > + do_div(avg_bw, kms->num_paths); > > > > + } else { > > > > + avg_bw = 0; > > > > + } > > > > > > > > for (i = 0; i < kms->num_paths; i++) > > > > icc_set_bw(kms->path[i], > > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > > > > index c2a6e3dacd68..ad95f32eac13 100644 > > > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > > > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > > > > @@ -9,6 +9,7 @@ > > > > > > > > #include > > > > #include > > > > +#include > > > > > > > > #include > > > > #include > > > > @@ -174,7 +175,11 @@ static void _dpu_plane_calc_bw(struct drm_plane *plane, > > > > plane_prefill_bw = > > > > src_width * hw_latency_lines * fps * fmt->bpp * scale_factor; > > > > > > > > - plane_prefill_bw = mult_frac(plane_prefill_bw, mode->vtotal, (vbp+vpw)); > > > > + { > > > > + u64 quot = plane_prefill_bw; > > > > + u32 rem = do_div(plane_prefill_bw, vbp + vpw); > > > > + plane_prefill_bw = quot * mode->vtotal + rem * mode->vtotal / (vbp + vpw); > > > > + } > > > > > > > > pstate->plane_fetch_bw = max(plane_bw, plane_prefill_bw); > > > > } > > > > @@ -204,9 +209,11 @@ static void _dpu_plane_calc_clk(struct drm_plane *plane) > > > > pstate->plane_clk = > > > > dst_width * mode->vtotal * fps; > > > > > > > > - if (src_height > dst_height) > > > > - pstate->plane_clk = mult_frac(pstate->plane_clk, > > > > - src_height, dst_height); > > > > + if (src_height > dst_height) { > > > > + u64 quot = pstate->plane_clk; > > > > + u32 rem = do_div(quot, dst_height); > > > > + pstate->plane_clk = quot * src_height + rem * src_height / dst_height; > > > > + } > > > > } > > > > > > > > /** > > > > -- > > > > 2.26.2 > > > > > > I am still applying the above ... > > > > Still applying. > > > > Any comment even? > > I assume that the drm-msm tree is merged via the drm tree, so just > letting you know that as far as I can tell the above build failure has > not yet been addressed. > > [Another failure in the same commit (that I did not see) has been fixed] I haven't merged msm-next to my tree yet, it was based on a newer base so I held off. I'm going to sit on it for a few more hours, but I might just leave it off this week's menu. Dave.