Hi Dave,
A few more patches for 3.13. The big one here is Hawaii support. I wanted to get that out sooner, but was sick earlier this week. That said, it's mostly self contained, so it shouldn't impact other asics. The rest are just bug fixes and a merge fix.
The following changes since commit 91915260ea5ed9d9b19bfb75d53c989c8ada2ab0:
Merge tag 'drm-intel-fixes-2013-11-07' of git://people.freedesktop.org/~danvet/drm-intel into drm-next (2013-11-08 16:34:39 +1000)
are available in the git repository at:
git://people.freedesktop.org/~agd5f/linux drm-next-3.13
for you to fetch changes up to 28ed756f1f4cf778785e6b627cabdcf337070fd6:
Revert "drm/radeon/audio: don't set speaker allocation on DCE4+" (2013-11-08 13:07:51 -0500)
---------------------------------------------------------------- Alex Deucher (18): drm/radeon: use HDP_MEM_COHERENCY_FLUSH_CNTL for sdma as well drm/radeon: fix-up some float to fixed conversion thinkos drm/radeon: add Hawaii chip family drm/radeon: update cik_gpu_init() for hawaii drm/radeon: minor updates to cik.c for hawaii drm/radeon: update cik_tiling_mode_table_init() for hawaii drm/radeon: add golden register settings for hawaii drm/radeon: update rb setup for hawaii drm/radeon: update firmware loading for hawaii drm/radeon/cik: add hawaii UVD support drm/radeon: add hawaii dpm support drm/radeon: update cik_get_csb_buffer for hawaii drm/radeon: atombios.h updates for hawaii drm/radeon: modesetting updates for hawaii drm/radeon: fill in radeon_asic_init for hawaii drm/radeon: add pci ids for hawaii drm/radeon: fix mismerge of drm-next with 3.12 Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
Anssi Hannula (1): drm/radeon/audio: fix missing multichannel PCM SAD in some cases
Ilija Hadzic (2): drm/radeon/kms: unpin fb in atombios crtc disable drm/radeon/kms: add crtc_disable function for legacy crtc
Pierre Ossman (2): drm/radeon/audio: correct ACR table drm/radeon/audio: improve ACR calculation
drivers/gpu/drm/radeon/atombios.h | 127 ++++++- drivers/gpu/drm/radeon/atombios_crtc.c | 19 +- drivers/gpu/drm/radeon/ci_dpm.c | 58 +++- drivers/gpu/drm/radeon/ci_smc.c | 4 + drivers/gpu/drm/radeon/cik.c | 504 +++++++++++++++++++++++++++- drivers/gpu/drm/radeon/cik_sdma.c | 40 +-- drivers/gpu/drm/radeon/cikd.h | 8 +- drivers/gpu/drm/radeon/dce6_afmt.c | 23 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 23 +- drivers/gpu/drm/radeon/r600_hdmi.c | 94 ++++-- drivers/gpu/drm/radeon/radeon_asic.c | 57 +++- drivers/gpu/drm/radeon/radeon_connectors.c | 16 +- drivers/gpu/drm/radeon/radeon_device.c | 1 + drivers/gpu/drm/radeon/radeon_family.h | 1 + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 21 ++ drivers/gpu/drm/radeon/radeon_pm.c | 1 + drivers/gpu/drm/radeon/radeon_ucode.h | 4 + drivers/gpu/drm/radeon/radeon_uvd.c | 1 + drivers/gpu/drm/radeon/rs690.c | 16 +- drivers/gpu/drm/radeon/rv515.c | 8 - include/drm/drm_pciids.h | 12 + 21 files changed, 882 insertions(+), 156 deletions(-)
2013/11/8 Alex Deucher alexdeucher@gmail.com:
Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
What about that hangs people reported? Has anything changed meanwhile? Did you fix them with some another commit?
2013/10/28 Deucher, Alexander Alexander.Deucher@amd.com:
Did you get any reports about that? Or is that based only on mine comment:
Yes, I had some reports of hangs on newer chips for some people as well. I'm not sure if it was directly correlated, but seemed like the safe thing to at this point in the kernel cycle.
On Sat, Nov 9, 2013 at 3:20 AM, Rafał Miłecki zajec5@gmail.com wrote:
2013/11/8 Alex Deucher alexdeucher@gmail.com:
Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"What about that hangs people reported? Has anything changed meanwhile? Did you fix them with some another commit?
No one actually pointed to this commit as a problem, but it seemed like the safe thing to do for 3.12 considering the problems caused by the same functionality for DCE3.2 parts. That said, a number of people have tested this patch successfully without problems, and it's necessary for the alsa driver to work correctly so I figured it was worth trying again for 3.13.
Alex
2013/10/28 Deucher, Alexander Alexander.Deucher@amd.com:
Did you get any reports about that? Or is that based only on mine comment:
Yes, I had some reports of hangs on newer chips for some people as well. I'm not sure if it was directly correlated, but seemed like the safe thing to at this point in the kernel cycle.
2013/11/10 Alex Deucher alexdeucher@gmail.com:
On Sat, Nov 9, 2013 at 3:20 AM, Rafał Miłecki zajec5@gmail.com wrote:
2013/11/8 Alex Deucher alexdeucher@gmail.com:
Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"What about that hangs people reported? Has anything changed meanwhile? Did you fix them with some another commit?
No one actually pointed to this commit as a problem, but it seemed like the safe thing to do for 3.12 considering the problems caused by the same functionality for DCE3.2 parts. That said, a number of people have tested this patch successfully without problems, and it's necessary for the alsa driver to work correctly so I figured it was worth trying again for 3.13.
Nice to hear that. My short-hanging case appeared to be eDP related (disabling eDP takes few seconds for some reason, will debug it some day).
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Rafał Miłecki