Skip to contentSkip to conversation

drm/radeon: don't probe MST on hw we don't support it on

PATCH In review Dave Airlie 2 participants 5 messages Jun 18, 2015 – Jun 19, 2015

Subsystems (2)
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 drm/radeon: don't probe MST on hw we don't support it on

From: Dave Airlie <[email protected]>

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.

---
 drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/radeon/radeon_dp_mst.c +5 -0
index 2b98ed3..257b10be 100644
@@ -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;
 
Signature · 6 lines
2.4.2

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Dave Airlie

From: Dave Airlie <[email protected]>

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.

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.

Quoted 16 lines
---
  drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/radeon/radeon_dp_mst.c +2 -0
index 2b98ed3..257b10be 100644
@@ -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];

drivers/gpu/drm/radeon/radeon_dp_mst.c int · line 679

Quoted 10 lines
drivers/gpu/drm/radeon/radeon_dp_mst.c +3 -0
 
  	if (!radeon_mst)
  		return 0;
 
+	if (!ASIC_IS_DCE5(rdev))
+		return 0;
+
  	if (dig_connector->dpcd[DP_DPCD_REV] < 0x12)
  		return 0;
 

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#2 lore raw
Quoted 12 lines · Christian König
Quoted 9 lines · Dave Airlie

From: Dave Airlie <[email protected]>

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.

Quoted 8 lines

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.
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
Quoted 13 lines · Dave Airlie
Quoted 12 lines · Christian König
Quoted 8 lines · Dave Airlie

From: Dave Airlie <[email protected]>

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.

Quoted 7 lines
Quoted 6 lines

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 ;)

Quoted 2 lines

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.

Quoted 2 lines

Dave.

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#4 lore raw
Quoted 29 lines · Christian König
Quoted 21 lines · Dave Airlie
Quoted 19 lines · Christian König
Quoted 9 lines · Dave Airlie

From: Dave Airlie <[email protected]>

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.

BTW: Since Alex is on vacation I'm managing drm-fixes for Radeon/Amdgpu for
a while.

Quoted 5 lines
Quoted 4 lines

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 :-),

Quoted 8 lines

Only when I have to, as usually I'm quite busy ;)

Quoted 2 lines

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 mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel