From: Boris Brezillon <boris.brezillon@collabora.com>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: "Adrián Larumbe" <adrian.larumbe@collabora.com>,
"Steven Price" <steven.price@arm.com>,
"Liviu Dudau" <liviu.dudau@arm.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Christian König" <christian.koenig@amd.com>,
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
Date: Wed, 2 Oct 2024 11:58:10 +0200 [thread overview]
Message-ID: <20241002115810.32cbde0c@collabora.com> (raw)
In-Reply-To: <877caqvorq.fsf@intel.com>
On Wed, 02 Oct 2024 12:26:49 +0300
Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Wed, 02 Oct 2024, Boris Brezillon <boris.brezillon@collabora.com> 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
prev parent reply other threads:[~2024-10-02 9:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-23 23:06 [PATCH v8 0/5] Support fdinfo runtime and memory stats on Panthor Adrián Larumbe
2024-09-23 23:06 ` [PATCH v8 1/5] drm/panthor: introduce job cycle and timestamp accounting Adrián Larumbe
2024-10-02 8:38 ` Boris Brezillon
2024-10-02 8:54 ` Steven Price
2024-09-23 23:06 ` [PATCH v8 2/5] drm/panthor: record current and maximum device clock frequencies Adrián Larumbe
2024-09-23 23:06 ` [PATCH v8 3/5] drm/panthor: add DRM fdinfo support Adrián Larumbe
2024-09-29 0:25 ` kernel test robot
2024-10-02 8:14 ` Boris Brezillon
2024-10-02 8:40 ` Boris Brezillon
2024-09-23 23:06 ` [PATCH v8 4/5] drm/panthor: enable fdinfo for memory stats Adrián Larumbe
2024-09-23 23:06 ` [PATCH v8 5/5] drm/panthor: add sysfs knob for enabling job profiling Adrián Larumbe
2024-10-02 8:57 ` [PATCH v8 0/5] Support fdinfo runtime and memory stats on Panthor Boris Brezillon
2024-10-02 9:26 ` Jani Nikula
2024-10-02 9:58 ` Boris Brezillon [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241002115810.32cbde0c@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=adrian.larumbe@collabora.com \
--cc=airlied@gmail.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=kernel@collabora.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=simona@ffwll.ch \
--cc=steven.price@arm.com \
--cc=sumit.semwal@linaro.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).