aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/1017-drm-amd-dal-drop-dead-set_critical_scratch-code.patch
blob: 3bdb0be664625670b26ef04600e13236b8853bd3 (plain)
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
From 977b21367fdb17c5f1188163a21d5ebafcbb6575 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 11 Apr 2016 17:43:49 +1000
Subject: [PATCH 1017/1110] drm/amd/dal: drop dead set_critical_scratch code.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h     |  3 ---
 .../drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c | 16 ----------------
 2 files changed, 19 deletions(-)

diff --git a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h
index a8e10c9..6545f65 100644
--- a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h
+++ b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h
@@ -61,9 +61,6 @@ struct bios_parser_helper {
 		struct dc_context *ctx);
 	bool (*is_accelerated_mode)(
 		struct dc_context *ctx);
-	void (*set_scratch_critical_state)(
-		struct dc_context *ctx,
-		bool state);
 	void (*prepare_scratch_active_and_requested)(
 		struct dc_context *ctx,
 		struct vbios_helper_data *data,
diff --git a/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c b/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c
index a7e42b5..650a1ac 100644
--- a/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c
+++ b/drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c
@@ -214,21 +214,6 @@ static bool is_accelerated_mode(
 	return (value & ATOM_S6_ACC_MODE) ? true : false;
 }
 
-static void set_scratch_critical_state(
-	struct dc_context *ctx,
-	bool state)
-{
-	uint32_t addr = mmBIOS_SCRATCH_6;
-	uint32_t value = dm_read_reg(ctx, addr);
-
-	if (state)
-		value |= ATOM_S6_CRITICAL_STATE;
-	else
-		value &= ~ATOM_S6_CRITICAL_STATE;
-
-	dm_write_reg(ctx, addr, value);
-}
-
 /**
  * prepare_scratch_active_and_requested
  *
@@ -636,7 +621,6 @@ static const struct bios_parser_helper bios_parser_helper_funcs = {
 		prepare_scratch_active_and_requested,
 	.set_scratch_acc_mode_change = set_scratch_acc_mode_change,
 	.set_scratch_active_and_requested = set_scratch_active_and_requested,
-	.set_scratch_critical_state = set_scratch_critical_state,
 	.take_backlight_control = take_backlight_control,
 	.update_requested_backlight_level = update_requested_backlight_level,
 };
-- 
2.7.4