Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a8b4b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: fix "persistant" typo
  drm/radeon/kms: add some new ontario pci ids
  drm/radeon/kms: pageflipping cleanup for avivo+
  drm/radeon/kms: Add support for tv-out dongle on G5 9600
  drm: export drm_find_cea_extension to drivers
  drm/radeon/kms: add some sanity checks to obj info record parsingi (v2)
  drm/i915: Reset GMBUS controller after NAK
  drm/i915: Busy-spin wait_for condition in atomic contexts
  drm/i915/lvds: Always return connected in the absence of better information
parents bdfd6b7d 5df23979

drivers/gpu/drm/drm_edid.c

+2 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, 
/**

 * Search EDID for CEA extension block.

 */

static u8 *drm_find_cea_extension(struct edid *edid)

u8 *drm_find_cea_extension(struct edid *edid)

{

	u8 *edid_ext = NULL;

	int i;
@@ -1318,6 +1318,7 @@ static u8 *drm_find_cea_extension(struct edid *edid) 


	return edid_ext;

}

EXPORT_SYMBOL(drm_find_cea_extension);



/**

 * drm_detect_hdmi_monitor - detect whether monitor is hdmi.

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
			ret__ = -ETIMEDOUT;				\

			break;						\

		}							\

		if (W && !in_dbg_master()) msleep(W);			\

		if (W && !(in_atomic() || in_dbg_master())) msleep(W);	\

	}								\

	ret__;								\

})

drivers/gpu/drm/i915/intel_i2c.c

+21 −4
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ gmbus_xfer(struct i2c_adapter *adapter, 
				if (wait_for(I915_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_RDY), 50))

					goto timeout;

				if (I915_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)

					return 0;

					goto clear_err;



				val = I915_READ(GMBUS3 + reg_offset);

				do {
@@ -287,7 +287,7 @@ gmbus_xfer(struct i2c_adapter *adapter, 
				if (wait_for(I915_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_RDY), 50))

					goto timeout;

				if (I915_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)

					return 0;

					goto clear_err;



				val = loop = 0;

				do {
@@ -302,14 +302,31 @@ gmbus_xfer(struct i2c_adapter *adapter, 
		if (i + 1 < num && wait_for(I915_READ(GMBUS2 + reg_offset) & (GMBUS_SATOER | GMBUS_HW_WAIT_PHASE), 50))

			goto timeout;

		if (I915_READ(GMBUS2 + reg_offset) & GMBUS_SATOER)

			return 0;

			goto clear_err;

	}



	return num;

	goto done;



clear_err:

	/* Toggle the Software Clear Interrupt bit. This has the effect

	 * of resetting the GMBUS controller and so clearing the

	 * BUS_ERROR raised by the slave's NAK.

	 */

	I915_WRITE(GMBUS1 + reg_offset, GMBUS_SW_CLR_INT);

	I915_WRITE(GMBUS1 + reg_offset, 0);



done:

	/* Mark the GMBUS interface as disabled. We will re-enable it at the

	 * start of the next xfer, till then let it sleep.

	 */

	I915_WRITE(GMBUS0 + reg_offset, 0);

	return i;



timeout:

	DRM_INFO("GMBUS timed out, falling back to bit banging on pin %d [%s]\n",

		 bus->reg0 & 0xff, bus->adapter.name);

	I915_WRITE(GMBUS0 + reg_offset, 0);



	/* Hardware may not support GMBUS over these pins? Try GPIO bitbanging instead. */

	bus->force_bit = intel_gpio_create(dev_priv, bus->reg0 & 0xff);

	if (!bus->force_bit)

drivers/gpu/drm/i915/intel_lvds.c

+2 −8
Original line number Diff line number Diff line
@@ -473,19 +473,13 @@ static enum drm_connector_status 
intel_lvds_detect(struct drm_connector *connector, bool force)

{

	struct drm_device *dev = connector->dev;

	enum drm_connector_status status = connector_status_connected;

	enum drm_connector_status status;



	status = intel_panel_detect(dev);

	if (status != connector_status_unknown)

		return status;



	/* ACPI lid methods were generally unreliable in this generation, so

	 * don't even bother.

	 */

	if (IS_GEN2(dev) || IS_GEN3(dev))

	return connector_status_connected;



	return status;

}



/**

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ nouveau_gem_new(struct drm_device *dev, struct nouveau_channel *chan, 
		return -ENOMEM;

	}



	nvbo->bo.persistant_swap_storage = nvbo->gem->filp;

	nvbo->bo.persistent_swap_storage = nvbo->gem->filp;

	nvbo->gem->driver_private = nvbo;

	return 0;

}