From: Leo Liu <leo.liu@amd.com>
To: James Zhu <James.Zhu@amd.com>, amd-gfx@lists.freedesktop.org
Cc: jamesz@amd.com
Subject: Re: [PATCH 1/6] drm/amdgpu/vcn: support multiple-instance dpg pause mode
Date: Tue, 14 Jan 2020 14:00:03 -0500 [thread overview]
Message-ID: <838ed7fa-ac94-d6bc-10fd-3633a2b1cf8d@amd.com> (raw)
In-Reply-To: <1579024702-27996-2-git-send-email-James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
On 2020-01-14 12:58 p.m., James Zhu wrote:
> Add multiple-instance dpg pause mode support for VCN2.5
>
> Signed-off-by: James Zhu <James.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 ++--
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index ed106d9..99df693 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -298,7 +298,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work)
> else
> new_state.fw_based = VCN_DPG_STATE__UNPAUSE;
>
> - adev->vcn.pause_dpg_mode(adev, &new_state);
> + adev->vcn.pause_dpg_mode(adev, j, &new_state);
> }
>
> fence[j] += amdgpu_fence_count_emitted(&adev->vcn.inst[j].ring_dec);
> @@ -341,7 +341,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)
> if (ring->funcs->type == AMDGPU_RING_TYPE_VCN_ENC)
> new_state.fw_based = VCN_DPG_STATE__PAUSE;
>
> - adev->vcn.pause_dpg_mode(adev, &new_state);
> + adev->vcn.pause_dpg_mode(adev, ring->me, &new_state);
> }
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index e6dee82..26c6623 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -199,7 +199,7 @@ struct amdgpu_vcn {
>
> unsigned harvest_config;
> int (*pause_dpg_mode)(struct amdgpu_device *adev,
> - struct dpg_pause_state *new_state);
> + int inst_idx, struct dpg_pause_state *new_state);
> };
>
> int amdgpu_vcn_sw_init(struct amdgpu_device *adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> index 3b025a3..a70351f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> @@ -50,7 +50,7 @@ static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev);
> static void vcn_v1_0_set_irq_funcs(struct amdgpu_device *adev);
> static int vcn_v1_0_set_powergating_state(void *handle, enum amd_powergating_state state);
> static int vcn_v1_0_pause_dpg_mode(struct amdgpu_device *adev,
> - struct dpg_pause_state *new_state);
> + int inst_idx, struct dpg_pause_state *new_state);
>
> static void vcn_v1_0_idle_work_handler(struct work_struct *work);
>
> @@ -1199,7 +1199,7 @@ static int vcn_v1_0_stop(struct amdgpu_device *adev)
> }
>
> static int vcn_v1_0_pause_dpg_mode(struct amdgpu_device *adev,
> - struct dpg_pause_state *new_state)
> + int inst_idx, struct dpg_pause_state *new_state)
> {
> int ret_code;
> uint32_t reg_data = 0;
> @@ -1786,7 +1786,7 @@ static void vcn_v1_0_idle_work_handler(struct work_struct *work)
> else
> new_state.jpeg = VCN_DPG_STATE__UNPAUSE;
>
> - adev->vcn.pause_dpg_mode(adev, &new_state);
> + adev->vcn.pause_dpg_mode(adev, 0, &new_state);
> }
>
> fences += amdgpu_fence_count_emitted(&adev->jpeg.inst->ring_dec);
> @@ -1840,7 +1840,7 @@ void vcn_v1_0_ring_begin_use(struct amdgpu_ring *ring)
> else if (ring->funcs->type == AMDGPU_RING_TYPE_VCN_JPEG)
> new_state.jpeg = VCN_DPG_STATE__PAUSE;
>
> - adev->vcn.pause_dpg_mode(adev, &new_state);
> + adev->vcn.pause_dpg_mode(adev, 0, &new_state);
> }
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index d76ece3..dcdc7ad 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -58,7 +58,7 @@ static void vcn_v2_0_set_irq_funcs(struct amdgpu_device *adev);
> static int vcn_v2_0_set_powergating_state(void *handle,
> enum amd_powergating_state state);
> static int vcn_v2_0_pause_dpg_mode(struct amdgpu_device *adev,
> - struct dpg_pause_state *new_state);
> + int inst_idx, struct dpg_pause_state *new_state);
>
> /**
> * vcn_v2_0_early_init - set function pointers
> @@ -1135,7 +1135,7 @@ static int vcn_v2_0_stop(struct amdgpu_device *adev)
> }
>
> static int vcn_v2_0_pause_dpg_mode(struct amdgpu_device *adev,
> - struct dpg_pause_state *new_state)
> + int inst_idx, struct dpg_pause_state *new_state)
> {
> struct amdgpu_ring *ring;
> uint32_t reg_data = 0;
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2020-01-14 19:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 17:58 [PATCH 0/6] support ArcturusIFM workaround James Zhu
2020-01-14 17:58 ` [PATCH 1/6] drm/amdgpu/vcn: support multiple-instance dpg pause mode James Zhu
2020-01-14 19:00 ` Leo Liu [this message]
2020-01-14 17:58 ` [PATCH 2/6] drm/amdgpu/vcn2.5: add direct SRAM read and write James Zhu
2020-01-14 19:06 ` Leo Liu
2020-01-14 19:17 ` James Zhu
2020-01-14 17:58 ` [PATCH 3/6] drm/amdgpu/vcn2.5: add DPG mode start and stop James Zhu
2020-01-14 18:58 ` [PATCH v2 " James Zhu
2020-01-14 17:58 ` [PATCH 4/6] drm/amdgpu/vcn2.5: add dpg pause mode James Zhu
2020-01-14 19:10 ` Leo Liu
2020-01-14 19:20 ` James Zhu
2020-01-14 17:58 ` [PATCH 5/6] drm/amdgpu/vcn: support multiple-instance dpg sram mode James Zhu
2020-01-14 17:58 ` [PATCH 6/6] drm/amdgpu/vcn2.5: implement indirect DPG SRAM mode James Zhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=838ed7fa-ac94-d6bc-10fd-3633a2b1cf8d@amd.com \
--to=leo.liu@amd.com \
--cc=James.Zhu@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=jamesz@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).