Skip to contentSkip to conversation

drm/i915: distinguish between error messages in DIDL initialization

PATCH Applied Jani Nikula 3 participants 3 messages Jun 5, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: distinguish between error messages in DIDL initialization

Two exactly same error messages on different error paths makes debugging difficult. Clarify the messages and distinguish them from each other.

---
 drivers/gpu/drm/i915/intel_opregion.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_opregion.c +2 -2
index 5c2d693..79be7cf 100644
@@ -312,7 +312,7 @@ static void intel_didl_outputs(struct drm_device *dev)
 	list_for_each_entry(acpi_cdev, &acpi_video_bus->children, node) {
 		if (i >= 8) {
 			dev_printk(KERN_ERR, &dev->pdev->dev,
-				    "More than 8 outputs detected\n");
+				   "More than 8 outputs detected via ACPI\n");
 			return;
 		}
 		status =
@@ -339,7 +339,7 @@ blind_set:
 		int output_type = ACPI_OTHER_OUTPUT;
 		if (i >= 8) {
 			dev_printk(KERN_ERR, &dev->pdev->dev,
-				    "More than 8 outputs detected\n");
+				   "More than 8 outputs in connector list\n");
 			return;
 		}
 		switch (connector->connector_type) {
Signature · 1 line
1.7.10.4
Reviewed-by on v1 1/1
#1 lore raw

2013/6/5 Jani Nikula <[email protected]>:

Quoted 4 lines

Two exactly same error messages on different error paths makes debugging difficult. Clarify the messages and distinguish them from each other.

And we do print these messages on real-world machines.

Quoted 29 lines
---
 drivers/gpu/drm/i915/intel_opregion.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_opregion.c +2 -3
index 5c2d693..79be7cf 100644
@@ -312,7 +312,7 @@ static void intel_didl_outputs(struct drm_device *dev)
        list_for_each_entry(acpi_cdev, &acpi_video_bus->children, node) {
                if (i >= 8) {
                        dev_printk(KERN_ERR, &dev->pdev->dev,
-                                   "More than 8 outputs detected\n");
+                                  "More than 8 outputs detected via ACPI\n");
                        return;
                }
                status =
@@ -339,7 +339,7 @@ blind_set:
                int output_type = ACPI_OTHER_OUTPUT;
                if (i >= 8) {
                        dev_printk(KERN_ERR, &dev->pdev->dev,
-                                   "More than 8 outputs detected\n");
+                                  "More than 8 outputs in connector list\n");
                        return;
                }
                switch (connector->connector_type) {
--

1.7.10.4

Signature · 1 line
Paulo Zanoni
#2 lore raw
Quoted 9 lines · Paulo Zanoni

2013/6/5 Jani Nikula <[email protected]>:

Quoted 4 lines

Two exactly same error messages on different error paths makes debugging difficult. Clarify the messages and distinguish them from each other.

And we do print these messages on real-world machines.

Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch