diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2012-09-06 12:26:09 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2012-09-20 13:10:43 -0400 |
commit | 2f6fa79a7e4cc380cc55ef967101cee340b8364b (patch) | |
tree | dd9a10da02a468519d8a3d7622f32f5a693b0984 | |
parent | e971bd5e45764ff76df0ff110a19bf6b924f84d6 (diff) |
drm/radeon: clean up encoder dp checks
Use the proper struct in the union. That field
has the same offset in every struct, so no functional
change.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/radeon/atombios_encoders.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 07441cb718a3..7dc3ba2792a2 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c | |||
@@ -866,14 +866,14 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo | |||
866 | else | 866 | else |
867 | args.v3.ucEncoderMode = atombios_get_encoder_mode(encoder); | 867 | args.v3.ucEncoderMode = atombios_get_encoder_mode(encoder); |
868 | 868 | ||
869 | if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode)) | 869 | if (ENCODER_MODE_IS_DP(args.v3.ucEncoderMode)) |
870 | args.v3.ucLaneNum = dp_lane_count; | 870 | args.v3.ucLaneNum = dp_lane_count; |
871 | else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) | 871 | else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) |
872 | args.v3.ucLaneNum = 8; | 872 | args.v3.ucLaneNum = 8; |
873 | else | 873 | else |
874 | args.v3.ucLaneNum = 4; | 874 | args.v3.ucLaneNum = 4; |
875 | 875 | ||
876 | if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode) && (dp_clock == 270000)) | 876 | if (ENCODER_MODE_IS_DP(args.v3.ucEncoderMode) && (dp_clock == 270000)) |
877 | args.v1.ucConfig |= ATOM_ENCODER_CONFIG_V3_DPLINKRATE_2_70GHZ; | 877 | args.v1.ucConfig |= ATOM_ENCODER_CONFIG_V3_DPLINKRATE_2_70GHZ; |
878 | args.v3.acConfig.ucDigSel = dig->dig_encoder; | 878 | args.v3.acConfig.ucDigSel = dig->dig_encoder; |
879 | args.v3.ucBitPerColor = radeon_atom_get_bpc(encoder); | 879 | args.v3.ucBitPerColor = radeon_atom_get_bpc(encoder); |
@@ -886,14 +886,14 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo | |||
886 | else | 886 | else |
887 | args.v4.ucEncoderMode = atombios_get_encoder_mode(encoder); | 887 | args.v4.ucEncoderMode = atombios_get_encoder_mode(encoder); |
888 | 888 | ||
889 | if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode)) | 889 | if (ENCODER_MODE_IS_DP(args.v4.ucEncoderMode)) |
890 | args.v4.ucLaneNum = dp_lane_count; | 890 | args.v4.ucLaneNum = dp_lane_count; |
891 | else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) | 891 | else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) |
892 | args.v4.ucLaneNum = 8; | 892 | args.v4.ucLaneNum = 8; |
893 | else | 893 | else |
894 | args.v4.ucLaneNum = 4; | 894 | args.v4.ucLaneNum = 4; |
895 | 895 | ||
896 | if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode)) { | 896 | if (ENCODER_MODE_IS_DP(args.v4.ucEncoderMode)) { |
897 | if (dp_clock == 270000) | 897 | if (dp_clock == 270000) |
898 | args.v1.ucConfig |= ATOM_ENCODER_CONFIG_V4_DPLINKRATE_2_70GHZ; | 898 | args.v1.ucConfig |= ATOM_ENCODER_CONFIG_V4_DPLINKRATE_2_70GHZ; |
899 | else if (dp_clock == 540000) | 899 | else if (dp_clock == 540000) |