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 C1276CF31A9 for ; Wed, 2 Oct 2024 09:58:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 33DCB10E6E8; Wed, 2 Oct 2024 09:58:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="Ke2ig3SH"; dkim-atps=neutral Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24F3810E6E8 for ; Wed, 2 Oct 2024 09:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1727863096; bh=1Wu8gz7SNzE9dXIwLl9sRnsY2wkdlQOxuOY5+fjdyqI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Ke2ig3SHS7s7dXwARMfmB9XJ61pBF6kaCdZg5QrB9Srd46sNo/Bb5iXZkEajhb7vX nikfkWpPbE6Hqki5JbKTVWFfNLZxdXO/z7GQegFFisR6xYw4pVx7fHAC6JE8Qd3MnC wjqX/CtSlqnuOZXDy5Rm+65uEuDvQG+cclV1wLjuvqGtDcuBgHnRKEvuHakTTOeDTd 1JEY1bWlNj/VBozV7XDbap1gp5CC/0JvZO2MyC69F13QQkn8xXy8hbtqhmTcnx//EE xUWDI/hNe+t3DLHVzoThxtsQs0xmdYu/WzK0Ii9bi7iPCm6veGb09NPWTfmRvblERQ E8jV36Akd5VxQ== Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bbrezillon) by bali.collaboradmins.com (Postfix) with ESMTPSA id 14B1C17E120E; Wed, 2 Oct 2024 11:58:16 +0200 (CEST) Date: Wed, 2 Oct 2024 11:58:10 +0200 From: Boris Brezillon To: Jani Nikula Cc: =?UTF-8?B?QWRyacOhbg==?= Larumbe , Steven Price , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , Christian =?UTF-8?B?S8O2bmln?= , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: Re: [PATCH v8 0/5] Support fdinfo runtime and memory stats on Panthor Message-ID: <20241002115810.32cbde0c@collabora.com> In-Reply-To: <877caqvorq.fsf@intel.com> References: <20240923230912.2207320-1-adrian.larumbe@collabora.com> <20241002105715.18ec024c@collabora.com> <877caqvorq.fsf@intel.com> Organization: Collabora X-Mailer: Claws Mail 4.3.0 (GTK 3.24.43; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, 02 Oct 2024 12:26:49 +0300 Jani Nikula wrote: > On Wed, 02 Oct 2024, Boris Brezillon wrote: > > Queued to drm-misc-next after applying the few modifications I > > mentioned. Also added Steve's ack (given on IRC) on the first patch. > > Can we have the drm-tip rebuild conflict resolution too, please? Oops, sorry. Should be good now. > > diff --cc drivers/gpu/drm/panthor/panthor_drv.c > index c520f156e2d7,f9b93f84d611..000000000000 > --- a/drivers/gpu/drm/panthor/panthor_drv.c > +++ b/drivers/gpu/drm/panthor/panthor_drv.c > @@@ -1383,7 -1476,7 +1476,11 @@@ static const struct file_operations pan > .read = drm_read, > .llseek = noop_llseek, > .mmap = panthor_mmap, > ++<<<<<<< HEAD > + .fop_flags = FOP_UNSIGNED_OFFSET, > ++======= > + .show_fdinfo = drm_show_fdinfo, > ++>>>>>>> drm-misc/drm-misc-next > }; > > #ifdef CONFIG_DEBUG_FS