mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
Revert "drm/etnaviv: export client GPU usage statistics via fdinfo"
This reverts commit97804a133c
, as it builds on top ofdf622729dd
("drm/scheduler: track GPU active time per entity") which needs to be reverted, as it introduces a use-after-free. Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
This commit is contained in:
parent
963b2e8c42
commit
2658d0d035
1 changed files with 1 additions and 42 deletions
|
@ -22,7 +22,6 @@
|
||||||
#include "etnaviv_gem.h"
|
#include "etnaviv_gem.h"
|
||||||
#include "etnaviv_mmu.h"
|
#include "etnaviv_mmu.h"
|
||||||
#include "etnaviv_perfmon.h"
|
#include "etnaviv_perfmon.h"
|
||||||
#include "common.xml.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* DRM operations:
|
* DRM operations:
|
||||||
|
@ -476,47 +475,7 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = {
|
||||||
ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW),
|
ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW),
|
||||||
};
|
};
|
||||||
|
|
||||||
static void etnaviv_fop_show_fdinfo(struct seq_file *m, struct file *f)
|
DEFINE_DRM_GEM_FOPS(fops);
|
||||||
{
|
|
||||||
struct drm_file *file = f->private_data;
|
|
||||||
struct drm_device *dev = file->minor->dev;
|
|
||||||
struct etnaviv_drm_private *priv = dev->dev_private;
|
|
||||||
struct etnaviv_file_private *ctx = file->driver_priv;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* For a description of the text output format used here, see
|
|
||||||
* Documentation/gpu/drm-usage-stats.rst.
|
|
||||||
*/
|
|
||||||
seq_printf(m, "drm-driver:\t%s\n", dev->driver->name);
|
|
||||||
seq_printf(m, "drm-client-id:\t%u\n", ctx->id);
|
|
||||||
|
|
||||||
for (int i = 0; i < ETNA_MAX_PIPES; i++) {
|
|
||||||
struct etnaviv_gpu *gpu = priv->gpu[i];
|
|
||||||
char engine[10] = "UNK";
|
|
||||||
int cur = 0;
|
|
||||||
|
|
||||||
if (!gpu)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (gpu->identity.features & chipFeatures_PIPE_2D)
|
|
||||||
cur = snprintf(engine, sizeof(engine), "2D");
|
|
||||||
if (gpu->identity.features & chipFeatures_PIPE_3D)
|
|
||||||
cur = snprintf(engine + cur, sizeof(engine) - cur,
|
|
||||||
"%s3D", cur ? "/" : "");
|
|
||||||
if (gpu->identity.nn_core_count > 0)
|
|
||||||
cur = snprintf(engine + cur, sizeof(engine) - cur,
|
|
||||||
"%sNN", cur ? "/" : "");
|
|
||||||
|
|
||||||
seq_printf(m, "drm-engine-%s:\t%llu ns\n", engine,
|
|
||||||
ctx->sched_entity[i].elapsed_ns);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct file_operations fops = {
|
|
||||||
.owner = THIS_MODULE,
|
|
||||||
DRM_GEM_FOPS,
|
|
||||||
.show_fdinfo = etnaviv_fop_show_fdinfo,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct drm_driver etnaviv_drm_driver = {
|
static const struct drm_driver etnaviv_drm_driver = {
|
||||||
.driver_features = DRIVER_GEM | DRIVER_RENDER,
|
.driver_features = DRIVER_GEM | DRIVER_RENDER,
|
||||||
|
|
Loading…
Reference in a new issue