Commit abb72c82 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes-2' of... 

Merge branch 'drm-intel-fixes-2' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes

* 'drm-intel-fixes-2' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: (30 commits)
  drm/i915: Prevent uninitialised reads during error state capture
  drm/i915: Use consistent mappings for OpRegion between ACPI and i915
  drm/i915: Handle the no-interrupts case for UMS by polling
  drm/i915: Disable high-precision vblank timestamping for UMS
  drm/i915: Increase the amount of defense before computing vblank timestamps
  drm/i915,agp/intel: Do not clear stolen entries
  Remove MAYBE_BUILD_BUG_ON
  BUILD_BUG_ON: make it handle more cases
  module: fix missing semicolons in MODULE macro usage
  param: add null statement to compiled-in module params
  module: fix linker error for MODULE_VERSION when !MODULE and CONFIG_SYSFS=n
  module: show version information for built-in modules in sysfs
  selinux: return -ENOMEM when memory allocation fails
  tpm: fix panic caused by "tpm: Autodetect itpm devices"
  TPM: Long default timeout fix
  trusted keys: Fix a memory leak in trusted_update().
  keys: add trusted and encrypted maintainers
  encrypted-keys: rename encrypted_defined files to encrypted
  trusted-keys: rename trusted_defined files to trusted
  drm/i915: Recognise non-VGA display devices
  ...
parents 58bbf018 8e934dbf

Documentation/DocBook/device-drivers.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/serial/serial_core.c

!Edrivers/serial/8250.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

  </chapter>



  <chapter id="fbdev">

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -3674,6 +3674,28 @@ F: include/linux/key-type.h 
F:	include/keys/

F:	security/keys/



KEYS-TRUSTED

M:	David Safford <safford@watson.ibm.com>

M:	Mimi Zohar <zohar@us.ibm.com>

L:	linux-security-module@vger.kernel.org

L:	keyrings@linux-nfs.org

S:	Supported

F:	Documentation/keys-trusted-encrypted.txt

F:	include/keys/trusted-type.h

F:	security/keys/trusted.c

F:	security/keys/trusted.h



KEYS-ENCRYPTED

M:	Mimi Zohar <zohar@us.ibm.com>

M:	David Safford <safford@watson.ibm.com>

L:	linux-security-module@vger.kernel.org

L:	keyrings@linux-nfs.org

S:	Supported

F:	Documentation/keys-trusted-encrypted.txt

F:	include/keys/encrypted-type.h

F:	security/keys/encrypted.c

F:	security/keys/encrypted.h



KGDB / KDB /debug_core

M:	Jason Wessel <jason.wessel@windriver.com>

W:	http://kgdb.wiki.kernel.org/

drivers/char/agp/intel-gtt.c

+9 −10
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static struct _intel_private { 
	phys_addr_t gma_bus_addr;

	u32 PGETBL_save;

	u32 __iomem *gtt;		/* I915G */

	bool clear_fake_agp; /* on first access via agp, fill with scratch */

	int num_dcache_entries;

	union {

		void __iomem *i9xx_flush_page;
@@ -869,21 +870,12 @@ static int intel_fake_agp_free_gatt_table(struct agp_bridge_data *bridge) 


static int intel_fake_agp_configure(void)

{

	int i;



	if (!intel_enable_gtt())

	    return -EIO;



	intel_private.clear_fake_agp = true;

	agp_bridge->gart_bus_addr = intel_private.gma_bus_addr;



	for (i = 0; i < intel_private.base.gtt_total_entries; i++) {

		intel_private.driver->write_entry(intel_private.scratch_page_dma,

						  i, 0);

	}

	readl(intel_private.gtt+i-1);	/* PCI Posting. */



	global_cache_flush();



	return 0;

}
@@ -945,6 +937,13 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem, 
{

	int ret = -EINVAL;



	if (intel_private.clear_fake_agp) {

		int start = intel_private.base.stolen_size / PAGE_SIZE;

		int end = intel_private.base.gtt_mappable_entries;

		intel_gtt_clear_range(start, end - start);

		intel_private.clear_fake_agp = false;

	}



	if (INTEL_GTT_GEN == 1 && type == AGP_DCACHE_MEMORY)

		return i810_insert_dcache_entries(mem, pg_start, type);

drivers/char/tpm/tpm.c

+6 −4
Original line number Diff line number Diff line
@@ -364,12 +364,14 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, 
		    tpm_protected_ordinal_duration[ordinal &

						   TPM_PROTECTED_ORDINAL_MASK];



	if (duration_idx != TPM_UNDEFINED)

	if (duration_idx != TPM_UNDEFINED) {

		duration = chip->vendor.duration[duration_idx];

	if (duration <= 0)

		/* if duration is 0, it's because chip->vendor.duration wasn't */

		/* filled yet, so we set the lowest timeout just to give enough */

		/* time for tpm_get_timeouts() to succeed */

		return (duration <= 0 ? HZ : duration);

	} else

		return 2 * 60 * HZ;

	else

		return duration;

}

EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);

drivers/char/tpm/tpm_tis.c

+3 −3
Original line number Diff line number Diff line
@@ -493,9 +493,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, 
		 "1.2 TPM (device-id 0x%X, rev-id %d)\n",

		 vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));



	if (is_itpm(to_pnp_dev(dev)))

		itpm = 1;



	if (itpm)

		dev_info(dev, "Intel iTPM workaround enabled\n");
@@ -637,6 +634,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, 
	else

		interrupts = 0;



	if (is_itpm(pnp_dev))

		itpm = 1;



	return tpm_tis_init(&pnp_dev->dev, start, len, irq);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE