aboutsummaryrefslogtreecommitdiffstats
diff options
authorStephen Rothwell <sfr@canb.auug.org.au>2022-06-28 08:56:35 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2022-06-28 08:56:35 +1000
commit426ccb4c911a392f6cb9799fa341e6c5e2a851f5 (patch)
tree2b157768baadcc626b53acb91a9b9dacc14818ee
parent7f26a45321a739f07f6efa5a63b3403d5b01cbde (diff)
parent5f701324c0fb6f9f5aaac3f8d1575321375f6d8f (diff)
downloadlinux-next-426ccb4c911a392f6cb9799fa341e6c5e2a851f5.tar.gz
Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc
-rw-r--r--drivers/gpu/drm/vc4/vc4_perfmon.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_perfmon.c b/drivers/gpu/drm/vc4/vc4_perfmon.c
index c7f5adb6bcf8b..79a74184d7328 100644
--- a/drivers/gpu/drm/vc4/vc4_perfmon.c
+++ b/drivers/gpu/drm/vc4/vc4_perfmon.c
@@ -17,13 +17,16 @@
void vc4_perfmon_get(struct vc4_perfmon *perfmon)
{
- struct vc4_dev *vc4 = perfmon->dev;
+ struct vc4_dev *vc4;
+ if (!perfmon)
+ return;
+
+ vc4 = perfmon->dev;
if (WARN_ON_ONCE(vc4->is_vc5))
return;
- if (perfmon)
- refcount_inc(&perfmon->refcnt);
+ refcount_inc(&perfmon->refcnt);
}
void vc4_perfmon_put(struct vc4_perfmon *perfmon)