From: "Dr. David Alan Gilbert" <[email protected]>
A bunch of deadcode/struct removals in drm/amd
Signed-off-by: Dr. David Alan Gilbert <[email protected]>
Dr. David Alan Gilbert (3):
drm/amdgpu: remove unused struct 'hqd_registers'
drm/amd/display: remove unused struct 'aux_payloads'
drm/amd/display: remove unused struct 'dc_reg_sequence'
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 38 -------------------
drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 ---
.../amd/display/dc/link/protocols/link_ddc.c | 4 --
3 files changed, 47 deletions(-)
--
2.45.1
From: "Dr. David Alan Gilbert" <[email protected]>
'hqd_registers' used to be used in a member of the 'bonaire_mqd'
struct. 'bonaire_mqd' was removed by
commit 486d807cd9a9 ("drm/amdgpu: remove duplicate definition of
cik_mqd")
It's now unused.
Remove 'hqd_registers' as well.
Signed-off-by: Dr. David Alan Gilbert <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 38 ---------------------------
1 file changed, 38 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 541dbd70d8c7..f3544f02ffb9 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -2757,44 +2757,6 @@ static int gfx_v7_0_mec_init(struct amdgpu_device *adev)
return 0;
}
-struct hqd_registers {
- u32 cp_mqd_base_addr;
- u32 cp_mqd_base_addr_hi;
- u32 cp_hqd_active;
- u32 cp_hqd_vmid;
- u32 cp_hqd_persistent_state;
- u32 cp_hqd_pipe_priority;
- u32 cp_hqd_queue_priority;
- u32 cp_hqd_quantum;
- u32 cp_hqd_pq_base;
- u32 cp_hqd_pq_base_hi;
- u32 cp_hqd_pq_rptr;
- u32 cp_hqd_pq_rptr_report_addr;
- u32 cp_hqd_pq_rptr_report_addr_hi;
- u32 cp_hqd_pq_wptr_poll_addr;
- u32 cp_hqd_pq_wptr_poll_addr_hi;
- u32 cp_hqd_pq_doorbell_control;
- u32 cp_hqd_pq_wptr;
- u32 cp_hqd_pq_control;
- u32 cp_hqd_ib_base_addr;
- u32 cp_hqd_ib_base_addr_hi;
- u32 cp_hqd_ib_rptr;
- u32 cp_hqd_ib_control;
- u32 cp_hqd_iq_timer;
- u32 cp_hqd_iq_rptr;
- u32 cp_hqd_dequeue_request;
- u32 cp_hqd_dma_offload;
- u32 cp_hqd_sema_cmd;
- u32 cp_hqd_msg_type;
- u32 cp_hqd_atomic0_preop_lo;
- u32 cp_hqd_atomic0_preop_hi;
- u32 cp_hqd_atomic1_preop_lo;
- u32 cp_hqd_atomic1_preop_hi;
- u32 cp_hqd_hq_scheduler0;
- u32 cp_hqd_hq_scheduler1;
- u32 cp_mqd_control;
-};
-
static void gfx_v7_0_compute_pipe_init(struct amdgpu_device *adev,
int mec, int pipe)
{
--
2.45.1
From: "Dr. David Alan Gilbert" <[email protected]>
'aux_payloads' is unused since
commit eae5ffa9bd7b ("drm/amd/display: Switch ddc to new aux interface")
Remove it.
Signed-off-by: Dr. David Alan Gilbert <[email protected]>
---
drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c
index c2d40979203e..d6d5bbf2108c 100644
--- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c
+++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c
@@ -51,10 +51,6 @@ struct i2c_payloads {
struct vector payloads;
};
-struct aux_payloads {
- struct vector payloads;
-};
-
static bool i2c_payloads_create(
struct dc_context *ctx,
struct i2c_payloads *payloads,
--
2.45.1
From: "Dr. David Alan Gilbert" <[email protected]>
'dc_reg_sequence' was added in
commit 44788bbc309b ("drm/amd/display: refactor reg_update")
but isn't actually used.
Remove it.
Signed-off-by: Dr. David Alan Gilbert <[email protected]>
---
drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c
index 8f9a67825615..b81419c95222 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_helper.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_helper.c
@@ -91,11 +91,6 @@ struct dc_reg_value_masks {
uint32_t mask;
};
-struct dc_reg_sequence {
- uint32_t addr;
- struct dc_reg_value_masks value_masks;
-};
-
static inline void set_reg_field_value_masks(
struct dc_reg_value_masks *field_value_mask,
uint32_t value,
--
2.45.1
Applied the series. Thanks!
Alex
On Fri, May 17, 2024 at 8:12 PM <[email protected]> wrote:
>
> From: "Dr. David Alan Gilbert" <[email protected]>
>
> 'dc_reg_sequence' was added in
> commit 44788bbc309b ("drm/amd/display: refactor reg_update")
>
> but isn't actually used.
>
> Remove it.
>
> Signed-off-by: Dr. David Alan Gilbert <[email protected]>
> ---
> drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_helper.c b/drivers/gpu/drm/amd/display/dc/dc_helper.c
> index 8f9a67825615..b81419c95222 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_helper.c
> +++ b/drivers/gpu/drm/amd/display/dc/dc_helper.c
> @@ -91,11 +91,6 @@ struct dc_reg_value_masks {
> uint32_t mask;
> };
>
> -struct dc_reg_sequence {
> - uint32_t addr;
> - struct dc_reg_value_masks value_masks;
> -};
> -
> static inline void set_reg_field_value_masks(
> struct dc_reg_value_masks *field_value_mask,
> uint32_t value,
> --
> 2.45.1
>