linux-kernel - linux-next: build failure after merge of the drm-misc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230403121617.61e2a929@canb.auug.org.au>
Date:   Mon, 3 Apr 2023 12:16:17 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>
Cc:     Lucas Stach <l.stach@...gutronix.de>,
        Erico Nunes <nunes.erico@...il.com>,
        Qiang Yu <yuq825@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the drm-misc tree

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_do_release':
drivers/gpu/drm/lima/lima_ctx.c:53:45: error: 'struct drm_sched_entity' has no member named 'elapsed_ns'
   53 |                 mgr->elapsed_ns[i] += entity->elapsed_ns;
      |                                             ^~
drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_mgr_usage':
drivers/gpu/drm/lima/lima_ctx.c:125:43: error: 'struct drm_sched_entity' has no member named 'elapsed_ns'
  125 |                         usage[i] += entity->elapsed_ns;
      |                                           ^~

Caused by commit

  bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr")

interacting with commit

  baad10973fdb ("Revert "drm/scheduler: track GPU active time per entity"")

from Linus' tree.

I can't see any obvious way to fix this up, so I have used teh drm-misc
tree from next-20230331 for today.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped