tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amd/display: Clean up code in DC
This commit removes some unnecessary code and makes the required
adjustments to replace other parts of the code with a short option.
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Rodrigo Siqueira
and committed by
Alex Deucher
7da45e74
2a8f7464
+10
-25
+3
-3
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c
+3
-3
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c
···
248
248
enc10->base.hpd_source = init_data->hpd_source;
249
249
enc10->base.connector = init_data->connector;
250
250
251
-
if (enc10->base.connector.id == CONNECTOR_ID_USBC)
252
-
enc10->base.features.flags.bits.DP_IS_USB_C = 1;
253
-
254
251
enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;
255
252
256
253
enc10->base.features = *enc_features;
254
+
255
+
if (enc10->base.connector.id == CONNECTOR_ID_USBC)
256
+
enc10->base.features.flags.bits.DP_IS_USB_C = 1;
257
257
258
258
enc10->base.transmitter = init_data->transmitter;
259
259
+1
-9
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.h
+1
-9
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.h
···
26
26
#ifndef __DC_LINK_ENCODER__DCN32_H__
27
27
#define __DC_LINK_ENCODER__DCN32_H__
28
28
29
-
#include "dcn31/dcn31_dio_link_encoder.h"
30
-
31
-
#define LE_DCN32_REG_LIST(id)\
32
-
LE_DCN31_REG_LIST(id),\
33
-
SRI(DIG_FIFO_CTRL0, DIG, id)
34
-
35
-
#define LINK_ENCODER_MASK_SH_LIST_DCN32(mask_sh) \
36
-
LINK_ENCODER_MASK_SH_LIST_DCN31(mask_sh),\
37
-
LE_SF(DIG0_DIG_FIFO_CTRL0, DIG_FIFO_OUTPUT_PIXEL_MODE, mask_sh)
29
+
#include "dcn30/dcn30_dio_link_encoder.h"
38
30
39
31
void dcn32_link_encoder_construct(
40
32
struct dcn20_link_encoder *enc20,
-5
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.c
-5
drivers/gpu/drm/amd/display/dc/dcn321/dcn321_dio_link_encoder.c
···
127
127
* while doing the DP sink detect
128
128
*/
129
129
130
-
/* if (dal_adapter_service_is_feature_supported(as,
131
-
FEATURE_DP_SINK_DETECT_POLL_DATA_PIN))
132
-
enc10->base.features.flags.bits.
133
-
DP_SINK_DETECT_POLL_DATA_PIN = true;*/
134
-
135
130
enc10->base.output_signals =
136
131
SIGNAL_TYPE_DVI_SINGLE_LINK |
137
132
SIGNAL_TYPE_DVI_DUAL_LINK |
+1
-2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
+1
-2
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
···
163
163
164
164
enum signal_type (*get_dig_mode)(
165
165
struct link_encoder *enc);
166
+
166
167
void (*set_dio_phy_mux)(
167
168
struct link_encoder *enc,
168
169
enum encoder_type_select sel,
169
170
uint32_t hpo_inst);
170
-
void (*set_dig_output_mode)(
171
-
struct link_encoder *enc, uint8_t pix_per_container);
172
171
};
173
172
174
173
/*
+5
-6
drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
+5
-6
drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
···
62
62
#include "dcn20/dcn20_vmid.h"
63
63
#include "dce/dce_panel_cntl.h"
64
64
65
+
#include "dcn20/dcn20_dwb.h"
66
+
#include "dcn20/dcn20_mmhubbub.h"
67
+
65
68
#include "navi10_ip_offset.h"
66
69
67
70
#include "dcn/dcn_2_0_0_offset.h"
···
73
70
#include "dpcs/dpcs_2_0_0_sh_mask.h"
74
71
75
72
#include "nbio/nbio_2_3_offset.h"
76
-
77
-
#include "dcn20/dcn20_dwb.h"
78
-
#include "dcn20/dcn20_mmhubbub.h"
79
73
80
74
#include "mmhub/mmhub_2_0_0_offset.h"
81
75
#include "mmhub/mmhub_2_0_0_sh_mask.h"
···
83
83
#include "dce/dce_aux.h"
84
84
#include "dce/dce_i2c.h"
85
85
#include "vm_helper.h"
86
+
86
87
#include "link_enc_cfg.h"
87
-
88
-
#include "amdgpu_socbb.h"
89
-
90
88
#include "link.h"
89
+
91
90
#define DC_LOGGER_INIT(logger)
92
91
93
92
#ifndef mmDP0_DP_DPHY_INTERNAL_CTRL