[PATCH 05/12] drm/amdgpu: remove IV prescreening
Huang Rui
ray.huang at amd.com
Thu Sep 27 10:28:16 UTC 2018
On Wed, Sep 26, 2018 at 03:53:23PM +0200, Christian König wrote:
> Not used any more.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
This patch should be merged to patch 3, that totally remove prescreen_iv
interface.
Thanks,
Ray
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 2 --
> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ----
> drivers/gpu/drm/amd/amdgpu/cik_ih.c | 13 -------------
> drivers/gpu/drm/amd/amdgpu/cz_ih.c | 13 -------------
> drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 13 -------------
> drivers/gpu/drm/amd/amdgpu/si_ih.c | 14 --------------
> drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 13 -------------
> drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 13 -------------
> 8 files changed, 85 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
> index 9ce8c93ec19b..f877bb78d10a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
> @@ -51,14 +51,12 @@ struct amdgpu_ih_ring {
> struct amdgpu_ih_funcs {
> /* ring read/write ptr handling, called from interrupt context */
> u32 (*get_wptr)(struct amdgpu_device *adev);
> - bool (*prescreen_iv)(struct amdgpu_device *adev);
> void (*decode_iv)(struct amdgpu_device *adev,
> struct amdgpu_iv_entry *entry);
> void (*set_rptr)(struct amdgpu_device *adev);
> };
>
> #define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))
> -#define amdgpu_ih_prescreen_iv(adev) (adev)->irq.ih_funcs->prescreen_iv((adev))
> #define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))
> #define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev))
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> index 8f0bc3f2e163..613ee1b76b25 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> @@ -162,10 +162,6 @@ static void amdgpu_irq_callback(struct amdgpu_device *adev,
> u32 ring_index = ih->rptr >> 2;
> struct amdgpu_iv_entry entry;
>
> - /* Prescreening of high-frequency interrupts */
> - if (!amdgpu_ih_prescreen_iv(adev))
> - return;
> -
> entry.iv_entry = (const uint32_t *)&ih->ring[ring_index];
> amdgpu_ih_decode_iv(adev, &entry);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
> index 3e6c8c4067cb..8a8b4967a101 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
> @@ -228,18 +228,6 @@ static u32 cik_ih_get_wptr(struct amdgpu_device *adev)
> * [127:96] - reserved
> */
>
> -/**
> - * cik_ih_prescreen_iv - prescreen an interrupt vector
> - *
> - * @adev: amdgpu_device pointer
> - *
> - * Returns true if the interrupt vector should be further processed.
> - */
> -static bool cik_ih_prescreen_iv(struct amdgpu_device *adev)
> -{
> - return true;
> -}
> -
> /**
> * cik_ih_decode_iv - decode an interrupt vector
> *
> @@ -445,7 +433,6 @@ static const struct amd_ip_funcs cik_ih_ip_funcs = {
>
> static const struct amdgpu_ih_funcs cik_ih_funcs = {
> .get_wptr = cik_ih_get_wptr,
> - .prescreen_iv = cik_ih_prescreen_iv,
> .decode_iv = cik_ih_decode_iv,
> .set_rptr = cik_ih_set_rptr
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/cz_ih.c b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
> index 447b3cbc47e5..9d3ea298e116 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cz_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
> @@ -207,18 +207,6 @@ static u32 cz_ih_get_wptr(struct amdgpu_device *adev)
> return (wptr & adev->irq.ih.ptr_mask);
> }
>
> -/**
> - * cz_ih_prescreen_iv - prescreen an interrupt vector
> - *
> - * @adev: amdgpu_device pointer
> - *
> - * Returns true if the interrupt vector should be further processed.
> - */
> -static bool cz_ih_prescreen_iv(struct amdgpu_device *adev)
> -{
> - return true;
> -}
> -
> /**
> * cz_ih_decode_iv - decode an interrupt vector
> *
> @@ -426,7 +414,6 @@ static const struct amd_ip_funcs cz_ih_ip_funcs = {
>
> static const struct amdgpu_ih_funcs cz_ih_funcs = {
> .get_wptr = cz_ih_get_wptr,
> - .prescreen_iv = cz_ih_prescreen_iv,
> .decode_iv = cz_ih_decode_iv,
> .set_rptr = cz_ih_set_rptr
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
> index 2b94a6d1550e..a3984d10b604 100644
> --- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
> @@ -207,18 +207,6 @@ static u32 iceland_ih_get_wptr(struct amdgpu_device *adev)
> return (wptr & adev->irq.ih.ptr_mask);
> }
>
> -/**
> - * iceland_ih_prescreen_iv - prescreen an interrupt vector
> - *
> - * @adev: amdgpu_device pointer
> - *
> - * Returns true if the interrupt vector should be further processed.
> - */
> -static bool iceland_ih_prescreen_iv(struct amdgpu_device *adev)
> -{
> - return true;
> -}
> -
> /**
> * iceland_ih_decode_iv - decode an interrupt vector
> *
> @@ -424,7 +412,6 @@ static const struct amd_ip_funcs iceland_ih_ip_funcs = {
>
> static const struct amdgpu_ih_funcs iceland_ih_funcs = {
> .get_wptr = iceland_ih_get_wptr,
> - .prescreen_iv = iceland_ih_prescreen_iv,
> .decode_iv = iceland_ih_decode_iv,
> .set_rptr = iceland_ih_set_rptr
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/si_ih.c b/drivers/gpu/drm/amd/amdgpu/si_ih.c
> index b3d7d9f83202..2938fb9f17cc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si_ih.c
> @@ -118,19 +118,6 @@ static u32 si_ih_get_wptr(struct amdgpu_device *adev)
> return (wptr & adev->irq.ih.ptr_mask);
> }
>
> -/**
> - * si_ih_prescreen_iv - prescreen an interrupt vector
> - *
> - * @adev: amdgpu_device pointer
> - *
> - * Returns true if the interrupt vector should be further processed.
> - */
> -static bool si_ih_prescreen_iv(struct amdgpu_device *adev)
> -{
> - /* Process all interrupts */
> - return true;
> -}
> -
> static void si_ih_decode_iv(struct amdgpu_device *adev,
> struct amdgpu_iv_entry *entry)
> {
> @@ -301,7 +288,6 @@ static const struct amd_ip_funcs si_ih_ip_funcs = {
>
> static const struct amdgpu_ih_funcs si_ih_funcs = {
> .get_wptr = si_ih_get_wptr,
> - .prescreen_iv = si_ih_prescreen_iv,
> .decode_iv = si_ih_decode_iv,
> .set_rptr = si_ih_set_rptr
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
> index 9be687d31684..f64a0be3755c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
> @@ -218,18 +218,6 @@ static u32 tonga_ih_get_wptr(struct amdgpu_device *adev)
> return (wptr & adev->irq.ih.ptr_mask);
> }
>
> -/**
> - * tonga_ih_prescreen_iv - prescreen an interrupt vector
> - *
> - * @adev: amdgpu_device pointer
> - *
> - * Returns true if the interrupt vector should be further processed.
> - */
> -static bool tonga_ih_prescreen_iv(struct amdgpu_device *adev)
> -{
> - return true;
> -}
> -
> /**
> * tonga_ih_decode_iv - decode an interrupt vector
> *
> @@ -490,7 +478,6 @@ static const struct amd_ip_funcs tonga_ih_ip_funcs = {
>
> static const struct amdgpu_ih_funcs tonga_ih_funcs = {
> .get_wptr = tonga_ih_get_wptr,
> - .prescreen_iv = tonga_ih_prescreen_iv,
> .decode_iv = tonga_ih_decode_iv,
> .set_rptr = tonga_ih_set_rptr
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> index 0f68a0cd1fbf..49b9ecea09b0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> @@ -219,18 +219,6 @@ static u32 vega10_ih_get_wptr(struct amdgpu_device *adev)
> return (wptr & adev->irq.ih.ptr_mask);
> }
>
> -/**
> - * vega10_ih_prescreen_iv - prescreen an interrupt vector
> - *
> - * @adev: amdgpu_device pointer
> - *
> - * Returns true if the interrupt vector should be further processed.
> - */
> -static bool vega10_ih_prescreen_iv(struct amdgpu_device *adev)
> -{
> - return true;
> -}
> -
> /**
> * vega10_ih_decode_iv - decode an interrupt vector
> *
> @@ -415,7 +403,6 @@ const struct amd_ip_funcs vega10_ih_ip_funcs = {
>
> static const struct amdgpu_ih_funcs vega10_ih_funcs = {
> .get_wptr = vega10_ih_get_wptr,
> - .prescreen_iv = vega10_ih_prescreen_iv,
> .decode_iv = vega10_ih_decode_iv,
> .set_rptr = vega10_ih_set_rptr
> };
> --
> 2.14.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
More information about the amd-gfx
mailing list