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

Commit 99efb936 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: (39 commits)
  drm/ttm: Be consistent on ttm_bo_init() failures
  drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.
  drm/radeon/kms: fix thermal sensor reporting on rv6xx
  drm/radeon/kms: fix bugs in ddc and cd path router code
  drm/radeon/kms: add support for clock/data path routers
  drm: vmwgfx: fix information leak to userland
  drivers/gpu: Use vzalloc
  drm/vmwgfx: Fix oops on failing bo pin
  drm/ttm: Remove the CAP_SYS_ADMIN requirement for bo pinning
  drm/ttm: Make sure a sync object doesn't disappear while we use it
  drm/radeon/kms: don't disable shared encoders on pre-DCE3 display blocks
  drivers/gpu/drm: Update WARN uses
  drivers/gpu/drm/vmwgfx: Fix k.alloc switched arguments
  DRM: ignore invalid EDID extensions
  drm/radeon/kms: make the connector code less verbose
  drm/ttm: remove failed ttm binding error printout
  drm/ttm: Add a barrier when unreserving
  drm/ttm: Remove mm init error printouts and checks
  drm/ttm: Remove pointless list_empty check
  drm/ttm: Use private locks for the default bo range manager
  ...
parents fb1cb7b2 7dfbbdcf

drivers/char/agp/intel-gtt.c

+3 −3
Original line number Diff line number Diff line
@@ -1210,14 +1210,14 @@ static void gen6_write_entry(dma_addr_t addr, unsigned int entry, 
	unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT;

	u32 pte_flags;



	if (type_mask == AGP_USER_UNCACHED_MEMORY)

	if (type_mask == AGP_USER_MEMORY)

		pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;

	else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) {

		pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;

		pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID;

		if (gfdt)

			pte_flags |= GEN6_PTE_GFDT;

	} else { /* set 'normal'/'cached' to LLC by default */

		pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID;

		pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;

		if (gfdt)

			pte_flags |= GEN6_PTE_GFDT;

	}

drivers/gpu/drm/drm_crtc_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, 
	struct drm_crtc *tmp;

	int crtc_mask = 1;



	WARN(!crtc, "checking null crtc?");

	WARN(!crtc, "checking null crtc?\n");



	dev = crtc->dev;

drivers/gpu/drm/drm_edid.c

+20 −6
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf, 
			.addr	= DDC_ADDR,

			.flags	= I2C_M_RD,

			.len	= len,

			.buf	= buf + start,

			.buf	= buf,

		}

	};
@@ -253,7 +253,7 @@ drm_do_probe_ddc_edid(struct i2c_adapter *adapter, unsigned char *buf, 
static u8 *

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

{

	int i, j = 0;

	int i, j = 0, valid_extensions = 0;

	u8 *block, *new;



	if ((block = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)
@@ -280,14 +280,28 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) 


	for (j = 1; j <= block[0x7e]; j++) {

		for (i = 0; i < 4; i++) {

			if (drm_do_probe_ddc_edid(adapter, block, j,

						  EDID_LENGTH))

			if (drm_do_probe_ddc_edid(adapter,

				  block + (valid_extensions + 1) * EDID_LENGTH,

				  j, EDID_LENGTH))

				goto out;

			if (drm_edid_block_valid(block + j * EDID_LENGTH))

			if (drm_edid_block_valid(block + (valid_extensions + 1) * EDID_LENGTH)) {

				valid_extensions++;

				break;

			}

		}

		if (i == 4)

			goto carp;

			dev_warn(connector->dev->dev,

			 "%s: Ignoring invalid EDID block %d.\n",

			 drm_get_connector_name(connector), j);

	}



	if (valid_extensions != block[0x7e]) {

		block[EDID_LENGTH-1] += block[0x7e] - valid_extensions;

		block[0x7e] = valid_extensions;

		new = krealloc(block, (valid_extensions + 1) * EDID_LENGTH, GFP_KERNEL);

		if (!new)

			goto out;

		block = new;

	}



	return block;

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ unsigned int i915_fbpercrtc = 0; 
module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);



unsigned int i915_powersave = 1;

module_param_named(powersave, i915_powersave, int, 0400);

module_param_named(powersave, i915_powersave, int, 0600);



unsigned int i915_lvds_downclock = 0;

module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1321,6 +1321,7 @@ static inline void i915_write(struct drm_i915_private *dev_priv, u32 reg, 


#define INTEL_PCH_TYPE(dev) (((struct drm_i915_private *)(dev)->dev_private)->pch_type)

#define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)

#define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)



#define PRIMARY_RINGBUFFER_SIZE         (128*1024)