aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/rs600.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-22 11:15:34 +0000
committerMark Brown <broonie@kernel.org>2014-11-22 12:51:05 +0000
commit28aa2be47924f6b971a6d323b3b4083228c8214f (patch)
tree0a8b1ee3d68f262338fb2e9e17badc3557f4f8c4 /drivers/gpu/drm/radeon/rs600.c
parenta6b8ad1106ba7e875e1ea94657f19eb0636ce0b2 (diff)
parent1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff)
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.11
Conflicts: include/linux/radix-tree.h kernel/rcu/tree.c mm/filemap.c mm/page_alloc.c
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
-rw-r--r--drivers/gpu/drm/radeon/rs600.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 95b693c11640..e5619d5e2a30 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -890,6 +890,9 @@ void rs600_bandwidth_update(struct radeon_device *rdev)
u32 d1mode_priority_a_cnt, d2mode_priority_a_cnt;
/* FIXME: implement full support */
+ if (!rdev->mode_info.mode_config_initialized)
+ return;
+
radeon_update_display_priority(rdev);
if (rdev->mode_info.crtcs[0]->base.enabled)