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

Commit eb96c925 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/radeon/kms: use helper functions for fence read/write
  drm/radeon/kms: set DP link config properly for DP bridges
  drm/radeon/kms/atom: AdjustPixelClock fixes for DP bridges
  drm/radeon/kms: fix handling of DP to LVDS bridges
  drm/radeon/kms: issue blank/unblank commands for ext encoders
  drm/radeon/kms: fix support for DDC on dp bridges
  drm/radeon/kms: add support for load detection on dp bridges
  drm/radeon/kms: add missing external encoder action
  drm/radeon/kms: rework atombios_get_encoder_mode()
  drm/radeon/kms: fix num crtcs for Cedar and Caicos
  Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"
  drivers/gpu/drm: use printk_ratelimited instead of printk_ratelimit
  drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.
  drm: make debug levels match in edid failure code.
  drm/radeon/kms: clear wb memory by default
  drm/radeon/kms: be more pedantic about the g5 quirk (v2)
  drm/radeon/kms: signed fix for evergreen thermal
  drm: populate irq_by_busid-member for pci
parents 8b97b21e b81157d0

drivers/gpu/drm/drm_edid.c

+17 −2
Original line number Diff line number Diff line
@@ -184,9 +184,9 @@ drm_edid_block_valid(u8 *raw_edid) 


bad:

	if (raw_edid) {

		DRM_ERROR("Raw EDID:\n");

		printk(KERN_ERR "Raw EDID:\n");

		print_hex_dump_bytes(KERN_ERR, DUMP_PREFIX_NONE, raw_edid, EDID_LENGTH);

		printk("\n");

		printk(KERN_ERR "\n");

	}

	return 0;

}
@@ -258,6 +258,17 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf, 
	return ret == 2 ? 0 : -1;

}



static bool drm_edid_is_zero(u8 *in_edid, int length)

{

	int i;

	u32 *raw_edid = (u32 *)in_edid;



	for (i = 0; i < length / 4; i++)

		if (*(raw_edid + i) != 0)

			return false;

	return true;

}



static u8 *

drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)

{
@@ -273,6 +284,10 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 
			goto out;

		if (drm_edid_block_valid(block))

			break;

		if (i == 0 && drm_edid_is_zero(block, EDID_LENGTH)) {

			connector->null_edid_counter++;

			goto carp;

		}

	}

	if (i == 4)

		goto carp;

drivers/gpu/drm/drm_ioc32.c

+5 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
 * IN THE SOFTWARE.

 */

#include <linux/compat.h>

#include <linux/ratelimit.h>



#include "drmP.h"

#include "drm_core.h"
@@ -253,8 +254,8 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, 
		return -EFAULT;



	m32.handle = (unsigned long)handle;

	if (m32.handle != (unsigned long)handle && printk_ratelimit())

		printk(KERN_ERR "compat_drm_addmap truncated handle"

	if (m32.handle != (unsigned long)handle)

		printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle"

				   " %p for type %d offset %x\n",

				   handle, m32.type, m32.offset);

drivers/gpu/drm/drm_pci.c

+2 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ err: 
}





int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)

static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)

{

	if ((p->busnum >> 8) != drm_get_pci_domain(dev) ||

	    (p->busnum & 0xff) != dev->pdev->bus->number ||
@@ -292,6 +292,7 @@ static struct drm_bus drm_pci_bus = { 
	.get_name = drm_pci_get_name,

	.set_busid = drm_pci_set_busid,

	.set_unique = drm_pci_set_unique,

	.irq_by_busid = drm_pci_irq_by_busid,

	.agp_init = drm_pci_agp_init,

};

drivers/gpu/drm/i915/intel_i2c.c

+1 −2
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ int intel_setup_gmbus(struct drm_device *dev) 
		bus->reg0 = i | GMBUS_RATE_100KHZ;



		/* XXX force bit banging until GMBUS is fully debugged */

		if (IS_GEN2(dev))

		bus->force_bit = intel_gpio_create(dev_priv, i);

	}

drivers/gpu/drm/radeon/atombios.h

+1 −0
Original line number Diff line number Diff line
@@ -1200,6 +1200,7 @@ typedef struct _EXTERNAL_ENCODER_CONTROL_PARAMETERS_V3 
#define EXTERNAL_ENCODER_ACTION_V3_ENCODER_BLANKING_OFF   0x10

#define EXTERNAL_ENCODER_ACTION_V3_ENCODER_BLANKING       0x11

#define EXTERNAL_ENCODER_ACTION_V3_DACLOAD_DETECTION      0x12

#define EXTERNAL_ENCODER_ACTION_V3_DDC_SETUP              0x14



// ucConfig

#define EXTERNAL_ENCODER_CONFIG_V3_DPLINKRATE_MASK				0x03