Commit 0b902197 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amd/display: fix invalid function table override

Otherwise we try to program hardware with the wrong watermark functions
when multiple DCE generations are installed in one system.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent ed6b4b55
...@@ -741,6 +741,29 @@ static struct mem_input_funcs dce_mi_funcs = { ...@@ -741,6 +741,29 @@ static struct mem_input_funcs dce_mi_funcs = {
.mem_input_is_flip_pending = dce_mi_is_flip_pending .mem_input_is_flip_pending = dce_mi_is_flip_pending
}; };
static struct mem_input_funcs dce112_mi_funcs = {
.mem_input_program_display_marks = dce112_mi_program_display_marks,
.allocate_mem_input = dce_mi_allocate_dmif,
.free_mem_input = dce_mi_free_dmif,
.mem_input_program_surface_flip_and_addr =
dce_mi_program_surface_flip_and_addr,
.mem_input_program_pte_vm = dce_mi_program_pte_vm,
.mem_input_program_surface_config =
dce_mi_program_surface_config,
.mem_input_is_flip_pending = dce_mi_is_flip_pending
};
static struct mem_input_funcs dce120_mi_funcs = {
.mem_input_program_display_marks = dce120_mi_program_display_marks,
.allocate_mem_input = dce_mi_allocate_dmif,
.free_mem_input = dce_mi_free_dmif,
.mem_input_program_surface_flip_and_addr =
dce_mi_program_surface_flip_and_addr,
.mem_input_program_pte_vm = dce_mi_program_pte_vm,
.mem_input_program_surface_config =
dce_mi_program_surface_config,
.mem_input_is_flip_pending = dce_mi_is_flip_pending
};
void dce_mem_input_construct( void dce_mem_input_construct(
struct dce_mem_input *dce_mi, struct dce_mem_input *dce_mi,
...@@ -769,7 +792,7 @@ void dce112_mem_input_construct( ...@@ -769,7 +792,7 @@ void dce112_mem_input_construct(
const struct dce_mem_input_mask *mi_mask) const struct dce_mem_input_mask *mi_mask)
{ {
dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask); dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask);
dce_mi->base.funcs->mem_input_program_display_marks = dce112_mi_program_display_marks; dce_mi->base.funcs = &dce112_mi_funcs;
} }
void dce120_mem_input_construct( void dce120_mem_input_construct(
...@@ -781,5 +804,5 @@ void dce120_mem_input_construct( ...@@ -781,5 +804,5 @@ void dce120_mem_input_construct(
const struct dce_mem_input_mask *mi_mask) const struct dce_mem_input_mask *mi_mask)
{ {
dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask); dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask);
dce_mi->base.funcs->mem_input_program_display_marks = dce120_mi_program_display_marks; dce_mi->base.funcs = &dce120_mi_funcs;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment