From: Dave Airlie <[email protected]>

modules/vmid, mod_vmid.h and mod_stats.h are not referenced by any
Makefile; remove the dead code.

Signed-off-by: Dave Airlie <[email protected]>
---
 .../gpu/drm/amd/display/modules/inc/mod_stats.h    |  75 ---------
 drivers/gpu/drm/amd/display/modules/inc/mod_vmid.h |  46 ------
 drivers/gpu/drm/amd/display/modules/vmid/vmid.c    | 178 ---------------------
 3 files changed, 299 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_stats.h 
b/drivers/gpu/drm/amd/display/modules/inc/mod_stats.h
deleted file mode 100644
index 8ce6c22e5d04..000000000000
--- a/drivers/gpu/drm/amd/display/modules/inc/mod_stats.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2016 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef MODULES_INC_MOD_STATS_H_
-#define MODULES_INC_MOD_STATS_H_
-
-#include "dm_services.h"
-
-struct mod_stats {
-       int dummy;
-};
-
-struct mod_stats_caps {
-       bool dummy;
-};
-
-struct mod_stats_init_params {
-       unsigned int stats_enable;
-       unsigned int stats_entries;
-};
-
-struct mod_stats *mod_stats_create(struct dc *dc,
-               struct mod_stats_init_params *init_params);
-
-void mod_stats_destroy(struct mod_stats *mod_stats);
-
-bool mod_stats_init(struct mod_stats *mod_stats);
-
-void mod_stats_dump(struct mod_stats *mod_stats);
-
-void mod_stats_reset_data(struct mod_stats *mod_stats);
-
-void mod_stats_update_event(struct mod_stats *mod_stats,
-               const char *event_string,
-               unsigned int length);
-
-void mod_stats_update_flip(struct mod_stats *mod_stats,
-               unsigned long long timestamp_in_ns);
-
-void mod_stats_update_vupdate(struct mod_stats *mod_stats,
-               unsigned long long timestamp_in_ns);
-
-void mod_stats_update_freesync(struct mod_stats *mod_stats,
-               unsigned int v_total_min,
-               unsigned int v_total_max,
-               unsigned int event_triggers,
-               unsigned int window_min,
-               unsigned int window_max,
-               unsigned int lfc_mid_point_in_us,
-               unsigned int inserted_frames,
-               unsigned int inserted_frame_duration_in_us);
-
-#endif /* MODULES_INC_MOD_STATS_H_ */
diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_vmid.h 
b/drivers/gpu/drm/amd/display/modules/inc/mod_vmid.h
deleted file mode 100644
index a3787fdf0c08..000000000000
--- a/drivers/gpu/drm/amd/display/modules/inc/mod_vmid.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2019 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef MOD_VMID_H_
-#define MOD_VMID_H_
-
-#define MAX_VMID 16
-
-#include "dc.h"
-
-struct mod_vmid {
-       int dummy;
-};
-
-uint8_t mod_vmid_get_for_ptb(struct mod_vmid *mod_vmid, uint64_t ptb);
-void mod_vmid_reset(struct mod_vmid *mod_vmid);
-struct mod_vmid *mod_vmid_create(
-               struct dc *dc,
-               unsigned int num_vmid,
-               struct dc_virtual_addr_space_config *va_config);
-
-void mod_vmid_destroy(struct mod_vmid *mod_vmid);
-
-#endif /* MOD_VMID_H_ */
diff --git a/drivers/gpu/drm/amd/display/modules/vmid/vmid.c 
b/drivers/gpu/drm/amd/display/modules/vmid/vmid.c
deleted file mode 100644
index 32617893ffb2..000000000000
--- a/drivers/gpu/drm/amd/display/modules/vmid/vmid.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright 2019 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#include "mod_vmid.h"
-
-struct core_vmid {
-       struct mod_vmid public;
-       struct dc *dc;
-
-       unsigned int num_vmid;
-       unsigned int num_vmids_available;
-       uint64_t ptb_assigned_to_vmid[MAX_VMID];
-       struct dc_virtual_addr_space_config base_config;
-};
-
-#define MOD_VMID_TO_CORE(mod_vmid)\
-               container_of(mod_vmid, struct core_vmid, public)
-
-static void add_ptb_to_table(struct core_vmid *core_vmid, unsigned int vmid, 
uint64_t ptb)
-{
-       if (vmid < MAX_VMID) {
-               core_vmid->ptb_assigned_to_vmid[vmid] = ptb;
-               core_vmid->num_vmids_available--;
-       }
-}
-
-static void clear_entry_from_vmid_table(struct core_vmid *core_vmid, unsigned 
int vmid)
-{
-       if (vmid < MAX_VMID) {
-               core_vmid->ptb_assigned_to_vmid[vmid] = 0;
-               core_vmid->num_vmids_available++;
-       }
-}
-
-static void evict_vmids(struct core_vmid *core_vmid)
-{
-       unsigned int i;
-       int ord_int = dc_get_vmid_use_vector(core_vmid->dc);
-
-       ASSERT(ord_int >= 0 && ord_int <= 0xFFFF);
-       uint16_t ord = (uint16_t)ord_int;
-
-       // At this point any positions with value 0 are unused vmids, evict them
-       for (i = 1; i < core_vmid->num_vmid; i++) {
-               if (!(ord & (1u << i)))
-                       clear_entry_from_vmid_table(core_vmid, i);
-       }
-}
-
-// Return value of -1 indicates vmid table uninitialized or ptb dne in the 
table
-static int get_existing_vmid_for_ptb(struct core_vmid *core_vmid, uint64_t ptb)
-{
-       unsigned int i;
-
-       for (i = 0; i < core_vmid->num_vmid; i++) {
-               if (core_vmid->ptb_assigned_to_vmid[i] == ptb)
-                       return i;
-       }
-
-       return -1;
-}
-
-// Expected to be called only when there's an available vmid
-static int get_next_available_vmid(struct core_vmid *core_vmid)
-{
-       unsigned int i;
-
-       for (i = 1; i < core_vmid->num_vmid; i++) {
-               if (core_vmid->ptb_assigned_to_vmid[i] == 0)
-                       return i;
-       }
-
-       return -1;
-}
-
-uint8_t mod_vmid_get_for_ptb(struct mod_vmid *mod_vmid, uint64_t ptb)
-{
-       struct core_vmid *core_vmid = MOD_VMID_TO_CORE(mod_vmid);
-       int vmid = 0;
-
-       // Physical address gets vmid 0
-       if (ptb == 0)
-               return 0;
-
-       vmid = get_existing_vmid_for_ptb(core_vmid, ptb);
-
-       if (vmid == -1) {
-               struct dc_virtual_addr_space_config va_config = 
core_vmid->base_config;
-
-               va_config.page_table_base_addr = ptb;
-
-               if (core_vmid->num_vmids_available == 0)
-                       evict_vmids(core_vmid);
-
-               vmid = get_next_available_vmid(core_vmid);
-               if (vmid != -1) {
-                       add_ptb_to_table(core_vmid, vmid, ptb);
-
-                       dc_setup_vm_context(core_vmid->dc, &va_config, vmid);
-               } else
-                       ASSERT(0);
-       }
-
-       ASSERT(vmid >= 0 && vmid <= 0xFF);
-       return (uint8_t)vmid;
-}
-
-void mod_vmid_reset(struct mod_vmid *mod_vmid)
-{
-       struct core_vmid *core_vmid = MOD_VMID_TO_CORE(mod_vmid);
-
-       core_vmid->num_vmids_available = core_vmid->num_vmid - 1;
-       memset(core_vmid->ptb_assigned_to_vmid, 0, 
sizeof(core_vmid->ptb_assigned_to_vmid[0]) * MAX_VMID);
-}
-
-struct mod_vmid *mod_vmid_create(
-               struct dc *dc,
-               unsigned int num_vmid,
-               struct dc_virtual_addr_space_config *va_config)
-{
-       struct core_vmid *core_vmid;
-
-       if (num_vmid <= 1)
-               goto fail_no_vm_ctx;
-
-       if (dc == NULL)
-               goto fail_dc_null;
-
-       core_vmid = kzalloc_obj(struct core_vmid);
-
-       if (core_vmid == NULL)
-               goto fail_alloc_context;
-
-       core_vmid->dc = dc;
-       core_vmid->num_vmid = num_vmid;
-       core_vmid->num_vmids_available = num_vmid - 1;
-       core_vmid->base_config = *va_config;
-
-       memset(core_vmid->ptb_assigned_to_vmid, 0, 
sizeof(core_vmid->ptb_assigned_to_vmid[0]) * MAX_VMID);
-
-       return &core_vmid->public;
-
-fail_no_vm_ctx:
-fail_alloc_context:
-fail_dc_null:
-       return NULL;
-}
-
-void mod_vmid_destroy(struct mod_vmid *mod_vmid)
-{
-       if (mod_vmid != NULL) {
-               struct core_vmid *core_vmid = MOD_VMID_TO_CORE(mod_vmid);
-
-               kfree(core_vmid);
-       }
-}

-- 
2.56.0


Reply via email to