* Bisected regression 4.0.0-rc1 No image with RADEON
@ 2015-02-23 21:07 Jim Bos
2015-02-23 21:31 ` Deucher, Alexander
2015-02-23 22:51 ` Deucher, Alexander
0 siblings, 2 replies; 5+ messages in thread
From: Jim Bos @ 2015-02-23 21:07 UTC (permalink / raw)
To: linux-kernel; +Cc: alexander.deucher@amd.com >> Alex Deucher
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 <slava.grigorev@amd.com>
Date: Fri Dec 12 17:01:42 2014 -0500
radeon/audio: enable DP audio
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
: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
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: Bisected regression 4.0.0-rc1 No image with RADEON
2015-02-23 21:07 Bisected regression 4.0.0-rc1 No image with RADEON Jim Bos
@ 2015-02-23 21:31 ` Deucher, Alexander
2015-02-24 15:39 ` Jim Bos
2015-02-23 22:51 ` Deucher, Alexander
1 sibling, 1 reply; 5+ messages in thread
From: Deucher, Alexander @ 2015-02-23 21:31 UTC (permalink / raw)
To: Jim Bos, linux-kernel; +Cc: Grigorev, Slava
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 4846 bytes --]
> -----Original Message-----
> From: Jim Bos [mailto:jim876@xs4all.nl]
> Sent: Monday, February 23, 2015 4:08 PM
> To: linux-kernel@vger.kernel.org
> 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 <slava.grigorev@amd.com>
> Date: Fri Dec 12 17:01:42 2014 -0500
>
> radeon/audio: enable DP audio
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
> Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>
> :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 ?
Can you attach your xorg log and dmesg output?
Alex
>
> 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
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: Bisected regression 4.0.0-rc1 No image with RADEON
2015-02-23 21:07 Bisected regression 4.0.0-rc1 No image with RADEON Jim Bos
2015-02-23 21:31 ` Deucher, Alexander
@ 2015-02-23 22:51 ` Deucher, Alexander
2015-02-24 15:43 ` Jim Bos
1 sibling, 1 reply; 5+ messages in thread
From: Deucher, Alexander @ 2015-02-23 22:51 UTC (permalink / raw)
To: Jim Bos, linux-kernel; +Cc: Grigorev, Slava
[-- Attachment #1: Type: text/plain, Size: 5328 bytes --]
> -----Original Message-----
> From: Deucher, Alexander
> Sent: Monday, February 23, 2015 4:32 PM
> To: 'Jim Bos'; linux-kernel@vger.kernel.org
> Cc: Grigorev, Slava
> Subject: RE: Bisected regression 4.0.0-rc1 No image with RADEON
>
> > -----Original Message-----
> > From: Jim Bos [mailto:jim876@xs4all.nl]
> > Sent: Monday, February 23, 2015 4:08 PM
> > To: linux-kernel@vger.kernel.org
> > 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 <slava.grigorev@amd.com>
> > Date: Fri Dec 12 17:01:42 2014 -0500
> >
> > radeon/audio: enable DP audio
> >
> > Reviewed-by: Christian König <christian.koenig@amd.com>
> > Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> >
> > :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
> Can you attach your xorg log and dmesg output?
>
> Alex
>
>
> >
> > 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
[-- Attachment #2: 0001-drm-radeon-only-enable-DP-audio-if-the-monitor-suppo.patch --]
[-- Type: application/octet-stream, Size: 3352 bytes --]
From 35c3e752f801f375e05688410a65894947a661cc Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
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.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/radeon/atombios_encoders.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index 7c9df1e..7fe7b74 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -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:
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: Bisected regression 4.0.0-rc1 No image with RADEON
2015-02-23 21:31 ` Deucher, Alexander
@ 2015-02-24 15:39 ` Jim Bos
0 siblings, 0 replies; 5+ messages in thread
From: Jim Bos @ 2015-02-24 15:39 UTC (permalink / raw)
To: Deucher, Alexander, linux-kernel; +Cc: Grigorev, Slava
On 02/23/2015 10:31 PM, Deucher, Alexander wrote:
>> -----Original Message-----
>> From: Jim Bos [mailto:jim876@xs4all.nl]
>> Sent: Monday, February 23, 2015 4:08 PM
>> To: linux-kernel@vger.kernel.org
>> 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 <slava.grigorev@amd.com>
>> Date: Fri Dec 12 17:01:42 2014 -0500
>>
>> radeon/audio: enable DP audio
>>
>> Reviewed-by: Christian König <christian.koenig@amd.com>
>> Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>>
>> :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 ?
>
> 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
>
>>
>> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Bisected regression 4.0.0-rc1 No image with RADEON
2015-02-23 22:51 ` Deucher, Alexander
@ 2015-02-24 15:43 ` Jim Bos
0 siblings, 0 replies; 5+ messages in thread
From: Jim Bos @ 2015-02-24 15:43 UTC (permalink / raw)
To: Deucher, Alexander, linux-kernel; +Cc: Grigorev, Slava
On 02/23/2015 11:51 PM, Deucher, Alexander wrote:
>> -----Original Message-----
>> From: Deucher, Alexander
>> Sent: Monday, February 23, 2015 4:32 PM
>> To: 'Jim Bos'; linux-kernel@vger.kernel.org
>> Cc: Grigorev, Slava
>> Subject: RE: Bisected regression 4.0.0-rc1 No image with RADEON
>>
>>> -----Original Message-----
>>> From: Jim Bos [mailto:jim876@xs4all.nl]
>>> Sent: Monday, February 23, 2015 4:08 PM
>>> To: linux-kernel@vger.kernel.org
>>> 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 <slava.grigorev@amd.com>
>>> Date: Fri Dec 12 17:01:42 2014 -0500
>>>
>>> radeon/audio: enable DP audio
>>>
>>> Reviewed-by: Christian König <christian.koenig@amd.com>
>>> Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
>>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>>>
>>> :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
>
Alex,
Yes it certainly does. Thanks for the quick response & patch.
Tested-by: jim876@xs4all.nl
Jim.
>> Can you attach your xorg log and dmesg output?
>>
>> Alex
>>
>>
>>>
>>> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-24 15:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-23 21:07 Bisected regression 4.0.0-rc1 No image with RADEON Jim Bos
2015-02-23 21:31 ` Deucher, Alexander
2015-02-24 15:39 ` Jim Bos
2015-02-23 22:51 ` Deucher, Alexander
2015-02-24 15:43 ` Jim Bos
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.