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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
From 05a8f8b4b87dc21aed2f624f9b432bc7db5c3afb Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 3 Oct 2017 13:49:44 +1000
Subject: [PATCH 2451/4131] amdgpu/dc: drop hw_sequencer_types.h
This isn't used or required.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
.../display/dc/dce110/dce110_timing_generator.h | 1 -
.../display/dc/dce120/dce120_timing_generator.h | 1 -
drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 -
.../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 -
.../drm/amd/display/include/hw_sequencer_types.h | 33 ----------------------
5 files changed, 37 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/display/include/hw_sequencer_types.h
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
index bd8d0ab..82737de 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
@@ -28,7 +28,6 @@
#include "timing_generator.h"
#include "../include/grph_object_id.h"
-#include "../include/hw_sequencer_types.h"
/* GSL Sync related values */
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.h b/drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.h
index d69871e..549d70b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.h
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.h
@@ -28,7 +28,6 @@
#include "timing_generator.h"
#include "../include/grph_object_id.h"
-#include "../include/hw_sequencer_types.h"
#include "dce110/dce110_timing_generator.h"
diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index 1a1d322..c47ce6b 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -46,7 +46,6 @@ void enable_surface_flip_reporting(struct dc_plane_state *plane_state,
#include "stream_encoder.h"
#include "clock_source.h"
#include "audio.h"
-#include "hw_sequencer_types.h"
#include "dm_pp_smu.h"
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
index 6ff90a0f..3050afe 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
@@ -6,7 +6,6 @@
#ifndef STREAM_ENCODER_H_
#define STREAM_ENCODER_H_
-#include "include/hw_sequencer_types.h"
#include "audio_types.h"
struct dc_bios;
diff --git a/drivers/gpu/drm/amd/display/include/hw_sequencer_types.h b/drivers/gpu/drm/amd/display/include/hw_sequencer_types.h
deleted file mode 100644
index 8ba9f65..0000000
--- a/drivers/gpu/drm/amd/display/include/hw_sequencer_types.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2012-15 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_HW_SEQUENCER_TYPES_H__
-#define __DAL_HW_SEQUENCER_TYPES_H__
-
-#include "signal_types.h"
-#include "grph_object_defs.h"
-#include "link_service_types.h"
-
-#endif
--
2.7.4
|
