diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_encoders.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index a236c75496c4..fd4052f71bf3 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c | |||
@@ -519,7 +519,8 @@ atombios_digital_setup(struct drm_encoder *encoder, int action) | |||
519 | break; | 519 | break; |
520 | } | 520 | } |
521 | 521 | ||
522 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 522 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
523 | return; | ||
523 | 524 | ||
524 | switch (frev) { | 525 | switch (frev) { |
525 | case 1: | 526 | case 1: |
@@ -725,7 +726,8 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action) | |||
725 | } | 726 | } |
726 | num = dig->dig_encoder + 1; | 727 | num = dig->dig_encoder + 1; |
727 | 728 | ||
728 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 729 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
730 | return; | ||
729 | 731 | ||
730 | args.v1.ucAction = action; | 732 | args.v1.ucAction = action; |
731 | args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); | 733 | args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); |
@@ -813,7 +815,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
813 | } | 815 | } |
814 | } | 816 | } |
815 | 817 | ||
816 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 818 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
819 | return; | ||
817 | 820 | ||
818 | args.v1.ucAction = action; | 821 | args.v1.ucAction = action; |
819 | if (action == ATOM_TRANSMITTER_ACTION_INIT) { | 822 | if (action == ATOM_TRANSMITTER_ACTION_INIT) { |
@@ -1103,7 +1106,8 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) | |||
1103 | 1106 | ||
1104 | memset(&args, 0, sizeof(args)); | 1107 | memset(&args, 0, sizeof(args)); |
1105 | 1108 | ||
1106 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 1109 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
1110 | return; | ||
1107 | 1111 | ||
1108 | switch (frev) { | 1112 | switch (frev) { |
1109 | case 1: | 1113 | case 1: |
@@ -1411,7 +1415,8 @@ atombios_dac_load_detect(struct drm_encoder *encoder, struct drm_connector *conn | |||
1411 | 1415 | ||
1412 | memset(&args, 0, sizeof(args)); | 1416 | memset(&args, 0, sizeof(args)); |
1413 | 1417 | ||
1414 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 1418 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
1419 | return false; | ||
1415 | 1420 | ||
1416 | args.sDacload.ucMisc = 0; | 1421 | args.sDacload.ucMisc = 0; |
1417 | 1422 | ||