drm/radeon/kms: turn the backlight off explicitly for dpms
Subsystems (2)
PATCH 1/4 drm/radeon/kms: turn the backlight off explicitly for dpms
Seems some newer systems require this explicitly.
--- drivers/gpu/drm/radeon/radeon_encoders.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)
drivers/gpu/drm/radeon/radeon_encoders.c +14 -1
@@ -1086,6 +1086,8 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)if (ASIC_IS_DCE4 (rdev))atombios_dig_encoder_setup (encoder,ATOM_ENCODER_CMD_DP_VIDEO_ON ); } +if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) +atombios_dig_transmitter_setup (encoder,ATOM_TRANSMITTER_ACTION_LCD_BLON ,0 ,0 );break ;case DRM_MODE_DPMS_STANDBY :case DRM_MODE_DPMS_SUSPEND :
@@ -1095,20 +1097,31 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)if (ASIC_IS_DCE4 (rdev))atombios_dig_encoder_setup (encoder,ATOM_ENCODER_CMD_DP_VIDEO_OFF ); } +if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) +atombios_dig_transmitter_setup (encoder,ATOM_TRANSMITTER_ACTION_LCD_BLOFF ,0 ,0 );break ; } }else {switch (mode) {case DRM_MODE_DPMS_ON : args.ucAction =ATOM_ENABLE ; +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { + args.ucAction =ATOM_LCD_BLON ; +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); + }break ;case DRM_MODE_DPMS_STANDBY :case DRM_MODE_DPMS_SUSPEND :case DRM_MODE_DPMS_OFF : args.ucAction =ATOM_DISABLE ; +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { + args.ucAction =ATOM_LCD_BLOFF ; +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); + }break ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); }radeon_atombios_encoder_dpms_scratch_regs (encoder, (mode ==DRM_MODE_DPMS_ON ) ? true : false);
Signature · 1 line
1.7.1.1
PATCH 2/4 drm/radeon/kms: properly power up/down the eDP panel as needed
The eDP panel must be powered up for aux transactions, so power it up for detect and mode probe functions, otherwise power it up or down based on dpms.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 13 +++++++++ drivers/gpu/drm/radeon/radeon_encoders.c | 41 ++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_mode.h | 2 + 3 files changed, 56 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +13 -0
@@ -1008,9 +1008,16 @@ static void radeon_dp_connector_destroy(struct drm_connector *connector)static int radeon_dp_get_modes (struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector); +struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv;int ret; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_ON ); ret =radeon_ddc_get_modes (radeon_connector); +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF );return ret; }
@@ -1029,8 +1036,14 @@ radeon_dp_detect(struct drm_connector *connector, bool force)if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {/* eDP is always DP */ radeon_dig_connector->dp_sink_type =CONNECTOR_OBJECT_ID_DISPLAYPORT ; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_ON );if (radeon_dp_getdpcd (radeon_connector)) ret = connector_status_connected; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF ); }else { radeon_dig_connector->dp_sink_type =radeon_dp_getsinktype (radeon_connector);if (radeon_dig_connector->dp_sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) {
drivers/gpu/drm/radeon/radeon_encoders.c +41 -0
59 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +2 -0
@@ -385,6 +385,7 @@ struct radeon_connector_atom_dig {u8 dp_sink_type;int dp_clock;int dp_lane_count; +bool edp_on; };struct radeon_gpio_rec {
@@ -526,6 +527,7 @@ struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, iextern void atombios_external_tmds_setup (struct drm_encoder *encoder,int action);extern void atombios_digital_setup (struct drm_encoder *encoder,int action);extern int atombios_get_encoder_mode (struct drm_encoder *encoder); +extern void atombios_set_edp_panel_power (struct radeon_connector *radeon_connector,int action);extern void radeon_encoder_set_active_device (struct drm_encoder *encoder);extern void radeon_crtc_load_lut (struct drm_crtc *crtc);
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: properly power up/down the eDP panel as needed (v2)
The eDP panel must be powered up for aux transactions, so power it up for detect and mode probe functions, otherwise power it up or down based on dpms.
v2:
- only mess with eDP panel on DCE4+
- only mess with eDP panel on eDP connectors, not all DP connectors
--- drivers/gpu/drm/radeon/radeon_connectors.c | 18 +++++++++++ drivers/gpu/drm/radeon/radeon_encoders.c | 44 ++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_mode.h | 2 + 3 files changed, 64 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +18 -0
@@ -1008,9 +1008,21 @@ static void radeon_dp_connector_destroy(struct drm_connector *connector)static int radeon_dp_get_modes (struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector); +struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv;int ret; +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_ON ); + } ret =radeon_ddc_get_modes (radeon_connector); +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF ); + } +return ret; }
@@ -1029,8 +1041,14 @@ radeon_dp_detect(struct drm_connector *connector, bool force)if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {/* eDP is always DP */ radeon_dig_connector->dp_sink_type =CONNECTOR_OBJECT_ID_DISPLAYPORT ; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_ON );if (radeon_dp_getdpcd (radeon_connector)) ret = connector_status_connected; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (radeon_connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF ); }else { radeon_dig_connector->dp_sink_type =radeon_dp_getsinktype (radeon_connector);if (radeon_dig_connector->dp_sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) {
drivers/gpu/drm/radeon/radeon_encoders.c +44 -0
62 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +2 -0
@@ -385,6 +385,7 @@ struct radeon_connector_atom_dig {u8 dp_sink_type;int dp_clock;int dp_lane_count; +bool edp_on; };struct radeon_gpio_rec {
@@ -526,6 +527,7 @@ struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, iextern void atombios_external_tmds_setup (struct drm_encoder *encoder,int action);extern void atombios_digital_setup (struct drm_encoder *encoder,int action);extern int atombios_get_encoder_mode (struct drm_encoder *encoder); +extern void atombios_set_edp_panel_power (struct radeon_connector *radeon_connector,int action);extern void radeon_encoder_set_active_device (struct drm_encoder *encoder);extern void radeon_crtc_load_lut (struct drm_crtc *crtc);
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: properly power up/down the eDP panel as needed (v3)
The eDP panel must be powered up for aux transactions, so power it up for detect and mode probe functions, otherwise power it up or down based on dpms.
v2:
- only mess with eDP panel on DCE4+
- only mess with eDP panel on eDP connectors, not all DP connectors v3:
- be extra careful to only mess with eDP panels on eDP connectors
--- drivers/gpu/drm/radeon/radeon_connectors.c | 18 ++++++++++ drivers/gpu/drm/radeon/radeon_encoders.c | 48 ++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_mode.h | 2 + 3 files changed, 68 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +18 -0
@@ -1008,9 +1008,21 @@ static void radeon_dp_connector_destroy(struct drm_connector *connector)static int radeon_dp_get_modes (struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector); +struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv;int ret; +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_ON ); + } ret =radeon_ddc_get_modes (radeon_connector); +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF ); + } +return ret; }
@@ -1029,8 +1041,14 @@ radeon_dp_detect(struct drm_connector *connector, bool force)if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {/* eDP is always DP */ radeon_dig_connector->dp_sink_type =CONNECTOR_OBJECT_ID_DISPLAYPORT ; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_ON );if (radeon_dp_getdpcd (radeon_connector)) ret = connector_status_connected; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF ); }else { radeon_dig_connector->dp_sink_type =radeon_dp_getsinktype (radeon_connector);if (radeon_dig_connector->dp_sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) {
drivers/gpu/drm/radeon/radeon_encoders.c +48 -0
68 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +2 -0
@@ -385,6 +385,7 @@ struct radeon_connector_atom_dig {u8 dp_sink_type;int dp_clock;int dp_lane_count; +bool edp_on; };struct radeon_gpio_rec {
@@ -526,6 +527,7 @@ struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, iextern void atombios_external_tmds_setup (struct drm_encoder *encoder,int action);extern void atombios_digital_setup (struct drm_encoder *encoder,int action);extern int atombios_get_encoder_mode (struct drm_encoder *encoder); +extern void atombios_set_edp_panel_power (struct drm_connector *connector,int action);extern void radeon_encoder_set_active_device (struct drm_encoder *encoder);extern void radeon_crtc_load_lut (struct drm_crtc *crtc);
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: properly power up/down the eDP panel as needed (v4)
The eDP panel must be powered up for aux transactions, so power it up for detect and mode probe functions, otherwise power it up or down based on dpms.
v2:
- only mess with eDP panel on DCE4+
- only mess with eDP panel on eDP connectors, not all DP connectors v3:
- be extra careful to only mess with eDP panels on eDP connectors v4:
- avoid possible null derefernce if a connector has not been assigned to the encoder
--- drivers/gpu/drm/radeon/radeon_connectors.c | 18 ++++++++++ drivers/gpu/drm/radeon/radeon_encoders.c | 50 ++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_mode.h | 2 + 3 files changed, 70 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +18 -0
@@ -1008,9 +1008,21 @@ static void radeon_dp_connector_destroy(struct drm_connector *connector)static int radeon_dp_get_modes (struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector); +struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv;int ret; +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_ON ); + } ret =radeon_ddc_get_modes (radeon_connector); +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF ); + } +return ret; }
@@ -1029,8 +1041,14 @@ radeon_dp_detect(struct drm_connector *connector, bool force)if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {/* eDP is always DP */ radeon_dig_connector->dp_sink_type =CONNECTOR_OBJECT_ID_DISPLAYPORT ; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_ON );if (radeon_dp_getdpcd (radeon_connector)) ret = connector_status_connected; +if (!radeon_dig_connector->edp_on) +atombios_set_edp_panel_power (connector, +ATOM_TRANSMITTER_ACTION_POWER_OFF ); }else { radeon_dig_connector->dp_sink_type =radeon_dp_getsinktype (radeon_connector);if (radeon_dig_connector->dp_sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) {
drivers/gpu/drm/radeon/radeon_encoders.c +50 -0
70 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +2 -0
@@ -385,6 +385,7 @@ struct radeon_connector_atom_dig {u8 dp_sink_type;int dp_clock;int dp_lane_count; +bool edp_on; };struct radeon_gpio_rec {
@@ -526,6 +527,7 @@ struct drm_encoder *radeon_encoder_legacy_tmds_ext_add(struct drm_device *dev, iextern void atombios_external_tmds_setup (struct drm_encoder *encoder,int action);extern void atombios_digital_setup (struct drm_encoder *encoder,int action);extern int atombios_get_encoder_mode (struct drm_encoder *encoder); +extern void atombios_set_edp_panel_power (struct drm_connector *connector,int action);extern void radeon_encoder_set_active_device (struct drm_encoder *encoder);extern void radeon_crtc_load_lut (struct drm_crtc *crtc);
Signature · 1 line
1.7.1.1
PATCH 3/4 drm/radeon/kms/atom: cleanup and unify DVO handling
In reply to Alex DeucherHandle all the various asic family specific things for DVO.
--- drivers/gpu/drm/radeon/radeon.h | 4 + drivers/gpu/drm/radeon/radeon_encoders.c | 90 ++++++++++++----------- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- drivers/gpu/drm/radeon/radeon_mode.h | 2 +- 4 files changed, 52 insertions(+), 46 deletions(-)
drivers/gpu/drm/radeon/radeon.h +4 -0
@@ -1262,6 +1262,10 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); (rdev->family == CHIP_RS400) || \ (rdev->family == CHIP_RS480))#define ASIC_IS_AVIVO (rdev) ((rdev->family >= CHIP_RS600)) +#define ASIC_IS_DCE2 (rdev) ((rdev->family == CHIP_RS600) || \ + (rdev->family == CHIP_RS690) || \ + (rdev->family == CHIP_RS740) || \ + (rdev->family >= CHIP_R600))#define ASIC_IS_DCE3 (rdev) ((rdev->family >= CHIP_RV620))#define ASIC_IS_DCE32 (rdev) ((rdev->family >= CHIP_RV730))#define ASIC_IS_DCE4 (rdev) ((rdev->family >= CHIP_CEDAR))
drivers/gpu/drm/radeon/radeon_encoders.c +46 -44
162 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +1 -1
@@ -670,7 +670,7 @@ static void radeon_legacy_tmds_ext_mode_set(struct drm_encoder *encoder,if (rdev->is_atom_bios) { radeon_encoder->pixel_clock = adjusted_mode->clock; -atombios_external_tmds_setup (encoder,ATOM_ENABLE ); +atombios_dvo_setup (encoder,ATOM_ENABLE ); fp2_gen_cntl =RREG32 (RADEON_FP2_GEN_CNTL ); }else { fp2_gen_cntl =RREG32 (RADEON_FP2_GEN_CNTL );
drivers/gpu/drm/radeon/radeon_mode.h +1 -1
@@ -524,7 +524,7 @@ struct drm_encoder *radeon_encoder_legacy_primary_dac_add(struct drm_device *devstruct drm_encoder *radeon_encoder_legacy_tv_dac_add (struct drm_device *dev,int bios_index,int with_tv);struct drm_encoder *radeon_encoder_legacy_tmds_int_add (struct drm_device *dev,int bios_index);struct drm_encoder *radeon_encoder_legacy_tmds_ext_add (struct drm_device *dev,int bios_index); -extern void atombios_external_tmds_setup (struct drm_encoder *encoder,int action); +extern void atombios_dvo_setup (struct drm_encoder *encoder,int action);extern void atombios_digital_setup (struct drm_encoder *encoder,int action);extern int atombios_get_encoder_mode (struct drm_encoder *encoder);extern void atombios_set_edp_panel_power (struct radeon_connector *radeon_connector,int action);
Signature · 1 line
1.7.1.1
PATCH 4/4 drm/radeon/kms/atom: add proper external encoders support
In reply to Alex DeucherThese are external encoder chips connected via DVO or DP. The actual external encoder programming is handled by the kms encoder functions for primary encoder.
--- drivers/gpu/drm/radeon/radeon_encoders.c | 183 ++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_mode.h | 1 + 2 files changed, 184 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_encoders.c +183 -0
@@ -229,6 +229,27 @@ radeon_get_connector_for_encoder(struct drm_encoder *encoder)return NULL ; } +struct drm_encoder *radeon_atom_get_external_encoder (struct drm_encoder *encoder) +{ +struct drm_device *dev = encoder->dev; +struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder); +struct drm_encoder *other_encoder; +struct radeon_encoder *other_radeon_encoder; + +if (radeon_encoder->is_ext_encoder) +return NULL ; + +list_for_each_entry (other_encoder, &dev->mode_config.encoder_list, head) { +if (other_encoder == encoder) +continue ; + other_radeon_encoder =to_radeon_encoder (other_encoder); +if (other_radeon_encoder->is_ext_encoder && + (radeon_encoder->devices & other_radeon_encoder->devices)) +return other_encoder; + } +return NULL ; +} +void radeon_panel_mode_fixup (struct drm_encoder *encoder,struct drm_display_mode *adjusted_mode) {
@@ -1002,6 +1023,75 @@ atombios_set_edp_panel_power(struct radeon_connector *radeon_connector, int actiatom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); } +union external_encoder_control { +EXTERNAL_ENCODER_CONTROL_PS_ALLOCATION v1; +}; + +static void +atombios_external_encoder_setup (struct drm_encoder *encoder, +struct drm_encoder *ext_encoder, +int action) +{ +struct drm_device *dev = encoder->dev; +struct radeon_device *rdev = dev->dev_private; +struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder); +union external_encoder_control args; +struct drm_connector *connector =radeon_get_connector_for_encoder (encoder); +int index =GetIndexIntoMasterTable (COMMAND , ExternalEncoderControl); +u8 frev, crev; +int dp_clock =0 ; +int dp_lane_count =0 ; +int connector_object_id =0 ; + +if (connector) { +struct radeon_connector *radeon_connector =to_radeon_connector (connector); +struct radeon_connector_atom_dig *dig_connector = + radeon_connector->con_priv; + + dp_clock = dig_connector->dp_clock; + dp_lane_count = dig_connector->dp_lane_count; + connector_object_id = + (radeon_connector->connector_object_id &OBJECT_ID_MASK ) >>OBJECT_ID_SHIFT ; + } + +memset (&args,0 ,sizeof (args)); + +if (!atom_parse_cmd_header (rdev->mode_info.atom_context, index, &frev, &crev)) +return ; + +switch (frev) { +case 1 : +/* no params on frev 1 */ +break ; +case 2 : +switch (crev) { +case 1 : +case 2 : + args.v1.sDigEncoder.ucAction = action; + args.v1.sDigEncoder.usPixelClock =cpu_to_le16 (radeon_encoder->pixel_clock /10 ); + args.v1.sDigEncoder.ucEncoderMode =atombios_get_encoder_mode (encoder); + +if (args.v1.sDigEncoder.ucEncoderMode ==ATOM_ENCODER_MODE_DP ) { +if (dp_clock ==270000 ) + args.v1.sDigEncoder.ucConfig |=ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ ; + args.v1.sDigEncoder.ucLaneNum = dp_lane_count; + }else if (radeon_encoder->pixel_clock >165000 ) + args.v1.sDigEncoder.ucLaneNum =8 ; +else + args.v1.sDigEncoder.ucLaneNum =4 ; +break ; +default : +DRM_ERROR ("Unknown table version: %d, %d\n" , frev, crev); +return ; + } +break ; +default : +DRM_ERROR ("Unknown table version: %d, %d\n" , frev, crev); +return ; + } +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +} +static void atombios_yuv_setup (struct drm_encoder *encoder,bool enable) {
@@ -1045,6 +1135,7 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private;struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder); +struct drm_encoder *ext_encoder =radeon_atom_get_external_encoder (encoder);DISPLAY_DEVICE_OUTPUT_CONTROL_PS_ALLOCATION args;int index =0 ;bool is_dig = false;
@@ -1170,6 +1261,24 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)break ; } } + +if (ext_encoder) { +int action; + +switch (mode) { +case DRM_MODE_DPMS_ON : +default : + action =ATOM_ENABLE ; +break ; +case DRM_MODE_DPMS_STANDBY : +case DRM_MODE_DPMS_SUSPEND : +case DRM_MODE_DPMS_OFF : + action =ATOM_DISABLE ; +break ; + } +atombios_external_encoder_setup (encoder, ext_encoder, action); + } +radeon_atombios_encoder_dpms_scratch_regs (encoder, (mode ==DRM_MODE_DPMS_ON ) ? true : false); }
@@ -1417,6 +1526,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private;struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder); +struct drm_encoder *ext_encoder =radeon_atom_get_external_encoder (encoder); radeon_encoder->pixel_clock = adjusted_mode->clock;
@@ -1477,6 +1587,11 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, }break ; } + +if (ext_encoder) { +atombios_external_encoder_setup (encoder, ext_encoder,ATOM_ENABLE ); + } +atombios_apply_encoder_quirks (encoder, adjusted_mode);if (atombios_get_encoder_mode (encoder) ==ATOM_ENCODER_MODE_HDMI ) {
@@ -1677,6 +1792,53 @@ disable_done: radeon_encoder->active_device =0 ; } +/* these are handled by the primary encoders */ +static void radeon_atom_ext_prepare (struct drm_encoder *encoder) +{ + +} + +static void radeon_atom_ext_commit (struct drm_encoder *encoder) +{ + +} + +static void +radeon_atom_ext_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ + +} + +static void radeon_atom_ext_disable (struct drm_encoder *encoder) +{ + +} + +static void +radeon_atom_ext_dpms (struct drm_encoder *encoder,int mode) +{ + +} + +static bool radeon_atom_ext_mode_fixup (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +return true; +} + +static const struct drm_encoder_helper_funcs radeon_atom_ext_helper_funcs = { + .dpms = radeon_atom_ext_dpms, + .mode_fixup = radeon_atom_ext_mode_fixup, + .prepare = radeon_atom_ext_prepare, + .mode_set = radeon_atom_ext_mode_set, + .commit = radeon_atom_ext_commit, + .disable = radeon_atom_ext_disable, +/* no detect for TMDS/LVDS yet */ +}; +static const struct drm_encoder_helper_funcs radeon_atom_dig_helper_funcs = { .dpms = radeon_atom_encoder_dpms, .mode_fixup = radeon_atom_mode_fixup,
@@ -1786,6 +1948,7 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t radeon_encoder->devices = supported_device; radeon_encoder->rmx_type =RMX_OFF ; radeon_encoder->underscan_type =UNDERSCAN_OFF ; + radeon_encoder->is_ext_encoder = false;switch (radeon_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_LVDS :
@@ -1827,6 +1990,9 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t radeon_encoder->rmx_type =RMX_FULL ;drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs,DRM_MODE_ENCODER_LVDS ); radeon_encoder->enc_priv =radeon_atombios_get_lvds_info (radeon_encoder); + }else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) { +drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs,DRM_MODE_ENCODER_DAC ); + radeon_encoder->enc_priv =radeon_atombios_set_dig_info (radeon_encoder); }else {drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs,DRM_MODE_ENCODER_TMDS ); radeon_encoder->enc_priv =radeon_atombios_set_dig_info (radeon_encoder);
@@ -1835,5 +2001,22 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t }drm_encoder_helper_add (encoder, &radeon_atom_dig_helper_funcs);break ; +case ENCODER_OBJECT_ID_SI170B : +case ENCODER_OBJECT_ID_CH7303 : +case ENCODER_OBJECT_ID_EXTERNAL_SDVOA : +case ENCODER_OBJECT_ID_EXTERNAL_SDVOB : +case ENCODER_OBJECT_ID_TITFP513 : +case ENCODER_OBJECT_ID_VT1623 : +case ENCODER_OBJECT_ID_HDMI_SI1930 : +/* these are handled by the primary encoders */ + radeon_encoder->is_ext_encoder = true; +if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) +drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs,DRM_MODE_ENCODER_LVDS ); +else if (radeon_encoder->devices & (ATOM_DEVICE_CRT_SUPPORT )) +drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs,DRM_MODE_ENCODER_DAC ); +else +drm_encoder_init (dev, encoder, &radeon_atom_enc_funcs,DRM_MODE_ENCODER_TMDS ); +drm_encoder_helper_add (encoder, &radeon_atom_ext_helper_funcs); +break ; } }
drivers/gpu/drm/radeon/radeon_mode.h +1 -0
@@ -375,6 +375,7 @@ struct radeon_encoder {int hdmi_config_offset;int hdmi_audio_workaround;int hdmi_buffer_status; +bool is_ext_encoder; };struct radeon_connector_atom_dig {
Signature · 1 line
1.7.1.1