aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/atombios_crtc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_crtc.c')
-rw-r--r--drivers/gpu/drm/radeon/atombios_crtc.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 94aa6b293e0..56107b3a997 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -541,8 +541,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
541 int index; 541 int index;
542 542
543 index = GetIndexIntoMasterTable(COMMAND, AdjustDisplayPll); 543 index = GetIndexIntoMasterTable(COMMAND, AdjustDisplayPll);
544 atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, 544 if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev,
545 &crev); 545 &crev))
546 return adjusted_clock;
546 547
547 memset(&args, 0, sizeof(args)); 548 memset(&args, 0, sizeof(args));
548 549
@@ -630,8 +631,9 @@ static void atombios_crtc_set_dcpll(struct drm_crtc *crtc)
630 memset(&args, 0, sizeof(args)); 631 memset(&args, 0, sizeof(args));
631 632
632 index = GetIndexIntoMasterTable(COMMAND, SetPixelClock); 633 index = GetIndexIntoMasterTable(COMMAND, SetPixelClock);
633 atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, 634 if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev,
634 &crev); 635 &crev))
636 return;
635 637
636 switch (frev) { 638 switch (frev) {
637 case 1: 639 case 1:
@@ -705,8 +707,9 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
705 &ref_div, &post_div); 707 &ref_div, &post_div);
706 708
707 index = GetIndexIntoMasterTable(COMMAND, SetPixelClock); 709 index = GetIndexIntoMasterTable(COMMAND, SetPixelClock);
708 atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, 710 if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev,
709 &crev); 711 &crev))
712 return;
710 713
711 switch (frev) { 714 switch (frev) {
712 case 1: 715 case 1: