mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-15 19:25:13 +00:00
drm/amd/display: Introduce DC VM interface
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>
This commit is contained in:
parent
89c4f84b60
commit
b970864876
10 changed files with 254 additions and 10 deletions
|
|
@ -41,7 +41,8 @@ AMD_DC = $(addsuffix /Makefile, $(addprefix $(FULL_AMD_DISPLAY_PATH)/dc/,$(DC_LI
|
||||||
include $(AMD_DC)
|
include $(AMD_DC)
|
||||||
|
|
||||||
DISPLAY_CORE = dc.o dc_link.o dc_resource.o dc_hw_sequencer.o dc_sink.o \
|
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))
|
AMD_DISPLAY_CORE = $(addprefix $(AMDDALPATH)/dc/core/,$(DISPLAY_CORE))
|
||||||
|
|
||||||
|
|
|
||||||
127
drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c
Normal file
127
drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c
Normal file
|
|
@ -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
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -97,6 +97,8 @@ struct dc_plane_address {
|
||||||
union large_integer chroma_dcc_const_color;
|
union large_integer chroma_dcc_const_color;
|
||||||
} video_progressive;
|
} video_progressive;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
union large_integer page_table_base;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct dc_size {
|
struct dc_size {
|
||||||
|
|
|
||||||
|
|
@ -110,6 +110,12 @@ struct dcn_hubbub_registers {
|
||||||
uint32_t DCHUBBUB_SDPIF_AGP_TOP;
|
uint32_t DCHUBBUB_SDPIF_AGP_TOP;
|
||||||
uint32_t DCHUBBUB_CRC_CTRL;
|
uint32_t DCHUBBUB_CRC_CTRL;
|
||||||
uint32_t DCHUBBUB_SOFT_RESET;
|
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 */
|
/* set field name */
|
||||||
|
|
@ -155,7 +161,13 @@ struct dcn_hubbub_registers {
|
||||||
type SDPIF_FB_OFFSET;\
|
type SDPIF_FB_OFFSET;\
|
||||||
type SDPIF_AGP_BASE;\
|
type SDPIF_AGP_BASE;\
|
||||||
type SDPIF_AGP_BOT;\
|
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 {
|
struct dcn_hubbub_shift {
|
||||||
|
|
|
||||||
|
|
@ -317,7 +317,8 @@ void hubp1_program_pixel_format(
|
||||||
bool hubp1_program_surface_flip_and_addr(
|
bool hubp1_program_surface_flip_and_addr(
|
||||||
struct hubp *hubp,
|
struct hubp *hubp,
|
||||||
const struct dc_plane_address *address,
|
const struct dc_plane_address *address,
|
||||||
bool flip_immediate)
|
bool flip_immediate,
|
||||||
|
uint8_t vmid)
|
||||||
{
|
{
|
||||||
struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
|
struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -707,11 +707,6 @@ void hubp1_dcc_control(struct hubp *hubp,
|
||||||
bool enable,
|
bool enable,
|
||||||
bool independent_64b_blks);
|
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);
|
bool hubp1_is_flip_pending(struct hubp *hubp);
|
||||||
|
|
||||||
void hubp1_cursor_set_attributes(
|
void hubp1_cursor_set_attributes(
|
||||||
|
|
|
||||||
|
|
@ -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->funcs->hubp_program_surface_flip_and_addr(
|
||||||
pipe_ctx->plane_res.hubp,
|
pipe_ctx->plane_res.hubp,
|
||||||
&plane_state->address,
|
&plane_state->address,
|
||||||
plane_state->flip_immediate);
|
plane_state->flip_immediate,
|
||||||
|
0);
|
||||||
|
|
||||||
plane_state->status.requested_address = plane_state->address;
|
plane_state->status.requested_address = plane_state->address;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,8 @@ struct hubp_funcs {
|
||||||
bool (*hubp_program_surface_flip_and_addr)(
|
bool (*hubp_program_surface_flip_and_addr)(
|
||||||
struct hubp *hubp,
|
struct hubp *hubp,
|
||||||
const struct dc_plane_address *address,
|
const struct dc_plane_address *address,
|
||||||
bool flip_immediate);
|
bool flip_immediate,
|
||||||
|
uint8_t vmid);
|
||||||
|
|
||||||
void (*hubp_program_pte_vm)(
|
void (*hubp_program_pte_vm)(
|
||||||
struct hubp *hubp,
|
struct hubp *hubp,
|
||||||
|
|
|
||||||
49
drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h
Normal file
49
drivers/gpu/drm/amd/display/dc/inc/hw/vmid.h
Normal file
|
|
@ -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_ */
|
||||||
55
drivers/gpu/drm/amd/display/dc/inc/vm_helper.h
Normal file
55
drivers/gpu/drm/amd/display/dc/inc/vm_helper.h
Normal file
|
|
@ -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_ */
|
||||||
Loading…
Add table
Reference in a new issue