Skip to contentSkip to conversation

Bisected regression 4.0.0-rc1 No image with RADEON

DISCUSSION Jim Bos 2 participants 5 messages Feb 23, 2015 – Feb 24, 2015

Subsystems (2)
lore
Share & tools
lore

Jim Bos

author Reviewed-by Christian König
#0 lore raw

Hello,

Booting 4.0-rc1 gives me black screen with monitor displaying an OSD message that input signal is not supported.

Video card is ATI Radeon HD 5670, monitor 1920x1200 Dell U2412M connected via DisplayPort.

Git bisect gives this

----------------

$ git bisect good
e55bca26188e45f209597abf986c87cc5a49894a is the first bad commit
commit e55bca26188e45f209597abf986c87cc5a49894a
Author: Slava Grigorev <[email protected]>
Date:   Fri Dec 12 17:01:42 2014 -0500

radeon/audio: enable DP audio

:040000 040000 25da4481f28d249ec827fe72c0b14c0a50265887
2eb7eb3728a5b811b0f954cbce486841c90ef938 M drivers
--------------------

Comparing dmesg with bad/good kernel doesn't show any interesting differences.

I've firmware build into the kernel

$ grep EXTRA_FIRMWARE .config
CONFIG_EXTRA_FIRMWARE="radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin radeon/REDWOOD_smc.bin radeon/CYPRESS_uvd.bin"
CONFIG_EXTRA_FIRMWARE_DIR="firmware"

Any ideas ?

Thanks,

Jim

***********************

$ git bisect log
git bisect start
# bad: [c517d838eb7d07bbe9507871fab3931deccff539] Linux 4.0-rc1
git bisect bad c517d838eb7d07bbe9507871fab3931deccff539
# good: [bfa76d49576599a4b9f9b7a71f23d73d6dcff735] Linux 3.19
git bisect good bfa76d49576599a4b9f9b7a71f23d73d6dcff735
# good: [02f1f2170d2831b3233e91091c60a66622f29e82] kernel.h: remove
ancient __FUNCTION__ hack
git bisect good 02f1f2170d2831b3233e91091c60a66622f29e82
# bad: [796e1c55717e9a6ff5c81b12289ffa1ffd919b6f] Merge branch
'drm-next' of git://people.freedesktop.org/~airlied/linux
git bisect bad 796e1c55717e9a6ff5c81b12289ffa1ffd919b6f
# good: [9682ec9692e5ac11c6caebd079324e727b19e7ce] Merge tag
'driver-core-3.20-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
git bisect good 9682ec9692e5ac11c6caebd079324e727b19e7ce
# good: [a9724125ad014decf008d782e60447c811391326] Merge tag
'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
git bisect good a9724125ad014decf008d782e60447c811391326
# good: [f43dff0ee00a259f524ce17ba4f8030553c66590] Merge tag
'drm-amdkfd-next-fixes-2015-01-25' of
git://people.freedesktop.org/~gabbayo/linux into drm-next
git bisect good f43dff0ee00a259f524ce17ba4f8030553c66590
# bad: [cffe1e89dc9bf541a39d9287ced7c5addff07084] drm: sti: HDMI add
audio infoframe
git bisect bad cffe1e89dc9bf541a39d9287ced7c5addff07084
# bad: [2f5b4ef15c60bc5292a3f006c018acb3da53737b] Merge tag
'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux
into drm-next
git bisect bad 2f5b4ef15c60bc5292a3f006c018acb3da53737b
# bad: [cc0cc1aa279067207085b75a674453e021879801] Merge branch
'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next
git bisect bad cc0cc1aa279067207085b75a674453e021879801
# good: [8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b] radeon/audio: removed
unnecessary CRC control programing
git bisect good 8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b
# good: [eb88e422c502a7a1628cc919020e2ebf59450d4d] drm/exynos: remove
drm_dev from struct exynos_drm_manager
git bisect good eb88e422c502a7a1628cc919020e2ebf59450d4d
# bad: [f4c6c08182b3f648b788422f27926f097759b0eb] drm/radeon: whitespace
clean up in radeon_audio.c
git bisect bad f4c6c08182b3f648b788422f27926f097759b0eb
# good: [7f604077ac9cacb9a6b04b977e2cd1f26cb3f667] radeon/audio: removed
unnecessary debug settings
git bisect good 7f604077ac9cacb9a6b04b977e2cd1f26cb3f667
# good: [6f945693be7eea24b1a8e5ce252a96df98d55a5c] radeon/audio: applied
audio_dpms() and audio_mode_set() calls
git bisect good 6f945693be7eea24b1a8e5ce252a96df98d55a5c
# bad: [e55bca26188e45f209597abf986c87cc5a49894a] radeon/audio: enable
DP audio
git bisect bad e55bca26188e45f209597abf986c87cc5a49894a
# good: [ccd4be7eb7ef2aac076b604c716f36aa926651e3] radeon/audio: moved
audio caps programming to audio_hotplug() function
git bisect good ccd4be7eb7ef2aac076b604c716f36aa926651e3
# first bad commit: [e55bca26188e45f209597abf986c87cc5a49894a]
radeon/audio: enable DP audio
#1 lore raw
Quoted 40 lines

-----Original Message-----
From: Jim Bos [mailto:[email protected]]
Sent: Monday, February 23, 2015 4:08 PM
To: [email protected]
Cc: Deucher, Alexander
Subject: Bisected regression 4.0.0-rc1 No image with RADEON

Hello,

Booting 4.0-rc1 gives me black screen with monitor displaying an OSD message that input signal is not supported.

Video card is ATI Radeon HD 5670, monitor 1920x1200 Dell U2412M connected via DisplayPort.

Git bisect gives this

----------------

$ git bisect good
e55bca26188e45f209597abf986c87cc5a49894a is the first bad commit
commit e55bca26188e45f209597abf986c87cc5a49894a
Author: Slava Grigorev <[email protected]>
Date:   Fri Dec 12 17:01:42 2014 -0500

radeon/audio: enable DP audio

:040000 040000 25da4481f28d249ec827fe72c0b14c0a50265887
2eb7eb3728a5b811b0f954cbce486841c90ef938 M drivers
--------------------

Comparing dmesg with bad/good kernel doesn't show any interesting differences.

I've firmware build into the kernel

Quoted 8 lines
$ grep EXTRA_FIRMWARE .config
CONFIG_EXTRA_FIRMWARE="radeon/REDWOOD_me.bin
radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin radeon/REDWOOD_smc.bin
radeon/CYPRESS_uvd.bin"
CONFIG_EXTRA_FIRMWARE_DIR="firmware"

Any ideas ?

Can you attach your xorg log and dmesg output?

Alex

Quoted 60 lines

Thanks,

Jim

***********************

$ git bisect log
git bisect start
# bad: [c517d838eb7d07bbe9507871fab3931deccff539] Linux 4.0-rc1
git bisect bad c517d838eb7d07bbe9507871fab3931deccff539
# good: [bfa76d49576599a4b9f9b7a71f23d73d6dcff735] Linux 3.19
git bisect good bfa76d49576599a4b9f9b7a71f23d73d6dcff735
# good: [02f1f2170d2831b3233e91091c60a66622f29e82] kernel.h: remove
ancient __FUNCTION__ hack
git bisect good 02f1f2170d2831b3233e91091c60a66622f29e82
# bad: [796e1c55717e9a6ff5c81b12289ffa1ffd919b6f] Merge branch
'drm-next' of git://people.freedesktop.org/~airlied/linux
git bisect bad 796e1c55717e9a6ff5c81b12289ffa1ffd919b6f
# good: [9682ec9692e5ac11c6caebd079324e727b19e7ce] Merge tag
'driver-core-3.20-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
git bisect good 9682ec9692e5ac11c6caebd079324e727b19e7ce
# good: [a9724125ad014decf008d782e60447c811391326] Merge tag
'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
git bisect good a9724125ad014decf008d782e60447c811391326
# good: [f43dff0ee00a259f524ce17ba4f8030553c66590] Merge tag
'drm-amdkfd-next-fixes-2015-01-25' of
git://people.freedesktop.org/~gabbayo/linux into drm-next
git bisect good f43dff0ee00a259f524ce17ba4f8030553c66590
# bad: [cffe1e89dc9bf541a39d9287ced7c5addff07084] drm: sti: HDMI add
audio infoframe
git bisect bad cffe1e89dc9bf541a39d9287ced7c5addff07084
# bad: [2f5b4ef15c60bc5292a3f006c018acb3da53737b] Merge tag
'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux
into drm-next
git bisect bad 2f5b4ef15c60bc5292a3f006c018acb3da53737b
# bad: [cc0cc1aa279067207085b75a674453e021879801] Merge branch
'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next
git bisect bad cc0cc1aa279067207085b75a674453e021879801
# good: [8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b] radeon/audio:
removed
unnecessary CRC control programing
git bisect good 8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b
# good: [eb88e422c502a7a1628cc919020e2ebf59450d4d] drm/exynos:
remove
drm_dev from struct exynos_drm_manager
git bisect good eb88e422c502a7a1628cc919020e2ebf59450d4d
# bad: [f4c6c08182b3f648b788422f27926f097759b0eb] drm/radeon:
whitespace
clean up in radeon_audio.c
git bisect bad f4c6c08182b3f648b788422f27926f097759b0eb
# good: [7f604077ac9cacb9a6b04b977e2cd1f26cb3f667] radeon/audio:
removed
unnecessary debug settings
git bisect good 7f604077ac9cacb9a6b04b977e2cd1f26cb3f667
# good: [6f945693be7eea24b1a8e5ce252a96df98d55a5c] radeon/audio:
applied
audio_dpms() and audio_mode_set() calls
git bisect good 6f945693be7eea24b1a8e5ce252a96df98d55a5c
# bad: [e55bca26188e45f209597abf986c87cc5a49894a] radeon/audio: enable
Quoted 8 lines
DP audio
git bisect bad e55bca26188e45f209597abf986c87cc5a49894a
# good: [ccd4be7eb7ef2aac076b604c716f36aa926651e3] radeon/audio:
moved
audio caps programming to audio_hotplug() function
git bisect good ccd4be7eb7ef2aac076b604c716f36aa926651e3
# first bad commit: [e55bca26188e45f209597abf986c87cc5a49894a]
radeon/audio: enable DP audio

���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m���� ������?�I�

author
#2 lore raw
Quoted 47 lines · Alexander
Quoted 47 lines

-----Original Message-----
From: Jim Bos [mailto:[email protected]]
Sent: Monday, February 23, 2015 4:08 PM
To: [email protected]
Cc: Deucher, Alexander
Subject: Bisected regression 4.0.0-rc1 No image with RADEON

Hello,

Booting 4.0-rc1 gives me black screen with monitor displaying an OSD message that input signal is not supported.

Video card is ATI Radeon HD 5670, monitor 1920x1200 Dell U2412M connected via DisplayPort.

Git bisect gives this

----------------

$ git bisect good
e55bca26188e45f209597abf986c87cc5a49894a is the first bad commit
commit e55bca26188e45f209597abf986c87cc5a49894a
Author: Slava Grigorev <[email protected]>
Date:   Fri Dec 12 17:01:42 2014 -0500

radeon/audio: enable DP audio

:040000 040000 25da4481f28d249ec827fe72c0b14c0a50265887
2eb7eb3728a5b811b0f954cbce486841c90ef938 M drivers
--------------------

Comparing dmesg with bad/good kernel doesn't show any interesting differences.

I've firmware build into the kernel

$ grep EXTRA_FIRMWARE .config
CONFIG_EXTRA_FIRMWARE="radeon/REDWOOD_me.bin
radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin radeon/REDWOOD_smc.bin
radeon/CYPRESS_uvd.bin"
CONFIG_EXTRA_FIRMWARE_DIR="firmware"
Quoted 6 lines
Quoted 1 line

Any ideas ?

Can you attach your xorg log and dmesg output?

Alex

Didn't even make it to xorg, as soon as console switched to radeondrmfb monitor already complained.

Jim

Quoted 69 lines
Quoted 69 lines

Thanks,

Jim

***********************

$ git bisect log
git bisect start
# bad: [c517d838eb7d07bbe9507871fab3931deccff539] Linux 4.0-rc1
git bisect bad c517d838eb7d07bbe9507871fab3931deccff539
# good: [bfa76d49576599a4b9f9b7a71f23d73d6dcff735] Linux 3.19
git bisect good bfa76d49576599a4b9f9b7a71f23d73d6dcff735
# good: [02f1f2170d2831b3233e91091c60a66622f29e82] kernel.h: remove
ancient __FUNCTION__ hack
git bisect good 02f1f2170d2831b3233e91091c60a66622f29e82
# bad: [796e1c55717e9a6ff5c81b12289ffa1ffd919b6f] Merge branch
'drm-next' of git://people.freedesktop.org/~airlied/linux
git bisect bad 796e1c55717e9a6ff5c81b12289ffa1ffd919b6f
# good: [9682ec9692e5ac11c6caebd079324e727b19e7ce] Merge tag
'driver-core-3.20-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
git bisect good 9682ec9692e5ac11c6caebd079324e727b19e7ce
# good: [a9724125ad014decf008d782e60447c811391326] Merge tag
'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
git bisect good a9724125ad014decf008d782e60447c811391326
# good: [f43dff0ee00a259f524ce17ba4f8030553c66590] Merge tag
'drm-amdkfd-next-fixes-2015-01-25' of
git://people.freedesktop.org/~gabbayo/linux into drm-next
git bisect good f43dff0ee00a259f524ce17ba4f8030553c66590
# bad: [cffe1e89dc9bf541a39d9287ced7c5addff07084] drm: sti: HDMI add
audio infoframe
git bisect bad cffe1e89dc9bf541a39d9287ced7c5addff07084
# bad: [2f5b4ef15c60bc5292a3f006c018acb3da53737b] Merge tag
'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux
into drm-next
git bisect bad 2f5b4ef15c60bc5292a3f006c018acb3da53737b
# bad: [cc0cc1aa279067207085b75a674453e021879801] Merge branch
'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next
git bisect bad cc0cc1aa279067207085b75a674453e021879801
# good: [8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b] radeon/audio:
removed
unnecessary CRC control programing
git bisect good 8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b
# good: [eb88e422c502a7a1628cc919020e2ebf59450d4d] drm/exynos:
remove
drm_dev from struct exynos_drm_manager
git bisect good eb88e422c502a7a1628cc919020e2ebf59450d4d
# bad: [f4c6c08182b3f648b788422f27926f097759b0eb] drm/radeon:
whitespace
clean up in radeon_audio.c
git bisect bad f4c6c08182b3f648b788422f27926f097759b0eb
# good: [7f604077ac9cacb9a6b04b977e2cd1f26cb3f667] radeon/audio:
removed
unnecessary debug settings
git bisect good 7f604077ac9cacb9a6b04b977e2cd1f26cb3f667
# good: [6f945693be7eea24b1a8e5ce252a96df98d55a5c] radeon/audio:
applied
audio_dpms() and audio_mode_set() calls
git bisect good 6f945693be7eea24b1a8e5ce252a96df98d55a5c
# bad: [e55bca26188e45f209597abf986c87cc5a49894a] radeon/audio: enable
DP audio
git bisect bad e55bca26188e45f209597abf986c87cc5a49894a
# good: [ccd4be7eb7ef2aac076b604c716f36aa926651e3] radeon/audio:
moved
audio caps programming to audio_hotplug() function
git bisect good ccd4be7eb7ef2aac076b604c716f36aa926651e3
# first bad commit: [e55bca26188e45f209597abf986c87cc5a49894a]
radeon/audio: enable DP audio
#3 lore raw
In reply to Jim Bos
Quoted 56 lines

-----Original Message-----
From: Deucher, Alexander
Sent: Monday, February 23, 2015 4:32 PM
To: 'Jim Bos'; [email protected]
Cc: Grigorev, Slava
Subject: RE: Bisected regression 4.0.0-rc1 No image with RADEON

Quoted 48 lines

-----Original Message-----
From: Jim Bos [mailto:[email protected]]
Sent: Monday, February 23, 2015 4:08 PM
To: [email protected]
Cc: Deucher, Alexander
Subject: Bisected regression 4.0.0-rc1 No image with RADEON

Hello,

Booting 4.0-rc1 gives me black screen with monitor displaying an OSD message that input signal is not supported.

Video card is ATI Radeon HD 5670, monitor 1920x1200 Dell U2412M connected via DisplayPort.

Git bisect gives this

----------------

$ git bisect good
e55bca26188e45f209597abf986c87cc5a49894a is the first bad commit
commit e55bca26188e45f209597abf986c87cc5a49894a
Author: Slava Grigorev <[email protected]>
Date:   Fri Dec 12 17:01:42 2014 -0500

radeon/audio: enable DP audio

:040000 040000 25da4481f28d249ec827fe72c0b14c0a50265887
2eb7eb3728a5b811b0f954cbce486841c90ef938 M drivers
--------------------

Comparing dmesg with bad/good kernel doesn't show any interesting differences.

I've firmware build into the kernel

$ grep EXTRA_FIRMWARE .config
CONFIG_EXTRA_FIRMWARE="radeon/REDWOOD_me.bin
radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin radeon/REDWOOD_smc.bin
radeon/CYPRESS_uvd.bin"
CONFIG_EXTRA_FIRMWARE_DIR="firmware"

Any ideas ?

Does the attached patch help?

Alex

Quoted 66 lines

Can you attach your xorg log and dmesg output?

Alex

Quoted 30 lines

Thanks,

Jim

***********************

$ git bisect log
git bisect start
# bad: [c517d838eb7d07bbe9507871fab3931deccff539] Linux 4.0-rc1
git bisect bad c517d838eb7d07bbe9507871fab3931deccff539
# good: [bfa76d49576599a4b9f9b7a71f23d73d6dcff735] Linux 3.19
git bisect good bfa76d49576599a4b9f9b7a71f23d73d6dcff735
# good: [02f1f2170d2831b3233e91091c60a66622f29e82] kernel.h: remove
ancient __FUNCTION__ hack
git bisect good 02f1f2170d2831b3233e91091c60a66622f29e82
# bad: [796e1c55717e9a6ff5c81b12289ffa1ffd919b6f] Merge branch
'drm-next' of git://people.freedesktop.org/~airlied/linux
git bisect bad 796e1c55717e9a6ff5c81b12289ffa1ffd919b6f
# good: [9682ec9692e5ac11c6caebd079324e727b19e7ce] Merge tag
'driver-core-3.20-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
git bisect good 9682ec9692e5ac11c6caebd079324e727b19e7ce
# good: [a9724125ad014decf008d782e60447c811391326] Merge tag
'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
git bisect good a9724125ad014decf008d782e60447c811391326
# good: [f43dff0ee00a259f524ce17ba4f8030553c66590] Merge tag
'drm-amdkfd-next-fixes-2015-01-25' of
git://people.freedesktop.org/~gabbayo/linux into drm-next
git bisect good f43dff0ee00a259f524ce17ba4f8030553c66590
# bad: [cffe1e89dc9bf541a39d9287ced7c5addff07084] drm: sti: HDMI add
Quoted 8 lines
audio infoframe
git bisect bad cffe1e89dc9bf541a39d9287ced7c5addff07084
# bad: [2f5b4ef15c60bc5292a3f006c018acb3da53737b] Merge tag
'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux
into drm-next
git bisect bad 2f5b4ef15c60bc5292a3f006c018acb3da53737b
# bad: [cc0cc1aa279067207085b75a674453e021879801] Merge branch
'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-

next

Quoted 14 lines

git bisect bad cc0cc1aa279067207085b75a674453e021879801 # good: [8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b] radeon/audio:
removed
unnecessary CRC control programing
git bisect good 8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b # good: [eb88e422c502a7a1628cc919020e2ebf59450d4d] drm/exynos:
remove
drm_dev from struct exynos_drm_manager
git bisect good eb88e422c502a7a1628cc919020e2ebf59450d4d # bad: [f4c6c08182b3f648b788422f27926f097759b0eb] drm/radeon:
whitespace
clean up in radeon_audio.c
git bisect bad f4c6c08182b3f648b788422f27926f097759b0eb # good: [7f604077ac9cacb9a6b04b977e2cd1f26cb3f667] radeon/audio:

Quoted 8 lines

removed
unnecessary debug settings
git bisect good 7f604077ac9cacb9a6b04b977e2cd1f26cb3f667 # good: [6f945693be7eea24b1a8e5ce252a96df98d55a5c] radeon/audio:
applied
audio_dpms() and audio_mode_set() calls
git bisect good 6f945693be7eea24b1a8e5ce252a96df98d55a5c # bad: [e55bca26188e45f209597abf986c87cc5a49894a] radeon/audio:

Quoted 9 lines

enable

Quoted 8 lines

DP audio
git bisect bad e55bca26188e45f209597abf986c87cc5a49894a # good: [ccd4be7eb7ef2aac076b604c716f36aa926651e3] radeon/audio:
moved
audio caps programming to audio_hotplug() function
git bisect good ccd4be7eb7ef2aac076b604c716f36aa926651e3

# first bad commit: [e55bca26188e45f209597abf986c87cc5a49894a]
radeon/audio: enable DP audio

From 35c3e752f801f375e05688410a65894947a661cc Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Mon, 23 Feb 2015 17:45:54 -0500
Subject: [PATCH] drm/radeon: only enable DP audio if the monitor supports it

We were enabling DP secondary streams even if the monitor didn't support them. May fix display problems on some DP monitors.

---
 drivers/gpu/drm/radeon/atombios_encoders.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/atombios_encoders.c +15 -6
index 7c9df1e..7fe7b74 100644
@@ -731,7 +731,9 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
 		dig_connector = radeon_connector->con_priv;
 		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
 		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) {
-			if (radeon_audio != 0 && ASIC_IS_DCE4(rdev) && !ASIC_IS_DCE5(rdev))
+			if (radeon_audio != 0 &&
+			    drm_detect_monitor_audio(radeon_connector_edid(connector)) &&
+			    ASIC_IS_DCE4(rdev) && !ASIC_IS_DCE5(rdev))
 				return ATOM_ENCODER_MODE_DP_AUDIO;
 			return ATOM_ENCODER_MODE_DP;
 		} else if (radeon_audio != 0) {
@@ -747,7 +749,9 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
 		}
 		break;
 	case DRM_MODE_CONNECTOR_eDP:
-		if (radeon_audio != 0 && ASIC_IS_DCE4(rdev) && !ASIC_IS_DCE5(rdev))
+		if (radeon_audio != 0 &&
+		    drm_detect_monitor_audio(radeon_connector_edid(connector)) &&
+		    ASIC_IS_DCE4(rdev) && !ASIC_IS_DCE5(rdev))
 			return ATOM_ENCODER_MODE_DP_AUDIO;
 		return ATOM_ENCODER_MODE_DP;
 	case DRM_MODE_CONNECTOR_DVIA:
@@ -1720,8 +1724,10 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
 	}
 
 	encoder_mode = atombios_get_encoder_mode(encoder);
-	if (radeon_audio != 0 &&
-		(encoder_mode == ATOM_ENCODER_MODE_HDMI || ENCODER_MODE_IS_DP(encoder_mode)))
+	if (connector && (radeon_audio != 0) &&
+	    ((encoder_mode == ATOM_ENCODER_MODE_HDMI) ||
+	     (ENCODER_MODE_IS_DP(encoder_mode) &&
+	      drm_detect_monitor_audio(radeon_connector_edid(connector)))))
 		radeon_audio_dpms(encoder, mode);
 }
 
@@ -2136,6 +2142,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 	struct drm_device *dev = encoder->dev;
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+	struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
 	int encoder_mode;
 
 	radeon_encoder->pixel_clock = adjusted_mode->clock;
@@ -2164,8 +2171,10 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 		/* handled in dpms */
 		encoder_mode = atombios_get_encoder_mode(encoder);
-		if (radeon_audio != 0 &&
-			(encoder_mode == ATOM_ENCODER_MODE_HDMI || ENCODER_MODE_IS_DP(encoder_mode)))
+		if (connector && (radeon_audio != 0) &&
+		    ((encoder_mode == ATOM_ENCODER_MODE_HDMI) ||
+		     (ENCODER_MODE_IS_DP(encoder_mode) &&
+		      drm_detect_monitor_audio(radeon_connector_edid(connector)))))
 			radeon_audio_mode_set(encoder, adjusted_mode);
 		break;
 	case ENCODER_OBJECT_ID_INTERNAL_DDI:
Signature · 1 line
1.8.3.1
author Tested-by
#4 lore raw
Quoted 54 lines · Alexander
Quoted 54 lines

-----Original Message-----
From: Deucher, Alexander
Sent: Monday, February 23, 2015 4:32 PM
To: 'Jim Bos'; [email protected]
Cc: Grigorev, Slava
Subject: RE: Bisected regression 4.0.0-rc1 No image with RADEON

Quoted 47 lines

-----Original Message-----
From: Jim Bos [mailto:[email protected]]
Sent: Monday, February 23, 2015 4:08 PM
To: [email protected]
Cc: Deucher, Alexander
Subject: Bisected regression 4.0.0-rc1 No image with RADEON

Hello,

Booting 4.0-rc1 gives me black screen with monitor displaying an OSD message that input signal is not supported.

Video card is ATI Radeon HD 5670, monitor 1920x1200 Dell U2412M connected via DisplayPort.

Git bisect gives this

----------------

$ git bisect good
e55bca26188e45f209597abf986c87cc5a49894a is the first bad commit
commit e55bca26188e45f209597abf986c87cc5a49894a
Author: Slava Grigorev <[email protected]>
Date:   Fri Dec 12 17:01:42 2014 -0500

radeon/audio: enable DP audio

:040000 040000 25da4481f28d249ec827fe72c0b14c0a50265887
2eb7eb3728a5b811b0f954cbce486841c90ef938 M drivers
--------------------

Comparing dmesg with bad/good kernel doesn't show any interesting differences.

I've firmware build into the kernel

$ grep EXTRA_FIRMWARE .config
CONFIG_EXTRA_FIRMWARE="radeon/REDWOOD_me.bin
radeon/REDWOOD_pfp.bin
radeon/REDWOOD_rlc.bin radeon/REDWOOD_smc.bin
radeon/CYPRESS_uvd.bin"
CONFIG_EXTRA_FIRMWARE_DIR="firmware"
Quoted 7 lines
Quoted 2 lines
Quoted 1 line

Any ideas ?

Does the attached patch help?

Alex

Alex,

Yes it certainly does. Thanks for the quick response & patch.

Jim.

Quoted 75 lines
Quoted 75 lines

Can you attach your xorg log and dmesg output?

Alex

Quoted 30 lines

Thanks,

Jim

***********************

$ git bisect log
git bisect start
# bad: [c517d838eb7d07bbe9507871fab3931deccff539] Linux 4.0-rc1
git bisect bad c517d838eb7d07bbe9507871fab3931deccff539
# good: [bfa76d49576599a4b9f9b7a71f23d73d6dcff735] Linux 3.19
git bisect good bfa76d49576599a4b9f9b7a71f23d73d6dcff735
# good: [02f1f2170d2831b3233e91091c60a66622f29e82] kernel.h: remove
ancient __FUNCTION__ hack
git bisect good 02f1f2170d2831b3233e91091c60a66622f29e82
# bad: [796e1c55717e9a6ff5c81b12289ffa1ffd919b6f] Merge branch
'drm-next' of git://people.freedesktop.org/~airlied/linux
git bisect bad 796e1c55717e9a6ff5c81b12289ffa1ffd919b6f
# good: [9682ec9692e5ac11c6caebd079324e727b19e7ce] Merge tag
'driver-core-3.20-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
git bisect good 9682ec9692e5ac11c6caebd079324e727b19e7ce
# good: [a9724125ad014decf008d782e60447c811391326] Merge tag
'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
git bisect good a9724125ad014decf008d782e60447c811391326
# good: [f43dff0ee00a259f524ce17ba4f8030553c66590] Merge tag
'drm-amdkfd-next-fixes-2015-01-25' of
git://people.freedesktop.org/~gabbayo/linux into drm-next
git bisect good f43dff0ee00a259f524ce17ba4f8030553c66590
# bad: [cffe1e89dc9bf541a39d9287ced7c5addff07084] drm: sti: HDMI add
Quoted 8 lines
audio infoframe
git bisect bad cffe1e89dc9bf541a39d9287ced7c5addff07084
# bad: [2f5b4ef15c60bc5292a3f006c018acb3da53737b] Merge tag
'drm/tegra/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux
into drm-next
git bisect bad 2f5b4ef15c60bc5292a3f006c018acb3da53737b
# bad: [cc0cc1aa279067207085b75a674453e021879801] Merge branch
'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-

next

Quoted 14 lines

git bisect bad cc0cc1aa279067207085b75a674453e021879801 # good: [8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b] radeon/audio:
removed
unnecessary CRC control programing
git bisect good 8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b # good: [eb88e422c502a7a1628cc919020e2ebf59450d4d] drm/exynos:
remove
drm_dev from struct exynos_drm_manager
git bisect good eb88e422c502a7a1628cc919020e2ebf59450d4d # bad: [f4c6c08182b3f648b788422f27926f097759b0eb] drm/radeon:
whitespace
clean up in radeon_audio.c
git bisect bad f4c6c08182b3f648b788422f27926f097759b0eb # good: [7f604077ac9cacb9a6b04b977e2cd1f26cb3f667] radeon/audio:

Quoted 8 lines

removed
unnecessary debug settings
git bisect good 7f604077ac9cacb9a6b04b977e2cd1f26cb3f667 # good: [6f945693be7eea24b1a8e5ce252a96df98d55a5c] radeon/audio:
applied
audio_dpms() and audio_mode_set() calls
git bisect good 6f945693be7eea24b1a8e5ce252a96df98d55a5c # bad: [e55bca26188e45f209597abf986c87cc5a49894a] radeon/audio:

enable

Quoted 8 lines

DP audio
git bisect bad e55bca26188e45f209597abf986c87cc5a49894a # good: [ccd4be7eb7ef2aac076b604c716f36aa926651e3] radeon/audio:
moved
audio caps programming to audio_hotplug() function
git bisect good ccd4be7eb7ef2aac076b604c716f36aa926651e3

# first bad commit: [e55bca26188e45f209597abf986c87cc5a49894a]
radeon/audio: enable DP audio