Commit 5cb82703 authored by Wambui Karuga's avatar Wambui Karuga Committed by Jani Nikula
Browse files

drm/i915/opregion: conversion to struct drm_device logging macros.



This converts various instances of the printk based logging macros in
i915/display/intel_opregion.c with the new struct drm_device based
logging macros using the following coccinelle script:
@rule1@
identifier fn, T;
@@

fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

@rule2@
identifier fn, T;
@@

fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

Checkpatch warnings were addressed manually.

Signed-off-by: default avatarWambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-6-wambui.karugax@gmail.com
parent bdc6114e
Loading
Loading
Loading
Loading
+80 −54
Original line number Original line Diff line number Diff line
@@ -289,7 +289,7 @@ static int swsci(struct drm_i915_private *dev_priv,
	/* The spec tells us to do this, but we are the only user... */
	/* The spec tells us to do this, but we are the only user... */
	scic = swsci->scic;
	scic = swsci->scic;
	if (scic & SWSCI_SCIC_INDICATOR) {
	if (scic & SWSCI_SCIC_INDICATOR) {
		DRM_DEBUG_DRIVER("SWSCI request already in progress\n");
		drm_dbg(&dev_priv->drm, "SWSCI request already in progress\n");
		return -EBUSY;
		return -EBUSY;
	}
	}


@@ -313,7 +313,7 @@ static int swsci(struct drm_i915_private *dev_priv,
	/* Poll for the result. */
	/* Poll for the result. */
#define C (((scic = swsci->scic) & SWSCI_SCIC_INDICATOR) == 0)
#define C (((scic = swsci->scic) & SWSCI_SCIC_INDICATOR) == 0)
	if (wait_for(C, dslp)) {
	if (wait_for(C, dslp)) {
		DRM_DEBUG_DRIVER("SWSCI request timed out\n");
		drm_dbg(&dev_priv->drm, "SWSCI request timed out\n");
		return -ETIMEDOUT;
		return -ETIMEDOUT;
	}
	}


@@ -322,7 +322,7 @@ static int swsci(struct drm_i915_private *dev_priv,


	/* Note: scic == 0 is an error! */
	/* Note: scic == 0 is an error! */
	if (scic != SWSCI_SCIC_EXIT_STATUS_SUCCESS) {
	if (scic != SWSCI_SCIC_EXIT_STATUS_SUCCESS) {
		DRM_DEBUG_DRIVER("SWSCI request error %u\n", scic);
		drm_dbg(&dev_priv->drm, "SWSCI request error %u\n", scic);
		return -EIO;
		return -EIO;
	}
	}


@@ -426,10 +426,11 @@ static u32 asle_set_backlight(struct drm_i915_private *dev_priv, u32 bclp)
	struct opregion_asle *asle = dev_priv->opregion.asle;
	struct opregion_asle *asle = dev_priv->opregion.asle;
	struct drm_device *dev = &dev_priv->drm;
	struct drm_device *dev = &dev_priv->drm;


	DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
	drm_dbg(&dev_priv->drm, "bclp = 0x%08x\n", bclp);


	if (acpi_video_get_backlight_type() == acpi_backlight_native) {
	if (acpi_video_get_backlight_type() == acpi_backlight_native) {
		DRM_DEBUG_KMS("opregion backlight request ignored\n");
		drm_dbg_kms(&dev_priv->drm,
			    "opregion backlight request ignored\n");
		return 0;
		return 0;
	}
	}


@@ -446,7 +447,8 @@ static u32 asle_set_backlight(struct drm_i915_private *dev_priv, u32 bclp)
	 * Update backlight on all connectors that support backlight (usually
	 * Update backlight on all connectors that support backlight (usually
	 * only one).
	 * only one).
	 */
	 */
	DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
	drm_dbg_kms(&dev_priv->drm, "updating opregion backlight %d/255\n",
		    bclp);
	drm_connector_list_iter_begin(dev, &conn_iter);
	drm_connector_list_iter_begin(dev, &conn_iter);
	for_each_intel_connector_iter(connector, &conn_iter)
	for_each_intel_connector_iter(connector, &conn_iter)
		intel_panel_set_backlight_acpi(connector->base.state, bclp, 255);
		intel_panel_set_backlight_acpi(connector->base.state, bclp, 255);
@@ -463,13 +465,13 @@ static u32 asle_set_als_illum(struct drm_i915_private *dev_priv, u32 alsi)
{
{
	/* alsi is the current ALS reading in lux. 0 indicates below sensor
	/* alsi is the current ALS reading in lux. 0 indicates below sensor
	   range, 0xffff indicates above sensor range. 1-0xfffe are valid */
	   range, 0xffff indicates above sensor range. 1-0xfffe are valid */
	DRM_DEBUG_DRIVER("Illum is not supported\n");
	drm_dbg(&dev_priv->drm, "Illum is not supported\n");
	return ASLC_ALS_ILLUM_FAILED;
	return ASLC_ALS_ILLUM_FAILED;
}
}


static u32 asle_set_pwm_freq(struct drm_i915_private *dev_priv, u32 pfmb)
static u32 asle_set_pwm_freq(struct drm_i915_private *dev_priv, u32 pfmb)
{
{
	DRM_DEBUG_DRIVER("PWM freq is not supported\n");
	drm_dbg(&dev_priv->drm, "PWM freq is not supported\n");
	return ASLC_PWM_FREQ_FAILED;
	return ASLC_PWM_FREQ_FAILED;
}
}


@@ -477,30 +479,36 @@ static u32 asle_set_pfit(struct drm_i915_private *dev_priv, u32 pfit)
{
{
	/* Panel fitting is currently controlled by the X code, so this is a
	/* Panel fitting is currently controlled by the X code, so this is a
	   noop until modesetting support works fully */
	   noop until modesetting support works fully */
	DRM_DEBUG_DRIVER("Pfit is not supported\n");
	drm_dbg(&dev_priv->drm, "Pfit is not supported\n");
	return ASLC_PFIT_FAILED;
	return ASLC_PFIT_FAILED;
}
}


static u32 asle_set_supported_rotation_angles(struct drm_i915_private *dev_priv, u32 srot)
static u32 asle_set_supported_rotation_angles(struct drm_i915_private *dev_priv, u32 srot)
{
{
	DRM_DEBUG_DRIVER("SROT is not supported\n");
	drm_dbg(&dev_priv->drm, "SROT is not supported\n");
	return ASLC_ROTATION_ANGLES_FAILED;
	return ASLC_ROTATION_ANGLES_FAILED;
}
}


static u32 asle_set_button_array(struct drm_i915_private *dev_priv, u32 iuer)
static u32 asle_set_button_array(struct drm_i915_private *dev_priv, u32 iuer)
{
{
	if (!iuer)
	if (!iuer)
		DRM_DEBUG_DRIVER("Button array event is not supported (nothing)\n");
		drm_dbg(&dev_priv->drm,
			"Button array event is not supported (nothing)\n");
	if (iuer & ASLE_IUER_ROTATION_LOCK_BTN)
	if (iuer & ASLE_IUER_ROTATION_LOCK_BTN)
		DRM_DEBUG_DRIVER("Button array event is not supported (rotation lock)\n");
		drm_dbg(&dev_priv->drm,
			"Button array event is not supported (rotation lock)\n");
	if (iuer & ASLE_IUER_VOLUME_DOWN_BTN)
	if (iuer & ASLE_IUER_VOLUME_DOWN_BTN)
		DRM_DEBUG_DRIVER("Button array event is not supported (volume down)\n");
		drm_dbg(&dev_priv->drm,
			"Button array event is not supported (volume down)\n");
	if (iuer & ASLE_IUER_VOLUME_UP_BTN)
	if (iuer & ASLE_IUER_VOLUME_UP_BTN)
		DRM_DEBUG_DRIVER("Button array event is not supported (volume up)\n");
		drm_dbg(&dev_priv->drm,
			"Button array event is not supported (volume up)\n");
	if (iuer & ASLE_IUER_WINDOWS_BTN)
	if (iuer & ASLE_IUER_WINDOWS_BTN)
		DRM_DEBUG_DRIVER("Button array event is not supported (windows)\n");
		drm_dbg(&dev_priv->drm,
			"Button array event is not supported (windows)\n");
	if (iuer & ASLE_IUER_POWER_BTN)
	if (iuer & ASLE_IUER_POWER_BTN)
		DRM_DEBUG_DRIVER("Button array event is not supported (power)\n");
		drm_dbg(&dev_priv->drm,
			"Button array event is not supported (power)\n");


	return ASLC_BUTTON_ARRAY_FAILED;
	return ASLC_BUTTON_ARRAY_FAILED;
}
}
@@ -508,9 +516,11 @@ static u32 asle_set_button_array(struct drm_i915_private *dev_priv, u32 iuer)
static u32 asle_set_convertible(struct drm_i915_private *dev_priv, u32 iuer)
static u32 asle_set_convertible(struct drm_i915_private *dev_priv, u32 iuer)
{
{
	if (iuer & ASLE_IUER_CONVERTIBLE)
	if (iuer & ASLE_IUER_CONVERTIBLE)
		DRM_DEBUG_DRIVER("Convertible is not supported (clamshell)\n");
		drm_dbg(&dev_priv->drm,
			"Convertible is not supported (clamshell)\n");
	else
	else
		DRM_DEBUG_DRIVER("Convertible is not supported (slate)\n");
		drm_dbg(&dev_priv->drm,
			"Convertible is not supported (slate)\n");


	return ASLC_CONVERTIBLE_FAILED;
	return ASLC_CONVERTIBLE_FAILED;
}
}
@@ -518,16 +528,17 @@ static u32 asle_set_convertible(struct drm_i915_private *dev_priv, u32 iuer)
static u32 asle_set_docking(struct drm_i915_private *dev_priv, u32 iuer)
static u32 asle_set_docking(struct drm_i915_private *dev_priv, u32 iuer)
{
{
	if (iuer & ASLE_IUER_DOCKING)
	if (iuer & ASLE_IUER_DOCKING)
		DRM_DEBUG_DRIVER("Docking is not supported (docked)\n");
		drm_dbg(&dev_priv->drm, "Docking is not supported (docked)\n");
	else
	else
		DRM_DEBUG_DRIVER("Docking is not supported (undocked)\n");
		drm_dbg(&dev_priv->drm,
			"Docking is not supported (undocked)\n");


	return ASLC_DOCKING_FAILED;
	return ASLC_DOCKING_FAILED;
}
}


static u32 asle_isct_state(struct drm_i915_private *dev_priv)
static u32 asle_isct_state(struct drm_i915_private *dev_priv)
{
{
	DRM_DEBUG_DRIVER("ISCT is not supported\n");
	drm_dbg(&dev_priv->drm, "ISCT is not supported\n");
	return ASLC_ISCT_STATE_FAILED;
	return ASLC_ISCT_STATE_FAILED;
}
}


@@ -547,8 +558,8 @@ static void asle_work(struct work_struct *work)
	aslc_req = asle->aslc;
	aslc_req = asle->aslc;


	if (!(aslc_req & ASLC_REQ_MSK)) {
	if (!(aslc_req & ASLC_REQ_MSK)) {
		DRM_DEBUG_DRIVER("No request on ASLC interrupt 0x%08x\n",
		drm_dbg(&dev_priv->drm,
				 aslc_req);
			"No request on ASLC interrupt 0x%08x\n", aslc_req);
		return;
		return;
	}
	}


@@ -667,10 +678,11 @@ static void intel_didl_outputs(struct drm_i915_private *dev_priv)
	}
	}
	drm_connector_list_iter_end(&conn_iter);
	drm_connector_list_iter_end(&conn_iter);


	DRM_DEBUG_KMS("%d outputs detected\n", i);
	drm_dbg_kms(&dev_priv->drm, "%d outputs detected\n", i);


	if (i > max_outputs)
	if (i > max_outputs)
		DRM_ERROR("More than %d outputs in connector list\n",
		drm_err(&dev_priv->drm,
			"More than %d outputs in connector list\n",
			max_outputs);
			max_outputs);


	/* If fewer than max outputs, the list must be null terminated */
	/* If fewer than max outputs, the list must be null terminated */
@@ -751,7 +763,9 @@ static void swsci_setup(struct drm_i915_private *dev_priv)
		if (requested_callbacks) {
		if (requested_callbacks) {
			u32 req = opregion->swsci_sbcb_sub_functions;
			u32 req = opregion->swsci_sbcb_sub_functions;
			if ((req & tmp) != req)
			if ((req & tmp) != req)
				DRM_DEBUG_DRIVER("SWSCI BIOS requested (%08x) SBCB callbacks that are not supported (%08x)\n", req, tmp);
				drm_dbg(&dev_priv->drm,
					"SWSCI BIOS requested (%08x) SBCB callbacks that are not supported (%08x)\n",
					req, tmp);
			/* XXX: for now, trust the requested callbacks */
			/* XXX: for now, trust the requested callbacks */
			/* opregion->swsci_sbcb_sub_functions &= tmp; */
			/* opregion->swsci_sbcb_sub_functions &= tmp; */
		} else {
		} else {
@@ -759,7 +773,8 @@ static void swsci_setup(struct drm_i915_private *dev_priv)
		}
		}
	}
	}


	DRM_DEBUG_DRIVER("SWSCI GBDA callbacks %08x, SBCB callbacks %08x\n",
	drm_dbg(&dev_priv->drm,
		"SWSCI GBDA callbacks %08x, SBCB callbacks %08x\n",
		opregion->swsci_gbda_sub_functions,
		opregion->swsci_gbda_sub_functions,
		opregion->swsci_sbcb_sub_functions);
		opregion->swsci_sbcb_sub_functions);
}
}
@@ -795,7 +810,8 @@ static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv)


	ret = request_firmware(&fw, name, &dev_priv->drm.pdev->dev);
	ret = request_firmware(&fw, name, &dev_priv->drm.pdev->dev);
	if (ret) {
	if (ret) {
		DRM_ERROR("Requesting VBT firmware \"%s\" failed (%d)\n",
		drm_err(&dev_priv->drm,
			"Requesting VBT firmware \"%s\" failed (%d)\n",
			name, ret);
			name, ret);
		return ret;
		return ret;
	}
	}
@@ -803,7 +819,8 @@ static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv)
	if (intel_bios_is_valid_vbt(fw->data, fw->size)) {
	if (intel_bios_is_valid_vbt(fw->data, fw->size)) {
		opregion->vbt_firmware = kmemdup(fw->data, fw->size, GFP_KERNEL);
		opregion->vbt_firmware = kmemdup(fw->data, fw->size, GFP_KERNEL);
		if (opregion->vbt_firmware) {
		if (opregion->vbt_firmware) {
			DRM_DEBUG_KMS("Found valid VBT firmware \"%s\"\n", name);
			drm_dbg_kms(&dev_priv->drm,
				    "Found valid VBT firmware \"%s\"\n", name);
			opregion->vbt = opregion->vbt_firmware;
			opregion->vbt = opregion->vbt_firmware;
			opregion->vbt_size = fw->size;
			opregion->vbt_size = fw->size;
			ret = 0;
			ret = 0;
@@ -811,7 +828,8 @@ static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv)
			ret = -ENOMEM;
			ret = -ENOMEM;
		}
		}
	} else {
	} else {
		DRM_DEBUG_KMS("Invalid VBT firmware \"%s\"\n", name);
		drm_dbg_kms(&dev_priv->drm, "Invalid VBT firmware \"%s\"\n",
			    name);
		ret = -EINVAL;
		ret = -EINVAL;
	}
	}


@@ -838,9 +856,10 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
	BUILD_BUG_ON(sizeof(struct opregion_asle_ext) != 0x400);
	BUILD_BUG_ON(sizeof(struct opregion_asle_ext) != 0x400);


	pci_read_config_dword(pdev, ASLS, &asls);
	pci_read_config_dword(pdev, ASLS, &asls);
	DRM_DEBUG_DRIVER("graphic opregion physical addr: 0x%x\n", asls);
	drm_dbg(&dev_priv->drm, "graphic opregion physical addr: 0x%x\n",
		asls);
	if (asls == 0) {
	if (asls == 0) {
		DRM_DEBUG_DRIVER("ACPI OpRegion not supported!\n");
		drm_dbg(&dev_priv->drm, "ACPI OpRegion not supported!\n");
		return -ENOTSUPP;
		return -ENOTSUPP;
	}
	}


@@ -853,21 +872,21 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
	memcpy(buf, base, sizeof(buf));
	memcpy(buf, base, sizeof(buf));


	if (memcmp(buf, OPREGION_SIGNATURE, 16)) {
	if (memcmp(buf, OPREGION_SIGNATURE, 16)) {
		DRM_DEBUG_DRIVER("opregion signature mismatch\n");
		drm_dbg(&dev_priv->drm, "opregion signature mismatch\n");
		err = -EINVAL;
		err = -EINVAL;
		goto err_out;
		goto err_out;
	}
	}
	opregion->header = base;
	opregion->header = base;
	opregion->lid_state = base + ACPI_CLID;
	opregion->lid_state = base + ACPI_CLID;


	DRM_DEBUG_DRIVER("ACPI OpRegion version %u.%u.%u\n",
	drm_dbg(&dev_priv->drm, "ACPI OpRegion version %u.%u.%u\n",
		opregion->header->over.major,
		opregion->header->over.major,
		opregion->header->over.minor,
		opregion->header->over.minor,
		opregion->header->over.revision);
		opregion->header->over.revision);


	mboxes = opregion->header->mboxes;
	mboxes = opregion->header->mboxes;
	if (mboxes & MBOX_ACPI) {
	if (mboxes & MBOX_ACPI) {
		DRM_DEBUG_DRIVER("Public ACPI methods supported\n");
		drm_dbg(&dev_priv->drm, "Public ACPI methods supported\n");
		opregion->acpi = base + OPREGION_ACPI_OFFSET;
		opregion->acpi = base + OPREGION_ACPI_OFFSET;
		/*
		/*
		 * Indicate we handle monitor hotplug events ourselves so we do
		 * Indicate we handle monitor hotplug events ourselves so we do
@@ -879,20 +898,20 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
	}
	}


	if (mboxes & MBOX_SWSCI) {
	if (mboxes & MBOX_SWSCI) {
		DRM_DEBUG_DRIVER("SWSCI supported\n");
		drm_dbg(&dev_priv->drm, "SWSCI supported\n");
		opregion->swsci = base + OPREGION_SWSCI_OFFSET;
		opregion->swsci = base + OPREGION_SWSCI_OFFSET;
		swsci_setup(dev_priv);
		swsci_setup(dev_priv);
	}
	}


	if (mboxes & MBOX_ASLE) {
	if (mboxes & MBOX_ASLE) {
		DRM_DEBUG_DRIVER("ASLE supported\n");
		drm_dbg(&dev_priv->drm, "ASLE supported\n");
		opregion->asle = base + OPREGION_ASLE_OFFSET;
		opregion->asle = base + OPREGION_ASLE_OFFSET;


		opregion->asle->ardy = ASLE_ARDY_NOT_READY;
		opregion->asle->ardy = ASLE_ARDY_NOT_READY;
	}
	}


	if (mboxes & MBOX_ASLE_EXT)
	if (mboxes & MBOX_ASLE_EXT)
		DRM_DEBUG_DRIVER("ASLE extension supported\n");
		drm_dbg(&dev_priv->drm, "ASLE extension supported\n");


	if (intel_load_vbt_firmware(dev_priv) == 0)
	if (intel_load_vbt_firmware(dev_priv) == 0)
		goto out;
		goto out;
@@ -923,12 +942,14 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
		vbt = opregion->rvda;
		vbt = opregion->rvda;
		vbt_size = opregion->asle->rvds;
		vbt_size = opregion->asle->rvds;
		if (intel_bios_is_valid_vbt(vbt, vbt_size)) {
		if (intel_bios_is_valid_vbt(vbt, vbt_size)) {
			DRM_DEBUG_KMS("Found valid VBT in ACPI OpRegion (RVDA)\n");
			drm_dbg_kms(&dev_priv->drm,
				    "Found valid VBT in ACPI OpRegion (RVDA)\n");
			opregion->vbt = vbt;
			opregion->vbt = vbt;
			opregion->vbt_size = vbt_size;
			opregion->vbt_size = vbt_size;
			goto out;
			goto out;
		} else {
		} else {
			DRM_DEBUG_KMS("Invalid VBT in ACPI OpRegion (RVDA)\n");
			drm_dbg_kms(&dev_priv->drm,
				    "Invalid VBT in ACPI OpRegion (RVDA)\n");
			memunmap(opregion->rvda);
			memunmap(opregion->rvda);
			opregion->rvda = NULL;
			opregion->rvda = NULL;
		}
		}
@@ -946,11 +967,13 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv)
		OPREGION_ASLE_EXT_OFFSET : OPREGION_SIZE;
		OPREGION_ASLE_EXT_OFFSET : OPREGION_SIZE;
	vbt_size -= OPREGION_VBT_OFFSET;
	vbt_size -= OPREGION_VBT_OFFSET;
	if (intel_bios_is_valid_vbt(vbt, vbt_size)) {
	if (intel_bios_is_valid_vbt(vbt, vbt_size)) {
		DRM_DEBUG_KMS("Found valid VBT in ACPI OpRegion (Mailbox #4)\n");
		drm_dbg_kms(&dev_priv->drm,
			    "Found valid VBT in ACPI OpRegion (Mailbox #4)\n");
		opregion->vbt = vbt;
		opregion->vbt = vbt;
		opregion->vbt_size = vbt_size;
		opregion->vbt_size = vbt_size;
	} else {
	} else {
		DRM_DEBUG_KMS("Invalid VBT in ACPI OpRegion (Mailbox #4)\n");
		drm_dbg_kms(&dev_priv->drm,
			    "Invalid VBT in ACPI OpRegion (Mailbox #4)\n");
	}
	}


out:
out:
@@ -986,20 +1009,22 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)


	ret = swsci(dev_priv, SWSCI_GBDA_PANEL_DETAILS, 0x0, &panel_details);
	ret = swsci(dev_priv, SWSCI_GBDA_PANEL_DETAILS, 0x0, &panel_details);
	if (ret) {
	if (ret) {
		DRM_DEBUG_KMS("Failed to get panel details from OpRegion (%d)\n",
		drm_dbg_kms(&dev_priv->drm,
			    "Failed to get panel details from OpRegion (%d)\n",
			    ret);
			    ret);
		return ret;
		return ret;
	}
	}


	ret = (panel_details >> 8) & 0xff;
	ret = (panel_details >> 8) & 0xff;
	if (ret > 0x10) {
	if (ret > 0x10) {
		DRM_DEBUG_KMS("Invalid OpRegion panel type 0x%x\n", ret);
		drm_dbg_kms(&dev_priv->drm,
			    "Invalid OpRegion panel type 0x%x\n", ret);
		return -EINVAL;
		return -EINVAL;
	}
	}


	/* fall back to VBT panel type? */
	/* fall back to VBT panel type? */
	if (ret == 0x0) {
	if (ret == 0x0) {
		DRM_DEBUG_KMS("No panel type in OpRegion\n");
		drm_dbg_kms(&dev_priv->drm, "No panel type in OpRegion\n");
		return -ENODEV;
		return -ENODEV;
	}
	}


@@ -1009,7 +1034,8 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
	 * via a quirk list :(
	 * via a quirk list :(
	 */
	 */
	if (!dmi_check_system(intel_use_opregion_panel_type)) {
	if (!dmi_check_system(intel_use_opregion_panel_type)) {
		DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
		drm_dbg_kms(&dev_priv->drm,
			    "Ignoring OpRegion panel type (%d)\n", ret - 1);
		return -ENODEV;
		return -ENODEV;
	}
	}