diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:07:49 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-22 11:07:49 +0000 |
commit | 7280e4222be4e88e2e8dd3cf797f093ffaebfb8b (patch) | |
tree | 0c70042dff00ef136c449ae922e48b660b17c272 /drivers/gpu/drm/radeon/rv515.c | |
parent | 3070bdc3c302c80996502639e03a2e550571e152 (diff) | |
parent | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-android-14.11
Diffstat (limited to 'drivers/gpu/drm/radeon/rv515.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv515.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index 237dd29d9f1c..b49965a21a2d 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -1276,6 +1276,9 @@ void rv515_bandwidth_update(struct radeon_device *rdev) struct drm_display_mode *mode0 = NULL; struct drm_display_mode *mode1 = NULL; + if (!rdev->mode_info.mode_config_initialized) + return; + radeon_update_display_priority(rdev); if (rdev->mode_info.crtcs[0]->base.enabled) |