canonical-x team mailing list archive

[Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>]

Op 20-02-13 10:52, Timo Aaltonen schreef:
> 19.02.2013 16:54, Bryce Harrington kirjoitti:
>> Hi Timo,
>>
>> I was browsing through red hat's patches.  Most are either not relevant
>> or we already have them, but I wasn't sure about these:
> ok, let's see
>
>>     http://pkgs.fedoraproject.org/cgit/xorg-x11-server.git/tree/0001-Always-install-vbe-and-int10-sdk-headers.patch
> Not sure what these are for tbh?
>
>>     http://pkgs.fedoraproject.org/cgit/xorg-x11-server.git/tree/0001-mieq-Bump-default-queue-size-to-512.patch
> Apparently their abrt tool is quite trigger-happy and catching these
> notifications as errors? AIUI apport only catches crashes, so this patch
> wouldn't change things on ubuntu?
>
>>     http://pkgs.fedoraproject.org/cgit/xorg-x11-server.git/tree/0002-hw-xfree86-Require-only-one-working-CRTC-to-start-th.patch
> We have this from upstream (and not applied in the .spec anymore)
>
>>     http://pkgs.fedoraproject.org/cgit/xorg-x11-server.git/tree/0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch
> hmm, wonder why this isn't upstream.. Maarten, could you check this?
>
So I'll put in a simple patch to radeon, killing all its outputs [1], and find out on my macbook with i915 as master.

Result: Not needed, digging through git revealed commit 72ef659874ffe88e88d presumably fixed it already.

~Maarten

---
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index f22eb57..b8bfc2d 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -469,62 +469,62 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
 
 const int supported_devices_connector_convert[] = {
 	DRM_MODE_CONNECTOR_Unknown,
-	DRM_MODE_CONNECTOR_VGA,
-	DRM_MODE_CONNECTOR_DVII,
-	DRM_MODE_CONNECTOR_DVID,
-	DRM_MODE_CONNECTOR_DVIA,
-	DRM_MODE_CONNECTOR_SVIDEO,
-	DRM_MODE_CONNECTOR_Composite,
-	DRM_MODE_CONNECTOR_LVDS,
 	DRM_MODE_CONNECTOR_Unknown,
 	DRM_MODE_CONNECTOR_Unknown,
-	DRM_MODE_CONNECTOR_HDMIA,
-	DRM_MODE_CONNECTOR_HDMIB,
 	DRM_MODE_CONNECTOR_Unknown,
 	DRM_MODE_CONNECTOR_Unknown,
-	DRM_MODE_CONNECTOR_9PinDIN,
-	DRM_MODE_CONNECTOR_DisplayPort
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown
 };
 
 const uint16_t supported_devices_connector_object_id_convert[] = {
 	CONNECTOR_OBJECT_ID_NONE,
-	CONNECTOR_OBJECT_ID_VGA,
-	CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I, /* not all boards support DL */
-	CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D, /* not all boards support DL */
-	CONNECTOR_OBJECT_ID_VGA, /* technically DVI-A */
-	CONNECTOR_OBJECT_ID_COMPOSITE,
-	CONNECTOR_OBJECT_ID_SVIDEO,
-	CONNECTOR_OBJECT_ID_LVDS,
-	CONNECTOR_OBJECT_ID_9PIN_DIN,
-	CONNECTOR_OBJECT_ID_9PIN_DIN,
-	CONNECTOR_OBJECT_ID_DISPLAYPORT,
-	CONNECTOR_OBJECT_ID_HDMI_TYPE_A,
-	CONNECTOR_OBJECT_ID_HDMI_TYPE_B,
-	CONNECTOR_OBJECT_ID_SVIDEO
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE, /* not all boards support DL */
+	CONNECTOR_OBJECT_ID_NONE, /* not all boards support DL */
+	CONNECTOR_OBJECT_ID_NONE, /* technically DVI-A */
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE,
+	CONNECTOR_OBJECT_ID_NONE
 };
 
 const int object_connector_convert[] = {
 	DRM_MODE_CONNECTOR_Unknown,
-	DRM_MODE_CONNECTOR_DVII,
-	DRM_MODE_CONNECTOR_DVII,
-	DRM_MODE_CONNECTOR_DVID,
-	DRM_MODE_CONNECTOR_DVID,
-	DRM_MODE_CONNECTOR_VGA,
-	DRM_MODE_CONNECTOR_Composite,
-	DRM_MODE_CONNECTOR_SVIDEO,
 	DRM_MODE_CONNECTOR_Unknown,
 	DRM_MODE_CONNECTOR_Unknown,
-	DRM_MODE_CONNECTOR_9PinDIN,
 	DRM_MODE_CONNECTOR_Unknown,
-	DRM_MODE_CONNECTOR_HDMIA,
-	DRM_MODE_CONNECTOR_HDMIB,
-	DRM_MODE_CONNECTOR_LVDS,
-	DRM_MODE_CONNECTOR_9PinDIN,
 	DRM_MODE_CONNECTOR_Unknown,
 	DRM_MODE_CONNECTOR_Unknown,
 	DRM_MODE_CONNECTOR_Unknown,
-	DRM_MODE_CONNECTOR_DisplayPort,
-	DRM_MODE_CONNECTOR_eDP,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
+	DRM_MODE_CONNECTOR_Unknown,
 	DRM_MODE_CONNECTOR_Unknown
 };