diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-10-20 11:57:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-10-20 11:57:21 +1000 |
| commit | da36bbd0bf36d415a8ad8e401d64b860f9befb44 (patch) | |
| tree | ef032663f376a733f965c422834ead3c821a54c9 /drivers/gpu/drm/radeon/dce6_afmt.c | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| parent | 01467a9b5e7ec7b9e30768bee16ea5861665015b (diff) | |
| download | blackbird-op-linux-da36bbd0bf36d415a8ad8e401d64b860f9befb44.tar.gz blackbird-op-linux-da36bbd0bf36d415a8ad8e401d64b860f9befb44.zip | |
Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
First round of fixes for 3.18.
- Use gart for DMA ring tests to avoid caching issues with HDP
- SI dpm stability fixes
- Performance stabilization fixes
- misc other things
* 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: reduce sparse false positive warnings
drm/radeon: fix vm page table block size calculation
drm/ttm: Don't evict BOs outside of the requested placement range
drm/ttm: Don't skip fpfn check if lpfn is 0 in ttm_bo_mem_compat
drm/radeon: use gart memory for DMA ring tests
drm/radeon: fix speaker allocation setup
drm/radeon: initialize sadb to NULL in the audio code
Revert "drm/radeon/dpm: drop clk/voltage dependency filters for SI"
Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table"
Diffstat (limited to 'drivers/gpu/drm/radeon/dce6_afmt.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/dce6_afmt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index c0bbf68dbc27..f312edf4d50e 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -155,7 +155,7 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) struct drm_connector *connector; struct radeon_connector *radeon_connector = NULL; u32 offset, tmp; - u8 *sadb; + u8 *sadb = NULL; int sad_count; if (!dig || !dig->afmt || !dig->afmt->pin) @@ -176,9 +176,9 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder) } sad_count = drm_edid_to_speaker_allocation(radeon_connector_edid(connector), &sadb); - if (sad_count <= 0) { - DRM_ERROR("Couldn't read Speaker Allocation Data Block: %d\n", sad_count); - return; + if (sad_count < 0) { + DRM_DEBUG("Couldn't read Speaker Allocation Data Block: %d\n", sad_count); + sad_count = 0; } /* program the speaker allocation */ |
