drm/amd/display: Introduce DC VM interface
authorEryk Brol <eryk.brol@amd.com>
Fri, 7 Dec 2018 15:25:13 +0000 (10:25 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 25 Jan 2019 21:15:36 +0000 (16:15 -0500)
Virtual memory allows display to support flipping to surfaces which
are not allocated contiguously in memory with physical addresses,
instead a 1-4 level page table is used.

This is beneficial because it allows the scattering of large surfaces
to improve memory efficiency and security.

Signed-off-by: Eryk Brol <eryk.brol@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/Makefile
drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/dc_hw_types.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h [new file with mode: 0644]
drivers/gpu/drm/amd/display/dc/inc/vm_helper.h [new file with mode: 0644]

index fa24e4c38794ce2c6c295086f0f8bccd7104c4a3..b8ddb4acccdb438ea41cb2533000b283c6945b93 100644 (file)
@@ -41,7 +41,8 @@ AMD_DC = $(addsuffix /Makefile, $(addprefix $(FULL_AMD_DISPLAY_PATH)/dc/,$(DC_LI
 include $(AMD_DC)
 
 DISPLAY_CORE = dc.o dc_link.o dc_resource.o dc_hw_sequencer.o dc_sink.o \
-dc_surface.o dc_link_hwss.o dc_link_dp.o dc_link_ddc.o dc_debug.o dc_stream.o
+dc_surface.o dc_link_hwss.o dc_link_dp.o dc_link_ddc.o dc_debug.o dc_stream.o \
+dc_vm_helper.o
 
 AMD_DISPLAY_CORE = $(addprefix $(AMDDALPATH)/dc/core/,$(DISPLAY_CORE))
 
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c b/drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c
new file mode 100644 (file)
index 0000000..e54b8ac
--- /dev/null
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2018 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 "vm_helper.h"
+
+static void mark_vmid_used(struct vm_helper *vm_helper, unsigned int pos, uint8_t hubp_idx)
+{
+       struct vmid_usage vmids = vm_helper->hubp_vmid_usage[hubp_idx];
+
+       vmids.vmid_usage[0] = vmids.vmid_usage[1];
+       vmids.vmid_usage[1] = 1 << pos;
+}
+
+static void add_ptb_to_table(struct vm_helper *vm_helper, unsigned int vmid, uint64_t ptb)
+{
+       vm_helper->ptb_assigned_to_vmid[vmid] = ptb;
+       vm_helper->num_vmids_available--;
+}
+
+static void clear_entry_from_vmid_table(struct vm_helper *vm_helper, unsigned int vmid)
+{
+       vm_helper->ptb_assigned_to_vmid[vmid] = 0;
+       vm_helper->num_vmids_available++;
+}
+
+static void evict_vmids(struct vm_helper *vm_helper)
+{
+       int i;
+       uint16_t ord = 0;
+
+       for (i = 0; i < vm_helper->num_vmid; i++)
+               ord |= vm_helper->hubp_vmid_usage[i].vmid_usage[0] | vm_helper->hubp_vmid_usage[i].vmid_usage[1];
+
+       // At this point any positions with value 0 are unused vmids, evict them
+       for (i = 1; i < vm_helper->num_vmid; i++) {
+               if (ord & (1u << i))
+                       clear_entry_from_vmid_table(vm_helper, i);
+       }
+}
+
+// Return value of -1 indicates vmid table unitialized or ptb dne in the table
+static int get_existing_vmid_for_ptb(struct vm_helper *vm_helper, uint64_t ptb)
+{
+       int i;
+
+       for (i = 0; i < vm_helper->num_vmid; i++) {
+               if (vm_helper->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 vm_helper *vm_helper)
+{
+       int i;
+
+       for (i = 1; i < vm_helper->num_vmid; i++) {
+               if (vm_helper->ptb_assigned_to_vmid[i] == 0)
+                       return i;
+       }
+
+       return -1;
+}
+
+uint8_t get_vmid_for_ptb(struct vm_helper *vm_helper, int64_t ptb, uint8_t hubp_idx)
+{
+       unsigned int vmid = 0;
+       int vmid_exists = -1;
+
+       // Physical address gets vmid 0
+       if (ptb == 0)
+               return 0;
+
+       vmid_exists = get_existing_vmid_for_ptb(vm_helper, ptb);
+
+       if (vmid_exists != -1) {
+               mark_vmid_used(vm_helper, vmid_exists, hubp_idx);
+               vmid = vmid_exists;
+       } else {
+               if (vm_helper->num_vmids_available == 0)
+                       evict_vmids(vm_helper);
+
+               vmid = get_next_available_vmid(vm_helper);
+               mark_vmid_used(vm_helper, vmid, hubp_idx);
+               add_ptb_to_table(vm_helper, vmid, ptb);
+       }
+
+       return vmid;
+}
+
+struct vm_helper init_vm_helper(unsigned int num_vmid, unsigned int num_hubp)
+{
+       static uint64_t ptb_assigned_to_vmid[MAX_VMID];
+       static struct vmid_usage hubp_vmid_usage[MAX_HUBP];
+
+       return (struct vm_helper){
+               .num_vmid = num_vmid,
+               .num_hubp = num_hubp,
+               .num_vmids_available = num_vmid - 1,
+               .ptb_assigned_to_vmid = ptb_assigned_to_vmid,
+               .hubp_vmid_usage = hubp_vmid_usage
+       };
+}
index 04f279a76d70b583e659e41bc381238d0001b8ca..da55d623647a1c5559510115a0477c6a4792e941 100644 (file)
@@ -97,6 +97,8 @@ struct dc_plane_address {
                        union large_integer chroma_dcc_const_color;
                } video_progressive;
        };
+
+       union large_integer page_table_base;
 };
 
 struct dc_size {
index 14e23e26a2cd124b16a27c8aacf078b595076e44..c681e1cc92902777a5d3e53588e387f6624e4e45 100644 (file)
@@ -110,6 +110,12 @@ struct dcn_hubbub_registers {
        uint32_t DCHUBBUB_SDPIF_AGP_TOP;
        uint32_t DCHUBBUB_CRC_CTRL;
        uint32_t DCHUBBUB_SOFT_RESET;
+       uint32_t DCN_VM_FB_LOCATION_BASE;
+       uint32_t DCN_VM_FB_LOCATION_TOP;
+       uint32_t DCN_VM_FB_OFFSET;
+       uint32_t DCN_VM_AGP_BOT;
+       uint32_t DCN_VM_AGP_TOP;
+       uint32_t DCN_VM_AGP_BASE;
 };
 
 /* set field name */
@@ -155,7 +161,13 @@ struct dcn_hubbub_registers {
                type SDPIF_FB_OFFSET;\
                type SDPIF_AGP_BASE;\
                type SDPIF_AGP_BOT;\
-               type SDPIF_AGP_TOP
+               type SDPIF_AGP_TOP;\
+               type FB_BASE;\
+               type FB_TOP;\
+               type FB_OFFSET;\
+               type AGP_BOT;\
+               type AGP_TOP;\
+               type AGP_BASE
 
 
 struct dcn_hubbub_shift {
index fae62474a4d16cff514f6285905dd518a623507d..0ba68d41b9c37b91064a5defbbcf62a3160df53f 100644 (file)
@@ -317,7 +317,8 @@ void hubp1_program_pixel_format(
 bool hubp1_program_surface_flip_and_addr(
        struct hubp *hubp,
        const struct dc_plane_address *address,
-       bool flip_immediate)
+       bool flip_immediate,
+       uint8_t vmid)
 {
        struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
 
index e82ca15c842fa0a357192d0baef1a09d9d1a3fc0..a6d6dfe00617002eedb3c27e3e426b8979883cd0 100644 (file)
@@ -707,11 +707,6 @@ void hubp1_dcc_control(struct hubp *hubp,
                bool enable,
                bool independent_64b_blks);
 
-bool hubp1_program_surface_flip_and_addr(
-       struct hubp *hubp,
-       const struct dc_plane_address *address,
-       bool flip_immediate);
-
 bool hubp1_is_flip_pending(struct hubp *hubp);
 
 void hubp1_cursor_set_attributes(
index 814f5976ec9b9030c4471b557984b1b381bd3fd5..9cde24dbdac8c7c5a5a2eb2372d0927f586c61f8 100644 (file)
@@ -1202,7 +1202,8 @@ static void dcn10_update_plane_addr(const struct dc *dc, struct pipe_ctx *pipe_c
        pipe_ctx->plane_res.hubp->funcs->hubp_program_surface_flip_and_addr(
                        pipe_ctx->plane_res.hubp,
                        &plane_state->address,
-                       plane_state->flip_immediate);
+                       plane_state->flip_immediate,
+                       0);
 
        plane_state->status.requested_address = plane_state->address;
 
index 04c6989aac58dd002288ef669d6e8f372a3f7c84..1cd07e94ee63184de3f1338887b456cb4cfab147 100644 (file)
@@ -78,7 +78,8 @@ struct hubp_funcs {
        bool (*hubp_program_surface_flip_and_addr)(
                struct hubp *hubp,
                const struct dc_plane_address *address,
-               bool flip_immediate);
+               bool flip_immediate,
+               uint8_t vmid);
 
        void (*hubp_program_pte_vm)(
                struct hubp *hubp,
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h b/drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h
new file mode 100644 (file)
index 0000000..037beb0
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2018 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 DAL_DC_INC_HW_VMID_H_
+#define DAL_DC_INC_HW_VMID_H_
+
+#include "core_types.h"
+#include "dchubbub.h"
+
+struct dcn_vmid_registers {
+       uint32_t CNTL;
+       uint32_t PAGE_TABLE_BASE_ADDR_HI32;
+       uint32_t PAGE_TABLE_BASE_ADDR_LO32;
+       uint32_t PAGE_TABLE_START_ADDR_HI32;
+       uint32_t PAGE_TABLE_START_ADDR_LO32;
+       uint32_t PAGE_TABLE_END_ADDR_HI32;
+       uint32_t PAGE_TABLE_END_ADDR_LO32;
+};
+
+struct dcn_vmid_page_table_config {
+       uint64_t        page_table_start_addr;
+       uint64_t        page_table_end_addr;
+       enum dcn_hubbub_page_table_depth        depth;
+       enum dcn_hubbub_page_table_block_size   block_size;
+};
+
+#endif /* DAL_DC_INC_HW_VMID_H_ */
diff --git a/drivers/gpu/drm/amd/display/dc/inc/vm_helper.h b/drivers/gpu/drm/amd/display/dc/inc/vm_helper.h
new file mode 100644 (file)
index 0000000..a202206
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2018 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 DC_INC_VM_HELPER_H_
+#define DC_INC_VM_HELPER_H_
+
+#include "dc_types.h"
+
+#define MAX_VMID 16
+#define MAX_HUBP 6
+
+struct vmid_usage {
+       uint16_t vmid_usage[2];
+};
+
+struct vm_helper {
+       unsigned int num_vmid;
+       unsigned int num_hubp;
+       unsigned int num_vmids_available;
+       uint64_t *ptb_assigned_to_vmid;
+       struct vmid_usage *hubp_vmid_usage;
+};
+
+uint8_t get_vmid_for_ptb(
+               struct vm_helper *vm_helper,
+               int64_t ptb,
+               uint8_t pipe_idx);
+
+struct vm_helper init_vm_helper(
+       unsigned int num_vmid,
+       unsigned int num_hubp);
+
+#endif /* DC_INC_VM_HELPER_H_ */