From 6ea22ec2a6c0b068a19e1d5c55d23a8cf057f9b7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 15 Apr 2020 19:44:19 +0200 Subject: [PATCH] fix up queue-4.19/drm-etnaviv-rework-perfmon-query-infrastructure.patch --- ...v-rework-perfmon-query-infrastructure.patch | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/queue-4.19/drm-etnaviv-rework-perfmon-query-infrastructure.patch b/queue-4.19/drm-etnaviv-rework-perfmon-query-infrastructure.patch index a38730ab941..3fb2e92b14d 100644 --- a/queue-4.19/drm-etnaviv-rework-perfmon-query-infrastructure.patch +++ b/queue-4.19/drm-etnaviv-rework-perfmon-query-infrastructure.patch @@ -18,12 +18,20 @@ Signed-off-by: Lucas Stach Signed-off-by: Greg Kroah-Hartman --- - drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 59 ++++++++++++++++++++++++++---- - 1 file changed, 52 insertions(+), 7 deletions(-) + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 60 ++++++++++++++++++++++++++---- + 1 file changed, 53 insertions(+), 7 deletions(-) --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c -@@ -31,6 +31,7 @@ struct etnaviv_pm_domain { +@@ -4,6 +4,7 @@ + * Copyright (C) 2017 Zodiac Inflight Innovations + */ + ++#include "common.xml.h" + #include "etnaviv_gpu.h" + #include "etnaviv_perfmon.h" + #include "state_hi.xml.h" +@@ -31,6 +32,7 @@ struct etnaviv_pm_domain { }; struct etnaviv_pm_domain_meta { @@ -31,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman const struct etnaviv_pm_domain *domains; u32 nr_domains; }; -@@ -388,36 +389,78 @@ static const struct etnaviv_pm_domain do +@@ -388,36 +390,78 @@ static const struct etnaviv_pm_domain do static const struct etnaviv_pm_domain_meta doms_meta[] = { { @@ -114,7 +122,7 @@ Signed-off-by: Greg Kroah-Hartman domain->iter = 0xff; return 0; -@@ -426,14 +469,16 @@ int etnaviv_pm_query_dom(struct etnaviv_ +@@ -426,14 +470,16 @@ int etnaviv_pm_query_dom(struct etnaviv_ int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu, struct drm_etnaviv_pm_signal *signal) { -- 2.47.3