From: Dave Airlie airlied@redhat.com
If you do radeon.mst=1 on a gpu without mst hw, and then plug some mst hw it will oops instead of falling back.
So check we have DCE5 at least before proceeding.
Signed-off-by: Dave Airlie airlied@redhat.com --- drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 2b98ed3..257b10be 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -663,12 +663,17 @@ int radeon_dp_mst_probe(struct radeon_connector *radeon_connector) { struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv; + struct drm_device *dev = radeon_connector->base.dev; + struct radeon_device *rdev = dev->dev_private; int ret; u8 msg[1];
if (!radeon_mst) return 0;
+ if (!ASIC_IS_DCE5(rdev)) + return 0; + if (dig_connector->dpcd[DP_DPCD_REV] < 0x12) return 0;
On 18.06.2015 06:29, Dave Airlie wrote:
From: Dave Airlie airlied@redhat.com
If you do radeon.mst=1 on a gpu without mst hw, and then plug some mst hw it will oops instead of falling back.
So check we have DCE5 at least before proceeding.
Signed-off-by: Dave Airlie airlied@redhat.com
Reviewed-by: Christian König christian.koenig@amd.com
BTW: Since Alex is on vacation I'm managing drm-fixes for Radeon/Amdgpu for a while.
Should I add that patch to my pull request on Friday or do you wan to add it directly?
Regards, Christian.
drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 2b98ed3..257b10be 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -663,12 +663,17 @@ int radeon_dp_mst_probe(struct radeon_connector *radeon_connector) { struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
struct drm_device *dev = radeon_connector->base.dev;
struct radeon_device *rdev = dev->dev_private; int ret; u8 msg[1];
if (!radeon_mst) return 0;
if (!ASIC_IS_DCE5(rdev))
return 0;if (dig_connector->dpcd[DP_DPCD_REV] < 0x12) return 0;
On 18 June 2015 at 17:39, Christian König deathsimple@vodafone.de wrote:
On 18.06.2015 06:29, Dave Airlie wrote:
From: Dave Airlie airlied@redhat.com
If you do radeon.mst=1 on a gpu without mst hw, and then plug some mst hw it will oops instead of falling back.
So check we have DCE5 at least before proceeding.
Signed-off-by: Dave Airlie airlied@redhat.com
Reviewed-by: Christian König christian.koenig@amd.com
BTW: Since Alex is on vacation I'm managing drm-fixes for Radeon/Amdgpu for a while.
Should I add that patch to my pull request on Friday or do you wan to add it directly?
Can you add it, and maybe send the fixes pull a bit earlier :-),
since Friday for you is my Saturday, and I don't always make it to the laptop before Sunday.
Dave.
On 18.06.2015 10:31, Dave Airlie wrote:
On 18 June 2015 at 17:39, Christian König deathsimple@vodafone.de wrote:
On 18.06.2015 06:29, Dave Airlie wrote:
From: Dave Airlie airlied@redhat.com
If you do radeon.mst=1 on a gpu without mst hw, and then plug some mst hw it will oops instead of falling back.
So check we have DCE5 at least before proceeding.
Signed-off-by: Dave Airlie airlied@redhat.com
Reviewed-by: Christian König christian.koenig@amd.com
BTW: Since Alex is on vacation I'm managing drm-fixes for Radeon/Amdgpu for a while.
Should I add that patch to my pull request on Friday or do you wan to add it directly?
Can you add it, and maybe send the fixes pull a bit earlier :-),
Only when I have to, as usually I'm quite busy ;)
since Friday for you is my Saturday, and I don't always make it to the laptop before Sunday.
Hui? In what time zone are you? Keep in mind that unlike Alex I live and work from Germany, so I'm in CET as well.
Going to try to get together the branches for Radeon/Amdgpu till the evening, but can't promise that.
Regards, Christian.
Dave.
On 18 June 2015 at 23:12, Christian König deathsimple@vodafone.de wrote:
On 18.06.2015 10:31, Dave Airlie wrote:
On 18 June 2015 at 17:39, Christian König deathsimple@vodafone.de wrote:
On 18.06.2015 06:29, Dave Airlie wrote:
From: Dave Airlie airlied@redhat.com
If you do radeon.mst=1 on a gpu without mst hw, and then plug some mst hw it will oops instead of falling back.
So check we have DCE5 at least before proceeding.
Signed-off-by: Dave Airlie airlied@redhat.com
Reviewed-by: Christian König christian.koenig@amd.com
BTW: Since Alex is on vacation I'm managing drm-fixes for Radeon/Amdgpu for a while.
Should I add that patch to my pull request on Friday or do you wan to add it directly?
Can you add it, and maybe send the fixes pull a bit earlier :-),
Only when I have to, as usually I'm quite busy ;)
since Friday for you is my Saturday, and I don't always make it to the laptop before Sunday.
Hui? In what time zone are you? Keep in mind that unlike Alex I live and work from Germany, so I'm in CET as well.
UTC+10 (Brisbane) and Friday night is generally not when I pull stuff in, so it usually means any attempts to send me stuff on Friday lead me to doing stuff Saturday morning, and lots of times that just doesn't happen :-)
Dave.
dri-devel@lists.freedesktop.org
-
Christian König -
Dave Airlie