* [PATCH 1/2] drm/msm/a6xx: Build a6xx_gpu_state under the right conditionals
@ 2018-11-06 7:08 Sharat Masetty
[not found] ` <1541488109-19959-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Sharat Masetty @ 2018-11-06 7:08 UTC (permalink / raw)
To: freedreno; +Cc: linux-arm-msm, Sharat Masetty, dri-devel
Build a6xx_gpu_state.c only if either of CONFIG_DEBUG_FS, CONFIG_DEV_COREDUMP
is defined.
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
---
drivers/gpu/drm/msm/Makefile | 5 ++++-
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index bfb0f08..404e3ae 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -14,7 +14,6 @@ msm-y := \
adreno/a6xx_gpu.o \
adreno/a6xx_gmu.o \
adreno/a6xx_hfi.o \
- adreno/a6xx_gpu_state.o \
hdmi/hdmi.o \
hdmi/hdmi_audio.o \
hdmi/hdmi_bridge.o \
@@ -97,6 +96,10 @@ msm-y := \
msm-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o \
disp/dpu1/dpu_dbg.o
+ifneq (,$(filter y,$(CONFIG_DEBUG_FS) $(CONFIG_DEV_COREDUMP)))
+msm-y += adreno/a6xx_gpu_state.o
+endif
+
msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o
msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 2c52b7c..9d1b8c9 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -754,12 +754,12 @@ static unsigned long a6xx_gpu_busy(struct msm_gpu *gpu, u64 *prev_cycles)
.destroy = a6xx_destroy,
#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP)
.show = a6xx_show,
+ .gpu_state_get = a6xx_gpu_state_get,
+ .gpu_state_put = a6xx_gpu_state_put,
#endif
.gpu_busy = a6xx_gpu_busy,
.gpu_get_freq = a6xx_gmu_get_freq,
.gpu_set_freq = a6xx_gmu_set_freq,
- .gpu_state_get = a6xx_gpu_state_get,
- .gpu_state_put = a6xx_gpu_state_put,
},
.get_timestamp = a6xx_get_timestamp,
};
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <1541488109-19959-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>]
* [PATCH 2/2] drm/msm/a6xx: Fix a typo in a6xx gpu crash state [not found] ` <1541488109-19959-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> @ 2018-11-06 7:08 ` Sharat Masetty [not found] ` <1541488109-19959-2-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2018-11-06 17:09 ` [PATCH 1/2] drm/msm/a6xx: Build a6xx_gpu_state under the right conditionals Jordan Crouse 1 sibling, 1 reply; 4+ messages in thread From: Sharat Masetty @ 2018-11-06 7:08 UTC (permalink / raw) To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, jcrouse-sgV2jX0FEOL9JmXXK+q4OQ, Sharat Masetty, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW This patch simply fixes a typo for the name of an indexed register. CP_MEMPOOOL -> CP_MEMPOOL. Signed-off-by: Sharat Masetty <smasetty@codeaurora.org> --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h index 68cccfa..bbbec8d 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h @@ -370,7 +370,7 @@ struct a6xx_registers { }; static const struct a6xx_indexed_registers a6xx_cp_mempool_indexed = { - "CP_MEMPOOOL", REG_A6XX_CP_MEM_POOL_DBG_ADDR, + "CP_MEMPOOL", REG_A6XX_CP_MEM_POOL_DBG_ADDR, REG_A6XX_CP_MEM_POOL_DBG_DATA, 0x2060, }; -- 1.9.1 _______________________________________________ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno ^ permalink raw reply related [flat|nested] 4+ messages in thread
[parent not found: <1541488109-19959-2-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>]
* Re: [PATCH 2/2] drm/msm/a6xx: Fix a typo in a6xx gpu crash state [not found] ` <1541488109-19959-2-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> @ 2018-11-06 17:10 ` Jordan Crouse 0 siblings, 0 replies; 4+ messages in thread From: Jordan Crouse @ 2018-11-06 17:10 UTC (permalink / raw) To: Sharat Masetty Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW On Tue, Nov 06, 2018 at 12:38:29PM +0530, Sharat Masetty wrote: > This patch simply fixes a typo for the name of an indexed register. > CP_MEMPOOOL -> CP_MEMPOOL. > > Signed-off-by: Sharat Masetty <smasetty@codeaurora.org> Reviewed by: Jordan Crouse <jcrouse@codeaurora.org> > --- > drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h > index 68cccfa..bbbec8d 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h > @@ -370,7 +370,7 @@ struct a6xx_registers { > }; > > static const struct a6xx_indexed_registers a6xx_cp_mempool_indexed = { > - "CP_MEMPOOOL", REG_A6XX_CP_MEM_POOL_DBG_ADDR, > + "CP_MEMPOOL", REG_A6XX_CP_MEM_POOL_DBG_ADDR, > REG_A6XX_CP_MEM_POOL_DBG_DATA, 0x2060, > }; > > -- > 1.9.1 > -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/msm/a6xx: Build a6xx_gpu_state under the right conditionals [not found] ` <1541488109-19959-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2018-11-06 7:08 ` [PATCH 2/2] drm/msm/a6xx: Fix a typo in a6xx gpu crash state Sharat Masetty @ 2018-11-06 17:09 ` Jordan Crouse 1 sibling, 0 replies; 4+ messages in thread From: Jordan Crouse @ 2018-11-06 17:09 UTC (permalink / raw) To: Sharat Masetty Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW On Tue, Nov 06, 2018 at 12:38:28PM +0530, Sharat Masetty wrote: > Build a6xx_gpu_state.c only if either of CONFIG_DEBUG_FS, CONFIG_DEV_COREDUMP > is defined. Can you do the same for the other targets too? With that, Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org> > Signed-off-by: Sharat Masetty <smasetty@codeaurora.org> > --- > drivers/gpu/drm/msm/Makefile | 5 ++++- > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++-- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile > index bfb0f08..404e3ae 100644 > --- a/drivers/gpu/drm/msm/Makefile > +++ b/drivers/gpu/drm/msm/Makefile > @@ -14,7 +14,6 @@ msm-y := \ > adreno/a6xx_gpu.o \ > adreno/a6xx_gmu.o \ > adreno/a6xx_hfi.o \ > - adreno/a6xx_gpu_state.o \ > hdmi/hdmi.o \ > hdmi/hdmi_audio.o \ > hdmi/hdmi_bridge.o \ > @@ -97,6 +96,10 @@ msm-y := \ > msm-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o \ > disp/dpu1/dpu_dbg.o > > +ifneq (,$(filter y,$(CONFIG_DEBUG_FS) $(CONFIG_DEV_COREDUMP))) > +msm-y += adreno/a6xx_gpu_state.o > +endif > + > msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o > msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o > msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > index 2c52b7c..9d1b8c9 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > @@ -754,12 +754,12 @@ static unsigned long a6xx_gpu_busy(struct msm_gpu *gpu, u64 *prev_cycles) > .destroy = a6xx_destroy, > #if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP) > .show = a6xx_show, > + .gpu_state_get = a6xx_gpu_state_get, > + .gpu_state_put = a6xx_gpu_state_put, > #endif > .gpu_busy = a6xx_gpu_busy, > .gpu_get_freq = a6xx_gmu_get_freq, > .gpu_set_freq = a6xx_gmu_set_freq, > - .gpu_state_get = a6xx_gpu_state_get, > - .gpu_state_put = a6xx_gpu_state_put, > }, > .get_timestamp = a6xx_get_timestamp, > }; > -- > 1.9.1 > -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-06 17:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-06 7:08 [PATCH 1/2] drm/msm/a6xx: Build a6xx_gpu_state under the right conditionals Sharat Masetty
[not found] ` <1541488109-19959-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 7:08 ` [PATCH 2/2] drm/msm/a6xx: Fix a typo in a6xx gpu crash state Sharat Masetty
[not found] ` <1541488109-19959-2-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-11-06 17:10 ` Jordan Crouse
2018-11-06 17:09 ` [PATCH 1/2] drm/msm/a6xx: Build a6xx_gpu_state under the right conditionals Jordan Crouse
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox