leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: remove DCN1 guard as DCN1 is already open sourced.

Browse Source 
Signed-off-by: Kenny Tsao <kenny.tsao@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
AMD\ktsao
2017-07-30 14:18:36 -04:00
committed by Alex Deucher
parent 7a09f5be98
commit 43193c7991
15 changed files with 58 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/display/dc/dc.h
View File

@@ -96,13 +96,9 @@ struct dc_surface;
struct validate_context; struct validate_context;
struct dc_cap_funcs { struct dc_cap_funcs {
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
bool (*get_dcc_compression_cap)(const struct dc *dc, bool (*get_dcc_compression_cap)(const struct dc *dc,
const struct dc_dcc_surface_param *input, const struct dc_dcc_surface_param *input,
struct dc_surface_dcc_cap *output); struct dc_surface_dcc_cap *output);
#else
int i;
#endif
}; };
struct dc_stream_funcs { struct dc_stream_funcs {
@@ -171,7 +167,6 @@ struct dc_debug {
bool disable_stutter; bool disable_stutter;
bool disable_dcc; bool disable_dcc;
bool disable_dfs_bypass; bool disable_dfs_bypass;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
bool disable_dpp_power_gate; bool disable_dpp_power_gate;
bool disable_hubp_power_gate; bool disable_hubp_power_gate;
bool disable_pplib_wm_range; bool disable_pplib_wm_range;
@@ -185,7 +180,6 @@ struct dc_debug {
int percent_of_ideal_drambw; int percent_of_ideal_drambw;
int dram_clock_change_latency_ns; int dram_clock_change_latency_ns;
int always_scale; int always_scale;
#endif
bool disable_pplib_clock_request; bool disable_pplib_clock_request;
bool disable_clock_gate; bool disable_clock_gate;
bool disable_dmcu; bool disable_dmcu;

91
drivers/gpu/drm/amd/display/dc/dce/dce_abm.h
View File

@@ -54,21 +54,19 @@
SR(DC_ABM1_HGLS_REG_READ_PROGRESS), \ SR(DC_ABM1_HGLS_REG_READ_PROGRESS), \
SR(BIOS_SCRATCH_2) SR(BIOS_SCRATCH_2)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #define ABM_DCN10_REG_LIST(id)\
#define ABM_DCN10_REG_LIST(id)\ ABM_COMMON_REG_LIST_DCE_BASE(), \
ABM_COMMON_REG_LIST_DCE_BASE(), \ SRI(DC_ABM1_HG_SAMPLE_RATE, ABM, id), \
SRI(DC_ABM1_HG_SAMPLE_RATE, ABM, id), \ SRI(DC_ABM1_LS_SAMPLE_RATE, ABM, id), \
SRI(DC_ABM1_LS_SAMPLE_RATE, ABM, id), \ SRI(BL1_PWM_BL_UPDATE_SAMPLE_RATE, ABM, id), \
SRI(BL1_PWM_BL_UPDATE_SAMPLE_RATE, ABM, id), \ SRI(DC_ABM1_HG_MISC_CTRL, ABM, id), \
SRI(DC_ABM1_HG_MISC_CTRL, ABM, id), \ SRI(DC_ABM1_IPCSC_COEFF_SEL, ABM, id), \
SRI(DC_ABM1_IPCSC_COEFF_SEL, ABM, id), \ SRI(BL1_PWM_CURRENT_ABM_LEVEL, ABM, id), \
SRI(BL1_PWM_CURRENT_ABM_LEVEL, ABM, id), \ SRI(BL1_PWM_TARGET_ABM_LEVEL, ABM, id), \
SRI(BL1_PWM_TARGET_ABM_LEVEL, ABM, id), \ SRI(BL1_PWM_USER_LEVEL, ABM, id), \
SRI(BL1_PWM_USER_LEVEL, ABM, id), \ SRI(DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, ABM, id), \
SRI(DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, ABM, id), \ SRI(DC_ABM1_HGLS_REG_READ_PROGRESS, ABM, id), \
SRI(DC_ABM1_HGLS_REG_READ_PROGRESS, ABM, id), \ NBIO_SR(BIOS_SCRATCH_2)
NBIO_SR(BIOS_SCRATCH_2)
#endif
#define ABM_SF(reg_name, field_name, post_fix)\ #define ABM_SF(reg_name, field_name, post_fix)\
.field_name = reg_name ## __ ## field_name ## post_fix .field_name = reg_name ## __ ## field_name ## post_fix
@@ -120,39 +118,36 @@
ABM_SF(DC_ABM1_HGLS_REG_READ_PROGRESS, \ ABM_SF(DC_ABM1_HGLS_REG_READ_PROGRESS, \
ABM1_BL_REG_READ_MISSED_FRAME_CLEAR, mask_sh) ABM1_BL_REG_READ_MISSED_FRAME_CLEAR, mask_sh)
#define ABM_MASK_SH_LIST_DCN10(mask_sh) \
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) ABM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh), \
#define ABM_MASK_SH_LIST_DCN10(mask_sh) \ ABM_SF(ABM0_DC_ABM1_HG_MISC_CTRL, \
ABM_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh), \ ABM1_HG_NUM_OF_BINS_SEL, mask_sh), \
ABM_SF(ABM0_DC_ABM1_HG_MISC_CTRL, \ ABM_SF(ABM0_DC_ABM1_HG_MISC_CTRL, \
ABM1_HG_NUM_OF_BINS_SEL, mask_sh), \ ABM1_HG_VMAX_SEL, mask_sh), \
ABM_SF(ABM0_DC_ABM1_HG_MISC_CTRL, \ ABM_SF(ABM0_DC_ABM1_HG_MISC_CTRL, \
ABM1_HG_VMAX_SEL, mask_sh), \ ABM1_HG_BIN_BITWIDTH_SIZE_SEL, mask_sh), \
ABM_SF(ABM0_DC_ABM1_HG_MISC_CTRL, \ ABM_SF(ABM0_DC_ABM1_IPCSC_COEFF_SEL, \
ABM1_HG_BIN_BITWIDTH_SIZE_SEL, mask_sh), \ ABM1_IPCSC_COEFF_SEL_R, mask_sh), \
ABM_SF(ABM0_DC_ABM1_IPCSC_COEFF_SEL, \ ABM_SF(ABM0_DC_ABM1_IPCSC_COEFF_SEL, \
ABM1_IPCSC_COEFF_SEL_R, mask_sh), \ ABM1_IPCSC_COEFF_SEL_G, mask_sh), \
ABM_SF(ABM0_DC_ABM1_IPCSC_COEFF_SEL, \ ABM_SF(ABM0_DC_ABM1_IPCSC_COEFF_SEL, \
ABM1_IPCSC_COEFF_SEL_G, mask_sh), \ ABM1_IPCSC_COEFF_SEL_B, mask_sh), \
ABM_SF(ABM0_DC_ABM1_IPCSC_COEFF_SEL, \ ABM_SF(ABM0_BL1_PWM_CURRENT_ABM_LEVEL, \
ABM1_IPCSC_COEFF_SEL_B, mask_sh), \ BL1_PWM_CURRENT_ABM_LEVEL, mask_sh), \
ABM_SF(ABM0_BL1_PWM_CURRENT_ABM_LEVEL, \ ABM_SF(ABM0_BL1_PWM_TARGET_ABM_LEVEL, \
BL1_PWM_CURRENT_ABM_LEVEL, mask_sh), \ BL1_PWM_TARGET_ABM_LEVEL, mask_sh), \
ABM_SF(ABM0_BL1_PWM_TARGET_ABM_LEVEL, \ ABM_SF(ABM0_BL1_PWM_USER_LEVEL, \
BL1_PWM_TARGET_ABM_LEVEL, mask_sh), \ BL1_PWM_USER_LEVEL, mask_sh), \
ABM_SF(ABM0_BL1_PWM_USER_LEVEL, \ ABM_SF(ABM0_DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, \
BL1_PWM_USER_LEVEL, mask_sh), \ ABM1_LS_MIN_PIXEL_VALUE_THRES, mask_sh), \
ABM_SF(ABM0_DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, \ ABM_SF(ABM0_DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, \
ABM1_LS_MIN_PIXEL_VALUE_THRES, mask_sh), \ ABM1_LS_MAX_PIXEL_VALUE_THRES, mask_sh), \
ABM_SF(ABM0_DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, \ ABM_SF(ABM0_DC_ABM1_HGLS_REG_READ_PROGRESS, \
ABM1_LS_MAX_PIXEL_VALUE_THRES, mask_sh), \ ABM1_HG_REG_READ_MISSED_FRAME_CLEAR, mask_sh), \
ABM_SF(ABM0_DC_ABM1_HGLS_REG_READ_PROGRESS, \ ABM_SF(ABM0_DC_ABM1_HGLS_REG_READ_PROGRESS, \
ABM1_HG_REG_READ_MISSED_FRAME_CLEAR, mask_sh), \ ABM1_LS_REG_READ_MISSED_FRAME_CLEAR, mask_sh), \
ABM_SF(ABM0_DC_ABM1_HGLS_REG_READ_PROGRESS, \ ABM_SF(ABM0_DC_ABM1_HGLS_REG_READ_PROGRESS, \
ABM1_LS_REG_READ_MISSED_FRAME_CLEAR, mask_sh), \ ABM1_BL_REG_READ_MISSED_FRAME_CLEAR, mask_sh)
ABM_SF(ABM0_DC_ABM1_HGLS_REG_READ_PROGRESS, \
ABM1_BL_REG_READ_MISSED_FRAME_CLEAR, mask_sh)
#endif
#define ABM_REG_FIELD_LIST(type) \ #define ABM_REG_FIELD_LIST(type) \
type ABM1_HG_NUM_OF_BINS_SEL; \ type ABM1_HG_NUM_OF_BINS_SEL; \

2
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.h
View File

@@ -55,7 +55,6 @@
CS_SF(PHYPLLA_PIXCLK_RESYNC_CNTL, PHYPLLA_DCCG_DEEP_COLOR_CNTL, mask_sh),\ CS_SF(PHYPLLA_PIXCLK_RESYNC_CNTL, PHYPLLA_DCCG_DEEP_COLOR_CNTL, mask_sh),\
CS_SF(PHYPLLA_PIXCLK_RESYNC_CNTL, PHYPLLA_PIXCLK_DOUBLE_RATE_ENABLE, mask_sh) CS_SF(PHYPLLA_PIXCLK_RESYNC_CNTL, PHYPLLA_PIXCLK_DOUBLE_RATE_ENABLE, mask_sh)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#define CS_COMMON_REG_LIST_DCN1_0(index, pllid) \ #define CS_COMMON_REG_LIST_DCN1_0(index, pllid) \
SRI(PIXCLK_RESYNC_CNTL, PHYPLL, pllid),\ SRI(PIXCLK_RESYNC_CNTL, PHYPLL, pllid),\
SRII(PHASE, DP_DTO, 0),\ SRII(PHASE, DP_DTO, 0),\
@@ -74,7 +73,6 @@
#define CS_COMMON_MASK_SH_LIST_DCN1_0(mask_sh)\ #define CS_COMMON_MASK_SH_LIST_DCN1_0(mask_sh)\
CS_SF(PHYPLLA_PIXCLK_RESYNC_CNTL, PHYPLLA_DCCG_DEEP_COLOR_CNTL, mask_sh),\ CS_SF(PHYPLLA_PIXCLK_RESYNC_CNTL, PHYPLLA_DCCG_DEEP_COLOR_CNTL, mask_sh),\
CS_SF(OTG0_PIXEL_RATE_CNTL, DP_DTO0_ENABLE, mask_sh) CS_SF(OTG0_PIXEL_RATE_CNTL, DP_DTO0_ENABLE, mask_sh)
#endif
#define CS_REG_FIELD_LIST(type) \ #define CS_REG_FIELD_LIST(type) \
type PLL_REF_DIV_SRC; \ type PLL_REF_DIV_SRC; \

20
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h
View File

@@ -48,11 +48,9 @@
DMCU_COMMON_REG_LIST_DCE_BASE(), \ DMCU_COMMON_REG_LIST_DCE_BASE(), \
SR(DCI_MEM_PWR_STATUS) SR(DCI_MEM_PWR_STATUS)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #define DMCU_DCN10_REG_LIST()\
#define DMCU_DCN10_REG_LIST()\ DMCU_COMMON_REG_LIST_DCE_BASE(), \
DMCU_COMMON_REG_LIST_DCE_BASE(), \ SR(DMU_MEM_PWR_CNTL)
SR(DMU_MEM_PWR_CNTL)
#endif
#define DMCU_SF(reg_name, field_name, post_fix)\ #define DMCU_SF(reg_name, field_name, post_fix)\
.field_name = reg_name ## __ ## field_name ## post_fix .field_name = reg_name ## __ ## field_name ## post_fix
@@ -82,12 +80,10 @@
DMCU_SF(DCI_MEM_PWR_STATUS, \ DMCU_SF(DCI_MEM_PWR_STATUS, \
DMCU_IRAM_MEM_PWR_STATE, mask_sh) DMCU_IRAM_MEM_PWR_STATE, mask_sh)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #define DMCU_MASK_SH_LIST_DCN10(mask_sh) \
#define DMCU_MASK_SH_LIST_DCN10(mask_sh) \ DMCU_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh), \
DMCU_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh), \ DMCU_SF(DMU_MEM_PWR_CNTL, \
DMCU_SF(DMU_MEM_PWR_CNTL, \ DMCU_IRAM_MEM_PWR_STATE, mask_sh)
DMCU_IRAM_MEM_PWR_STATE, mask_sh)
#endif
#define DMCU_REG_FIELD_LIST(type) \ #define DMCU_REG_FIELD_LIST(type) \
type DMCU_IRAM_MEM_PWR_STATE; \ type DMCU_IRAM_MEM_PWR_STATE; \
@@ -211,13 +207,11 @@ struct dmcu *dce_dmcu_create(
const struct dce_dmcu_shift *dmcu_shift, const struct dce_dmcu_shift *dmcu_shift,
const struct dce_dmcu_mask *dmcu_mask); const struct dce_dmcu_mask *dmcu_mask);
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
struct dmcu *dcn10_dmcu_create( struct dmcu *dcn10_dmcu_create(
struct dc_context *ctx, struct dc_context *ctx,
const struct dce_dmcu_registers *regs, const struct dce_dmcu_registers *regs,
const struct dce_dmcu_shift *dmcu_shift, const struct dce_dmcu_shift *dmcu_shift,
const struct dce_dmcu_mask *dmcu_mask); const struct dce_dmcu_mask *dmcu_mask);
#endif
void dce_dmcu_destroy(struct dmcu **dmcu); void dce_dmcu_destroy(struct dmcu **dmcu);

15
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
View File

@@ -100,15 +100,12 @@
SRI(DP_DPHY_HBR2_PATTERN_CONTROL, DP, id), \ SRI(DP_DPHY_HBR2_PATTERN_CONTROL, DP, id), \
SR(DCI_MEM_PWR_STATUS) SR(DCI_MEM_PWR_STATUS)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #define LE_DCN10_REG_LIST(id)\
#define LE_DCN10_REG_LIST(id)\ LE_COMMON_REG_LIST_BASE(id), \
LE_COMMON_REG_LIST_BASE(id), \ SRI(DP_DPHY_BS_SR_SWAP_CNTL, DP, id), \
SRI(DP_DPHY_BS_SR_SWAP_CNTL, DP, id), \ SRI(DP_DPHY_INTERNAL_CTRL, DP, id), \
SRI(DP_DPHY_INTERNAL_CTRL, DP, id), \ SRI(DP_DPHY_HBR2_PATTERN_CONTROL, DP, id), \
SRI(DP_DPHY_HBR2_PATTERN_CONTROL, DP, id), \ SR(DMU_MEM_PWR_CNTL)
SR(DMU_MEM_PWR_CNTL)
#endif
struct dce110_link_enc_aux_registers { struct dce110_link_enc_aux_registers {
uint32_t AUX_CONTROL; uint32_t AUX_CONTROL;

6
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
View File

@@ -97,7 +97,6 @@
SE_COMMON_REG_LIST_DCE_BASE(id), \ SE_COMMON_REG_LIST_DCE_BASE(id), \
SRI(AFMT_CNTL, DIG, id) SRI(AFMT_CNTL, DIG, id)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#define SE_DCN_REG_LIST(id)\ #define SE_DCN_REG_LIST(id)\
SE_COMMON_REG_LIST_BASE(id),\ SE_COMMON_REG_LIST_BASE(id),\
SRI(AFMT_CNTL, DIG, id),\ SRI(AFMT_CNTL, DIG, id),\
@@ -112,7 +111,6 @@
SRI(DP_MSA_TIMING_PARAM3, DP, id), \ SRI(DP_MSA_TIMING_PARAM3, DP, id), \
SRI(DP_MSA_TIMING_PARAM4, DP, id), \ SRI(DP_MSA_TIMING_PARAM4, DP, id), \
SRI(HDMI_DB_CONTROL, DIG, id) SRI(HDMI_DB_CONTROL, DIG, id)
#endif
#define SE_SF(reg_name, field_name, post_fix)\ #define SE_SF(reg_name, field_name, post_fix)\
.field_name = reg_name ## __ ## field_name ## post_fix .field_name = reg_name ## __ ## field_name ## post_fix
@@ -328,7 +326,6 @@
SE_SF(DIG0_AFMT_AVI_INFO3, AFMT_AVI_INFO_VERSION, mask_sh),\ SE_SF(DIG0_AFMT_AVI_INFO3, AFMT_AVI_INFO_VERSION, mask_sh),\
SE_SF(DP0_DP_VID_TIMING, DP_VID_M_DOUBLE_VALUE_EN, mask_sh) SE_SF(DP0_DP_VID_TIMING, DP_VID_M_DOUBLE_VALUE_EN, mask_sh)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#define SE_COMMON_MASK_SH_LIST_DCN10(mask_sh)\ #define SE_COMMON_MASK_SH_LIST_DCN10(mask_sh)\
SE_COMMON_MASK_SH_LIST_SOC(mask_sh),\ SE_COMMON_MASK_SH_LIST_SOC(mask_sh),\
SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_LOCK_STATUS, mask_sh),\ SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_LOCK_STATUS, mask_sh),\
@@ -368,7 +365,6 @@
SE_SF(DP0_DP_MSA_TIMING_PARAM4, DP_MSA_VHEIGHT, mask_sh),\ SE_SF(DP0_DP_MSA_TIMING_PARAM4, DP_MSA_VHEIGHT, mask_sh),\
SE_SF(DIG0_HDMI_DB_CONTROL, HDMI_DB_DISABLE, mask_sh),\ SE_SF(DIG0_HDMI_DB_CONTROL, HDMI_DB_DISABLE, mask_sh),\
SE_SF(DP0_DP_VID_TIMING, DP_VID_N_MUL, mask_sh) SE_SF(DP0_DP_VID_TIMING, DP_VID_N_MUL, mask_sh)
#endif
struct dce_stream_encoder_shift { struct dce_stream_encoder_shift {
uint8_t AFMT_GENERIC_INDEX; uint8_t AFMT_GENERIC_INDEX;
@@ -684,7 +680,6 @@ struct dce110_stream_enc_registers {
uint32_t HDMI_ACR_48_0; uint32_t HDMI_ACR_48_0;
uint32_t HDMI_ACR_48_1; uint32_t HDMI_ACR_48_1;
uint32_t TMDS_CNTL; uint32_t TMDS_CNTL;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
uint32_t DP_DB_CNTL; uint32_t DP_DB_CNTL;
uint32_t DP_MSA_MISC; uint32_t DP_MSA_MISC;
uint32_t DP_MSA_COLORIMETRY; uint32_t DP_MSA_COLORIMETRY;
@@ -693,7 +688,6 @@ struct dce110_stream_enc_registers {
uint32_t DP_MSA_TIMING_PARAM3; uint32_t DP_MSA_TIMING_PARAM3;
uint32_t DP_MSA_TIMING_PARAM4; uint32_t DP_MSA_TIMING_PARAM4;
uint32_t HDMI_DB_CONTROL; uint32_t HDMI_DB_CONTROL;
#endif
}; };
struct dce110_stream_encoder { struct dce110_stream_encoder {

2
drivers/gpu/drm/amd/display/dc/dm_services.h
View File

@@ -75,9 +75,7 @@
BREAK_TO_DEBUGGER(); \ BREAK_TO_DEBUGGER(); \
} while (0) } while (0)
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include <asm/fpu/api.h> #include <asm/fpu/api.h>
#endif
#define dm_alloc(size) kzalloc(size, GFP_KERNEL) #define dm_alloc(size) kzalloc(size, GFP_KERNEL)
#define dm_realloc(ptr, size) krealloc(ptr, size, GFP_KERNEL) #define dm_realloc(ptr, size) krealloc(ptr, size, GFP_KERNEL)

2
drivers/gpu/drm/amd/display/dc/inc/core_types.h
View File

@@ -32,9 +32,7 @@
#include "ddc_service_types.h" #include "ddc_service_types.h"
#include "dc_bios_types.h" #include "dc_bios_types.h"
#include "mem_input.h" #include "mem_input.h"
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include "mpc.h" #include "mpc.h"
#endif
#define MAX_CLOCK_SOURCES 7 #define MAX_CLOCK_SOURCES 7

2
drivers/gpu/drm/amd/display/dc/inc/hw/display_clock.h
View File

@@ -37,13 +37,11 @@ struct clocks_value {
bool dispclk_notify_pplib_done; bool dispclk_notify_pplib_done;
bool pixelclk_notify_pplib_done; bool pixelclk_notify_pplib_done;
bool phyclk_notigy_pplib_done; bool phyclk_notigy_pplib_done;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
int dcfclock_in_khz; int dcfclock_in_khz;
int dppclk_in_khz; int dppclk_in_khz;
int mclk_in_khz; int mclk_in_khz;
int phyclk_in_khz; int phyclk_in_khz;
int common_vdd_level; int common_vdd_level;
#endif
}; };

2
drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h
View File

@@ -122,9 +122,7 @@ struct ipp_funcs {
struct input_pixel_processor *ipp, struct input_pixel_processor *ipp,
const struct pwl_params *params); const struct pwl_params *params);
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
void (*ipp_destroy)(struct input_pixel_processor **ipp); void (*ipp_destroy)(struct input_pixel_processor **ipp);
#endif
}; };
#endif /* __DAL_IPP_H__ */ #endif /* __DAL_IPP_H__ */

4
drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
View File

@@ -28,7 +28,6 @@
#include "dc.h" #include "dc.h"
#include "include/grph_object_id.h" #include "include/grph_object_id.h"
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include "dml/display_mode_structs.h" #include "dml/display_mode_structs.h"
struct cstate_pstate_watermarks_st { struct cstate_pstate_watermarks_st {
@@ -49,7 +48,6 @@ struct dcn_watermark_set {
struct dcn_watermarks c; struct dcn_watermarks c;
struct dcn_watermarks d; struct dcn_watermarks d;
}; };
#endif
struct dce_watermarks { struct dce_watermarks {
int a_mark; int a_mark;
@@ -76,7 +74,6 @@ struct mem_input {
}; };
struct mem_input_funcs { struct mem_input_funcs {
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
void (*mem_input_setup)( void (*mem_input_setup)(
struct mem_input *mem_input, struct mem_input *mem_input,
struct _vcs_dpi_display_dlg_regs_st *dlg_regs, struct _vcs_dpi_display_dlg_regs_st *dlg_regs,
@@ -90,7 +87,6 @@ struct mem_input_funcs {
struct mem_input *mem_input, struct mem_input *mem_input,
const struct rect *viewport, const struct rect *viewport,
const struct rect *viewport_c); const struct rect *viewport_c);
#endif
void (*mem_input_program_display_marks)( void (*mem_input_program_display_marks)(
struct mem_input *mem_input, struct mem_input *mem_input,

2
drivers/gpu/drm/amd/display/dc/inc/hw/opp.h
View File

@@ -27,9 +27,7 @@
#define __DAL_OPP_H__ #define __DAL_OPP_H__
#include "hw_shared.h" #include "hw_shared.h"
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#include "dc_hw_types.h" #include "dc_hw_types.h"
#endif
#include "transform.h" #include "transform.h"
struct fixed31_32; struct fixed31_32;

7
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
View File

@@ -91,7 +91,7 @@ enum crtc_state {
CRTC_STATE_VBLANK = 0, CRTC_STATE_VBLANK = 0,
CRTC_STATE_VACTIVE CRTC_STATE_VACTIVE
}; };
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
struct _dlg_otg_param { struct _dlg_otg_param {
int vstartup_start; int vstartup_start;
int vupdate_offset; int vupdate_offset;
@@ -99,7 +99,6 @@ struct _dlg_otg_param {
int vready_offset; int vready_offset;
enum signal_type signal; enum signal_type signal;
}; };
#endif
struct crtc_stereo_flags { struct crtc_stereo_flags {
uint8_t PROGRAM_STEREO : 1; uint8_t PROGRAM_STEREO : 1;
@@ -113,9 +112,7 @@ struct timing_generator {
const struct timing_generator_funcs *funcs; const struct timing_generator_funcs *funcs;
struct dc_bios *bp; struct dc_bios *bp;
struct dc_context *ctx; struct dc_context *ctx;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
struct _dlg_otg_param dlg_otg_param; struct _dlg_otg_param dlg_otg_param;
#endif
int inst; int inst;
}; };
@@ -176,10 +173,8 @@ struct timing_generator_funcs {
bool (*arm_vert_intr)(struct timing_generator *tg, uint8_t width); bool (*arm_vert_intr)(struct timing_generator *tg, uint8_t width);
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
void (*program_global_sync)(struct timing_generator *tg); void (*program_global_sync)(struct timing_generator *tg);
void (*enable_optc_clock)(struct timing_generator *tg, bool enable); void (*enable_optc_clock)(struct timing_generator *tg, bool enable);
#endif
void (*program_stereo)(struct timing_generator *tg, void (*program_stereo)(struct timing_generator *tg,
const struct dc_crtc_timing *timing, struct crtc_stereo_flags *flags); const struct dc_crtc_timing *timing, struct crtc_stereo_flags *flags);
bool (*is_stereo_left_eye)(struct timing_generator *tg); bool (*is_stereo_left_eye)(struct timing_generator *tg);

4
drivers/gpu/drm/amd/display/include/dal_asic_id.h
View File

@@ -109,18 +109,14 @@
#define ASIC_REV_IS_STONEY(rev) \ #define ASIC_REV_IS_STONEY(rev) \
((rev >= STONEY_A0) && (rev < CZ_UNKNOWN)) ((rev >= STONEY_A0) && (rev < CZ_UNKNOWN))
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
/* DCN1_0 */ /* DCN1_0 */
#define INTERNAL_REV_RAVEN_A0 0x00 /* First spin of Raven */ #define INTERNAL_REV_RAVEN_A0 0x00 /* First spin of Raven */
#define RAVEN_A0 0x01 #define RAVEN_A0 0x01
#define RAVEN_UNKNOWN 0xFF #define RAVEN_UNKNOWN 0xFF
#define ASIC_REV_IS_RAVEN(eChipRev) ((eChipRev >= RAVEN_A0) && eChipRev < RAVEN_UNKNOWN) #define ASIC_REV_IS_RAVEN(eChipRev) ((eChipRev >= RAVEN_A0) && eChipRev < RAVEN_UNKNOWN)
#endif
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
#define FAMILY_RV 142 /* DCN 1*/ #define FAMILY_RV 142 /* DCN 1*/
#endif
/* /*
* ASIC chip ID * ASIC chip ID

3
drivers/gpu/drm/amd/display/include/dal_types.h
View File

@@ -39,9 +39,8 @@ enum dce_version {
DCE_VERSION_11_0, DCE_VERSION_11_0,
DCE_VERSION_11_2, DCE_VERSION_11_2,
DCE_VERSION_12_0, DCE_VERSION_12_0,
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) DCE_VERSION_MAX,
DCN_VERSION_1_0, DCN_VERSION_1_0,
#endif
DCN_VERSION_MAX DCN_VERSION_MAX
}; };