diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-11-01 11:09:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-01 11:10:08 +1000 |
| commit | ec26530c8cb897858a9c440a9e006dcd7efafcdc (patch) | |
| tree | 9ac77b589cda6dbb607b97eabb85c81dfcaeb715 /drivers/gpu/drm/panfrost/panfrost_perfcnt.c | |
| parent | 6f966213fea0adf91684074e37177d2d61228137 (diff) | |
| parent | f70744c68779c8a72a0c82294e3233b994af656d (diff) | |
Merge tag 'drm-misc-fixes-2019-10-30-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
- three fixes for panfrost, one to silence a warning, one to fix
runtime_pm and one to prevent bogus pointer dereferences
- one fix for a memleak in v3d
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191030182207.evrscl7lnv42u5zu@hendrix
Diffstat (limited to 'drivers/gpu/drm/panfrost/panfrost_perfcnt.c')
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c index 83c57d325ca8..2dba192bf198 100644 --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c @@ -16,6 +16,7 @@ #include "panfrost_issues.h" #include "panfrost_job.h" #include "panfrost_mmu.h" +#include "panfrost_perfcnt.h" #include "panfrost_regs.h" #define COUNTERS_PER_BLOCK 64 |