UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: DC VM Fixes 

[Why]
VM_helper needs to be intialized with the dc struct in order to fix
an unallocated memory issue. System aperture settings should be
initialized to 0 and guarded with a check to make sure vm_config
is valid.

[How]
Allocate and free memory for vm_helper with other dc members.
Check whether the vm_config valid bit is set before initializing
aperture settings.

Signed-off-by: Eryk Brol <eryk.brol@amd.com>
Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Eryk Brol 2019-01-21 14:40:16 -05:00 committed by Alex Deucher
parent b9d4b33059
commit 00fbeb4e2f
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -621,7 +621,6 @@ static bool construct(struct dc *dc,
#endif #endif
enum dce_version dc_version = DCE_VERSION_UNKNOWN; enum dce_version dc_version = DCE_VERSION_UNKNOWN;
dc_dceip = kzalloc(sizeof(*dc_dceip), GFP_KERNEL); dc_dceip = kzalloc(sizeof(*dc_dceip), GFP_KERNEL);
if (!dc_dceip) { if (!dc_dceip) {
dm_error("%s: failed to create dceip\n", __func__); dm_error("%s: failed to create dceip\n", __func__);

16
drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c
View File

@ -112,16 +112,12 @@ uint8_t get_vmid_for_ptb(struct vm_helper *vm_helper, int64_t ptb, uint8_t hubp_
return vmid; return vmid;
} }
struct vm_helper init_vm_helper(unsigned int num_vmid, unsigned int num_hubp) void init_vm_helper(struct vm_helper *vm_helper, unsigned int num_vmid, unsigned int num_hubp)
{ {
static uint64_t ptb_assigned_to_vmid[MAX_VMID]; vm_helper->num_vmid = num_vmid;
static struct vmid_usage hubp_vmid_usage[MAX_HUBP]; vm_helper->num_hubp = num_hubp;
vm_helper->num_vmids_available = num_vmid - 1;
return (struct vm_helper){ memset(vm_helper->hubp_vmid_usage, 0, sizeof(vm_helper->hubp_vmid_usage[0]) * MAX_HUBP);
.num_vmid = num_vmid, memset(vm_helper->ptb_assigned_to_vmid, 0, sizeof(vm_helper->ptb_assigned_to_vmid[0]) * MAX_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
};
} }

1
drivers/gpu/drm/amd/display/dc/dc.h
View File

@ -265,7 +265,6 @@ struct dc_debug_data {
uint32_t auxErrorCount; uint32_t auxErrorCount;
}; };
struct dc_state; struct dc_state;
struct resource_pool; struct resource_pool;
struct dce_hwseq; struct dce_hwseq;

7
drivers/gpu/drm/amd/display/dc/inc/vm_helper.h
View File

@ -39,8 +39,8 @@ struct vm_helper {
unsigned int num_vmid; unsigned int num_vmid;
unsigned int num_hubp; unsigned int num_hubp;
unsigned int num_vmids_available; unsigned int num_vmids_available;
uint64_t *ptb_assigned_to_vmid; uint64_t ptb_assigned_to_vmid[MAX_VMID];
struct vmid_usage *hubp_vmid_usage; struct vmid_usage hubp_vmid_usage[MAX_HUBP];
}; };
uint8_t get_vmid_for_ptb( uint8_t get_vmid_for_ptb(
@ -48,7 +48,8 @@ uint8_t get_vmid_for_ptb(
int64_t ptb, int64_t ptb,
uint8_t pipe_idx); uint8_t pipe_idx);
struct vm_helper init_vm_helper( void init_vm_helper(
struct vm_helper *vm_helper,
unsigned int num_vmid, unsigned int num_vmid,
unsigned int num_hubp); unsigned int num_hubp);