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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79324C77B60 for ; Mon, 3 Apr 2023 08:51:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231638AbjDCIvn (ORCPT ); Mon, 3 Apr 2023 04:51:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229785AbjDCIvk (ORCPT ); Mon, 3 Apr 2023 04:51:40 -0400 Received: from mail-ua1-x92b.google.com (mail-ua1-x92b.google.com [IPv6:2607:f8b0:4864:20::92b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD2653AB2; Mon, 3 Apr 2023 01:51:39 -0700 (PDT) Received: by mail-ua1-x92b.google.com with SMTP id m5so20276578uae.11; Mon, 03 Apr 2023 01:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680511899; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=FymDryzt1xBzbE+SpKvnTozEFbclbNgIFpbMS++SyVU=; b=WQLhONVAXpN5OHyuTesxZLQCVH84lLcS8R//4zp4N5W1jHxF5GlEOMu++thn0Z8osa wse+65L8OESh9bizgwSYVrNCi5XOk2wqGxaeu9Jxmgn9TswzAZPTyxn8SbhIhHNbLlwk giSe4Ewsddb2G9rIwlLNlJdMjHjB19E39XCmz6rhVoPMVxtkOKu0NmFmvPeczy7Lmq/+ Ne6t3WZ+wZXYABufxAHZokA+Q9B2D8HCKfkyK+yTg4Sa5g5/DiZnb7eYyOKjkmS56/BD 13NPRof6md+4O6dicSgoOh5+j6l/+pCyvlFC5fZ2DLSyGJjreVZCYeHqHgz1x/zNg8lH 0BnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680511899; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FymDryzt1xBzbE+SpKvnTozEFbclbNgIFpbMS++SyVU=; b=Hjx5KhezhMm0BT3/r1LXb1qyNPu6+boXvynn1o560iA7QVj+FBn0B3gZZqjWxqoNu/ L/W0hBdtYDN8KxMiPV1lQy2GPsAF4QOxesM0HHC5VYQVQxIwodMroIvdWoAa5iV9HQmu hALKT/oWDwJB9ANiFqj58jwPiTTdIuAPUynKiG8OCnLz1ETbRNd3hsweT5cwV6+i251W w7Wpj1e153GlMkQ/qT641G+gBkMlPO30SDi+MuCsjgbYLd15IsMo/e1UD7eFSVf5KNrl rW2hax6p+c4xD02z62fHowQpPeEn+W6xGrSpZyoFOuiqKr0U+l35A0pjahWXVJ5wcK0h aTnA== X-Gm-Message-State: AAQBX9crVi7l5+mLaawslpggxErt99Qt2912gHz0UcqWszmhsCfXNRnS pqJNe+CxA4tj38poVQJ6Dddo97yuQTfZDb6IpXk= X-Google-Smtp-Source: AKy350b4qh7ooTYUZmD0lqPsElUdZR/+GMJIQH4u47foRbem0nU3YeXjFhuoxUqXFrG8UrY6FG7/2VR2qiQ4iBbIXAk= X-Received: by 2002:a1f:a8d4:0:b0:43c:6ef1:7200 with SMTP id r203-20020a1fa8d4000000b0043c6ef17200mr1391338vke.3.1680511898929; Mon, 03 Apr 2023 01:51:38 -0700 (PDT) MIME-Version: 1.0 References: <20230403121617.61e2a929@canb.auug.org.au> In-Reply-To: <20230403121617.61e2a929@canb.auug.org.au> From: Qiang Yu Date: Mon, 3 Apr 2023 16:51:27 +0800 Message-ID: Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell Cc: Daniel Vetter , Intel Graphics , DRI , Lucas Stach , Erico Nunes , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I think you can just revert the following three lima commits when merge: * 4a66f3da99dc ("drm/lima: add show_fdinfo for drm usage stats") * 87767de835ed ("drm/lima: allocate unique id per drm_file") * bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr") Regards, Qiang On Mon, Apr 3, 2023 at 10:16=E2=80=AFAM Stephen Rothwell wrote: > > 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' h= as no member named 'elapsed_ns' > 53 | mgr->elapsed_ns[i] +=3D 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] +=3D 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 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E04F5C761A6 for ; Mon, 3 Apr 2023 08:51:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D920310E38B; Mon, 3 Apr 2023 08:51:42 +0000 (UTC) Received: from mail-ua1-x92e.google.com (mail-ua1-x92e.google.com [IPv6:2607:f8b0:4864:20::92e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 376B110E38B; Mon, 3 Apr 2023 08:51:40 +0000 (UTC) Received: by mail-ua1-x92e.google.com with SMTP id t20so2802823uaw.5; Mon, 03 Apr 2023 01:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680511899; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=FymDryzt1xBzbE+SpKvnTozEFbclbNgIFpbMS++SyVU=; b=WQLhONVAXpN5OHyuTesxZLQCVH84lLcS8R//4zp4N5W1jHxF5GlEOMu++thn0Z8osa wse+65L8OESh9bizgwSYVrNCi5XOk2wqGxaeu9Jxmgn9TswzAZPTyxn8SbhIhHNbLlwk giSe4Ewsddb2G9rIwlLNlJdMjHjB19E39XCmz6rhVoPMVxtkOKu0NmFmvPeczy7Lmq/+ Ne6t3WZ+wZXYABufxAHZokA+Q9B2D8HCKfkyK+yTg4Sa5g5/DiZnb7eYyOKjkmS56/BD 13NPRof6md+4O6dicSgoOh5+j6l/+pCyvlFC5fZ2DLSyGJjreVZCYeHqHgz1x/zNg8lH 0BnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680511899; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FymDryzt1xBzbE+SpKvnTozEFbclbNgIFpbMS++SyVU=; b=VmGGbxq3fYoAC4eQgc2Ldck8LB4+aKa8L5m3e3jpanbdx3p0BdqMxh+dxmaRjRXI5A 5ozsLMzj2oKm1k8nc63xB5fhSTY8Jo7g2B/X+2BNqSFD3CY5oC9CIR4Gn3+FjfYhmr22 XR+yH5I3AyYrddCC99PVuZ05RzhMwwBjpi2WZm7CLLwOV2YSSxE2mUWSuTy7mc/nPYn8 d3QNeWu1H9eqSM/2wno3I1tms8i0pnqtPMjKnQt+Vlkt6Jl9V0MDXOH8YjcVbmvXNa9k 4mFN+HCFv0szwzG5Rci3+cLm1ZzeTcNC5BL67h0KKCk8rgQCBthL+7uXZC82JQajkxYN nCrQ== X-Gm-Message-State: AAQBX9elZt0B9nzmuMLvmtfPb8X1LnvL2Jpr0lrkzoz8uCaGKfEeCKKS ka60fGBiOLSnLJhoBzqGat3AO/gpYkD/x/4YFP8= X-Google-Smtp-Source: AKy350b4qh7ooTYUZmD0lqPsElUdZR/+GMJIQH4u47foRbem0nU3YeXjFhuoxUqXFrG8UrY6FG7/2VR2qiQ4iBbIXAk= X-Received: by 2002:a1f:a8d4:0:b0:43c:6ef1:7200 with SMTP id r203-20020a1fa8d4000000b0043c6ef17200mr1391338vke.3.1680511898929; Mon, 03 Apr 2023 01:51:38 -0700 (PDT) MIME-Version: 1.0 References: <20230403121617.61e2a929@canb.auug.org.au> In-Reply-To: <20230403121617.61e2a929@canb.auug.org.au> From: Qiang Yu Date: Mon, 3 Apr 2023 16:51:27 +0800 Message-ID: Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Erico Nunes Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" I think you can just revert the following three lima commits when merge: * 4a66f3da99dc ("drm/lima: add show_fdinfo for drm usage stats") * 87767de835ed ("drm/lima: allocate unique id per drm_file") * bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr") Regards, Qiang On Mon, Apr 3, 2023 at 10:16=E2=80=AFAM Stephen Rothwell wrote: > > 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' h= as no member named 'elapsed_ns' > 53 | mgr->elapsed_ns[i] +=3D 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] +=3D 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 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E3A8FC77B62 for ; Mon, 3 Apr 2023 08:51:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0D0C10E3B8; Mon, 3 Apr 2023 08:51:42 +0000 (UTC) Received: from mail-ua1-x92e.google.com (mail-ua1-x92e.google.com [IPv6:2607:f8b0:4864:20::92e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 376B110E38B; Mon, 3 Apr 2023 08:51:40 +0000 (UTC) Received: by mail-ua1-x92e.google.com with SMTP id t20so2802823uaw.5; Mon, 03 Apr 2023 01:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680511899; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=FymDryzt1xBzbE+SpKvnTozEFbclbNgIFpbMS++SyVU=; b=WQLhONVAXpN5OHyuTesxZLQCVH84lLcS8R//4zp4N5W1jHxF5GlEOMu++thn0Z8osa wse+65L8OESh9bizgwSYVrNCi5XOk2wqGxaeu9Jxmgn9TswzAZPTyxn8SbhIhHNbLlwk giSe4Ewsddb2G9rIwlLNlJdMjHjB19E39XCmz6rhVoPMVxtkOKu0NmFmvPeczy7Lmq/+ Ne6t3WZ+wZXYABufxAHZokA+Q9B2D8HCKfkyK+yTg4Sa5g5/DiZnb7eYyOKjkmS56/BD 13NPRof6md+4O6dicSgoOh5+j6l/+pCyvlFC5fZ2DLSyGJjreVZCYeHqHgz1x/zNg8lH 0BnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680511899; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FymDryzt1xBzbE+SpKvnTozEFbclbNgIFpbMS++SyVU=; b=VmGGbxq3fYoAC4eQgc2Ldck8LB4+aKa8L5m3e3jpanbdx3p0BdqMxh+dxmaRjRXI5A 5ozsLMzj2oKm1k8nc63xB5fhSTY8Jo7g2B/X+2BNqSFD3CY5oC9CIR4Gn3+FjfYhmr22 XR+yH5I3AyYrddCC99PVuZ05RzhMwwBjpi2WZm7CLLwOV2YSSxE2mUWSuTy7mc/nPYn8 d3QNeWu1H9eqSM/2wno3I1tms8i0pnqtPMjKnQt+Vlkt6Jl9V0MDXOH8YjcVbmvXNa9k 4mFN+HCFv0szwzG5Rci3+cLm1ZzeTcNC5BL67h0KKCk8rgQCBthL+7uXZC82JQajkxYN nCrQ== X-Gm-Message-State: AAQBX9elZt0B9nzmuMLvmtfPb8X1LnvL2Jpr0lrkzoz8uCaGKfEeCKKS ka60fGBiOLSnLJhoBzqGat3AO/gpYkD/x/4YFP8= X-Google-Smtp-Source: AKy350b4qh7ooTYUZmD0lqPsElUdZR/+GMJIQH4u47foRbem0nU3YeXjFhuoxUqXFrG8UrY6FG7/2VR2qiQ4iBbIXAk= X-Received: by 2002:a1f:a8d4:0:b0:43c:6ef1:7200 with SMTP id r203-20020a1fa8d4000000b0043c6ef17200mr1391338vke.3.1680511898929; Mon, 03 Apr 2023 01:51:38 -0700 (PDT) MIME-Version: 1.0 References: <20230403121617.61e2a929@canb.auug.org.au> In-Reply-To: <20230403121617.61e2a929@canb.auug.org.au> From: Qiang Yu Date: Mon, 3 Apr 2023 16:51:27 +0800 Message-ID: To: Stephen Rothwell Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Lucas Stach , Erico Nunes Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" I think you can just revert the following three lima commits when merge: * 4a66f3da99dc ("drm/lima: add show_fdinfo for drm usage stats") * 87767de835ed ("drm/lima: allocate unique id per drm_file") * bccafec957a5 ("drm/lima: add usage counting method to ctx_mgr") Regards, Qiang On Mon, Apr 3, 2023 at 10:16=E2=80=AFAM Stephen Rothwell wrote: > > 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' h= as no member named 'elapsed_ns' > 53 | mgr->elapsed_ns[i] +=3D 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] +=3D 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