1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From cf63c3c07c98db9373e60f4bbf49a60978a23cab Mon Sep 17 00:00:00 2001
From: Aric Cyr <aric.cyr@amd.com>
Date: Wed, 2 Dec 2015 14:15:06 -0500
Subject: [PATCH 0563/1110] drm/amd/dal: Fix DCE80 bandwidth programming model
to match DCE110
Signed-off-by: Aric Cyr <aric.cyr@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
---
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 6 +++---
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c
index 0be98a8..1d289ba 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c
@@ -1310,12 +1310,12 @@ static void set_safe_displaymarks(struct validate_context *context)
static void dce110_program_bw(struct dc *dc, struct validate_context *context)
{
- set_safe_displaymarks(&dc->current_context);
+ set_safe_displaymarks(context);
/*TODO: when pplib works*/
/*dc_set_clocks_and_clock_state(context);*/
- set_display_clock(&dc->current_context);
- set_displaymarks(dc, &dc->current_context);
+ set_display_clock(context);
+ set_displaymarks(dc, context);
}
/*TODO: break out clock sources like timing gen/ encoder*/
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c
index 889c02d..f7ef317 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c
@@ -535,7 +535,7 @@ static void program_urgency_watermark(
dal_write_reg(ctx, urgency_addr, urgency_cntl);
}
-void program_stutter_watermark(
+static void program_stutter_watermark(
const struct dc_context *ctx,
const uint32_t offset,
struct bw_watermarks marks)
@@ -600,7 +600,7 @@ void program_stutter_watermark(
dal_write_reg(ctx, stutter_addr, stutter_cntl);
}
-void program_nbp_watermark(
+static void program_nbp_watermark(
const struct dc_context *ctx,
const uint32_t offset,
struct bw_watermarks marks)
@@ -694,7 +694,6 @@ void dce110_mem_input_program_safe_display_marks(struct mem_input *mi)
mi->ctx, bm_dce110->offsets.dmif, max_marks, MAX_WATERMARK);
program_stutter_watermark(mi->ctx, bm_dce110->offsets.dmif, max_marks);
program_nbp_watermark(mi->ctx, bm_dce110->offsets.dmif, nbp_marks);
-
}
void dce110_mem_input_program_display_marks(
--
2.7.4
|
