Attachment 46495 Details for Bug 37029 – Report failure from _MUX query

[patch] Report failure from _MUX query

0001-drm-i915-Report-failure-when-query-ACI-_MUX.patch (text/plain), 2.04 KB, created by Chris Wilson on 2011-05-09 11:03:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-05-09 11:03:45 UTC

Size: 2.04 KB

patch

obsolete

>From 163e91ad63eeab205a6884e50f3a3f1c9ee2fc97 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 9 May 2011 19:01:53 +0100
>Subject: [PATCH] drm/i915: Report failure when query ACI _MUX
>
>Reported-by: Vivek.Periaraj@gmail.com
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37029
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_acpi.c |   15 ++++++++-------
> 1 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c
>index 2cb8e0b..bfa7aa2 100644
>--- a/drivers/gpu/drm/i915/intel_acpi.c
>+++ b/drivers/gpu/drm/i915/intel_acpi.c
>@@ -133,13 +133,14 @@ static char *intel_dsm_mux_type(u8 type)
> 	}
> }
> 
>-static void intel_dsm_platform_mux_info(void)
>+static bool intel_dsm_platform_mux_info(void)
> {
> 	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
> 	struct acpi_object_list input;
> 	union acpi_object params[4];
> 	union acpi_object *pkg;
>-	int i, ret;
>+	bool ret = false;
>+	int i;
> 
> 	input.count = 4;
> 	input.pointer = params;
>@@ -153,9 +154,8 @@ static void intel_dsm_platform_mux_info(void)
> 	params[3].type = ACPI_TYPE_INTEGER;
> 	params[3].integer.value = 0;
> 
>-	ret = acpi_evaluate_object(intel_dsm_priv.dhandle, "_DSM", &input,
>-				   &output);
>-	if (ret) {
>+	if (acpi_evaluate_object(intel_dsm_priv.dhandle, "_DSM", &input,
>+				 &output)) {
> 		DRM_DEBUG_DRIVER("failed to evaluate _DSM: %d\n", ret);
> 		goto out;
> 	}
>@@ -182,12 +182,14 @@ static void intel_dsm_platform_mux_info(void)
> 			DRM_DEBUG_DRIVER("  hpd mux info: %s\n",
> 			       intel_dsm_mux_type(info->buffer.pointer[3]));
> 		}
>+		ret = true;
> 	} else {
> 		DRM_ERROR("MUX INFO call failed\n");
> 	}
> 
> out:
> 	kfree(output.pointer);
>+	return ret;
> }
> 
> static bool intel_dsm_pci_probe(struct pci_dev *pdev)
>@@ -214,8 +216,7 @@ static bool intel_dsm_pci_probe(struct pci_dev *pdev)
> 
> 	intel_dsm_priv.dhandle = dhandle;
> 
>-	intel_dsm_platform_mux_info();
>-	return true;
>+	return intel_dsm_platform_mux_info();
> }
> 
> static bool intel_dsm_detect(void)
>-- 
>1.7.5.1
>

Actions: View | Splinter Review

Attachments on bug 37029: 46495 | 46504 | 46586 | 47740 | 47741 | 47914

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.