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

Commit 94e0fb08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel 

* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (57 commits)
  drm/i915: Handle ERESTARTSYS during page fault
  drm/i915: Warn before mmaping a purgeable buffer.
  drm/i915: Track purged state.
  drm/i915: Remove eviction debug spam
  drm/i915: Immediately discard any backing storage for uneeded objects
  drm/i915: Do not mis-classify clean objects as purgeable
  drm/i915: Whitespace correction for madv
  drm/i915: BUG_ON page refleak during unbind
  drm/i915: Search harder for a reusable object
  drm/i915: Clean up evict from list.
  drm/i915: Add tracepoints
  drm/i915: framebuffer compression for GM45+
  drm/i915: split display functions by chip type
  drm/i915: Skip the sanity checks if the current relocation is valid
  drm/i915: Check that the relocation points to within the target
  drm/i915: correct FBC update when pipe base update occurs
  drm/i915: blacklist Acer AspireOne lid status
  ACPI: make ACPI button funcs no-ops if not built in
  drm/i915: prevent FIFO calculation overflows on 32 bits with high dotclocks
  drm/i915: intel_display.c handle latency variable efficiently
  ...

Fix up trivial conflicts in drivers/gpu/drm/i915/{i915_dma.c|i915_drv.h}
parents b7f21bb2 c715089f

arch/x86/mm/pageattr.c

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ void clflush_cache_range(void *vaddr, unsigned int size) 


	mb();

}

EXPORT_SYMBOL_GPL(clflush_cache_range);



static void __cpa_flush_all(void *arg)

{

drivers/acpi/button.c

+43 −2
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ static const struct file_operations acpi_button_state_fops = { 
	.release = single_release,

};



static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);

static struct acpi_device *lid_device;



/* --------------------------------------------------------------------------

                              FS Interface (/proc)

   -------------------------------------------------------------------------- */
@@ -231,11 +234,38 @@ static int acpi_button_remove_fs(struct acpi_device *device) 
/* --------------------------------------------------------------------------

                                Driver Interface

   -------------------------------------------------------------------------- */

int acpi_lid_notifier_register(struct notifier_block *nb)

{

	return blocking_notifier_chain_register(&acpi_lid_notifier, nb);

}

EXPORT_SYMBOL(acpi_lid_notifier_register);



int acpi_lid_notifier_unregister(struct notifier_block *nb)

{

	return blocking_notifier_chain_unregister(&acpi_lid_notifier, nb);

}

EXPORT_SYMBOL(acpi_lid_notifier_unregister);



int acpi_lid_open(void)

{

	acpi_status status;

	unsigned long long state;



	status = acpi_evaluate_integer(lid_device->handle, "_LID", NULL,

				       &state);

	if (ACPI_FAILURE(status))

		return -ENODEV;



	return !!state;

}

EXPORT_SYMBOL(acpi_lid_open);



static int acpi_lid_send_state(struct acpi_device *device)

{

	struct acpi_button *button = acpi_driver_data(device);

	unsigned long long state;

	acpi_status status;

	int ret;



	status = acpi_evaluate_integer(device->handle, "_LID", NULL, &state);

	if (ACPI_FAILURE(status))
@@ -244,7 +274,12 @@ static int acpi_lid_send_state(struct acpi_device *device) 
	/* input layer checks if event is redundant */

	input_report_switch(button->input, SW_LID, !state);

	input_sync(button->input);

	return 0;



	ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);

	if (ret == NOTIFY_DONE)

		ret = blocking_notifier_call_chain(&acpi_lid_notifier, state,

						   device);

	return ret;

}



static void acpi_button_notify(struct acpi_device *device, u32 event)
@@ -366,8 +401,14 @@ static int acpi_button_add(struct acpi_device *device) 
	error = input_register_device(input);

	if (error)

		goto err_remove_fs;

	if (button->type == ACPI_BUTTON_TYPE_LID)

	if (button->type == ACPI_BUTTON_TYPE_LID) {

		acpi_lid_send_state(device);

		/*

		 * This assumes there's only one lid device, or if there are

		 * more we only care about the last one...

		 */

		lid_device = device;

	}



	if (device->wakeup.flags.valid) {

		/* Button's GPE is run-wake GPE */

drivers/char/agp/intel-agp.c

+30 −7
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#define PCI_DEVICE_ID_INTEL_Q35_IG          0x29B2

#define PCI_DEVICE_ID_INTEL_Q33_HB          0x29D0

#define PCI_DEVICE_ID_INTEL_Q33_IG          0x29D2

#define PCI_DEVICE_ID_INTEL_B43_HB          0x2E40

#define PCI_DEVICE_ID_INTEL_B43_IG          0x2E42

#define PCI_DEVICE_ID_INTEL_GM45_HB         0x2A40

#define PCI_DEVICE_ID_INTEL_GM45_IG         0x2A42

#define PCI_DEVICE_ID_INTEL_IGD_E_HB        0x2E00
@@ -91,6 +93,7 @@ 
		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_B43_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_D_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_M_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_MA_HB)
@@ -804,23 +807,39 @@ static void intel_i830_setup_flush(void) 
	if (!intel_private.i8xx_page)

		return;



	/* make page uncached */

	map_page_into_agp(intel_private.i8xx_page);



	intel_private.i8xx_flush_page = kmap(intel_private.i8xx_page);

	if (!intel_private.i8xx_flush_page)

		intel_i830_fini_flush();

}



static void

do_wbinvd(void *null)

{

	wbinvd();

}



/* The chipset_flush interface needs to get data that has already been

 * flushed out of the CPU all the way out to main memory, because the GPU

 * doesn't snoop those buffers.

 *

 * The 8xx series doesn't have the same lovely interface for flushing the

 * chipset write buffers that the later chips do. According to the 865

 * specs, it's 64 octwords, or 1KB.  So, to get those previous things in

 * that buffer out, we just fill 1KB and clflush it out, on the assumption

 * that it'll push whatever was in there out.  It appears to work.

 */

static void intel_i830_chipset_flush(struct agp_bridge_data *bridge)

{

	unsigned int *pg = intel_private.i8xx_flush_page;

	int i;



	for (i = 0; i < 256; i += 2)

		*(pg + i) = i;

	memset(pg, 0, 1024);



	wmb();

	if (cpu_has_clflush) {

		clflush_cache_range(pg, 1024);

	} else {

		if (on_each_cpu(do_wbinvd, NULL, 1) != 0)

			printk(KERN_ERR "Timed out waiting for cache flush.\n");

	}

}



/* The intel i830 automatically initializes the agp aperture during POST.
@@ -1341,6 +1360,7 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) 
	case PCI_DEVICE_ID_INTEL_Q45_HB:

	case PCI_DEVICE_ID_INTEL_G45_HB:

	case PCI_DEVICE_ID_INTEL_G41_HB:

	case PCI_DEVICE_ID_INTEL_B43_HB:

	case PCI_DEVICE_ID_INTEL_IGDNG_D_HB:

	case PCI_DEVICE_ID_INTEL_IGDNG_M_HB:

	case PCI_DEVICE_ID_INTEL_IGDNG_MA_HB:
@@ -2335,6 +2355,8 @@ static const struct intel_driver_description { 
	    "Q45/Q43", NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_G45_HB, PCI_DEVICE_ID_INTEL_G45_IG, 0,

	    "G45/G43", NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_B43_HB, PCI_DEVICE_ID_INTEL_B43_IG, 0,

	    "B43", NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG, 0,

	    "G41", NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_IGDNG_D_HB, PCI_DEVICE_ID_INTEL_IGDNG_D_IG, 0,
@@ -2535,6 +2557,7 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_Q45_HB),

	ID(PCI_DEVICE_ID_INTEL_G45_HB),

	ID(PCI_DEVICE_ID_INTEL_G41_HB),

	ID(PCI_DEVICE_ID_INTEL_B43_HB),

	ID(PCI_DEVICE_ID_INTEL_IGDNG_D_HB),

	ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),

	ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config DRM_I915 
	select BACKLIGHT_CLASS_DEVICE if ACPI

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	select ACPI_BUTTON if ACPI

	help

	  Choose this option if you have a system that has Intel 830M, 845G,

	  852GM, 855GM 865G or 915G integrated graphics.  If M is selected, the

drivers/gpu/drm/drm_gem.c

+13 −0
Original line number Diff line number Diff line
@@ -142,6 +142,19 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size) 
	if (IS_ERR(obj->filp))

		goto free;



	/* Basically we want to disable the OOM killer and handle ENOMEM

	 * ourselves by sacrificing pages from cached buffers.

	 * XXX shmem_file_[gs]et_gfp_mask()

	 */

	mapping_set_gfp_mask(obj->filp->f_path.dentry->d_inode->i_mapping,

			     GFP_HIGHUSER |

			     __GFP_COLD |

			     __GFP_FS |

			     __GFP_RECLAIMABLE |

			     __GFP_NORETRY |

			     __GFP_NOWARN |

			     __GFP_NOMEMALLOC);



	kref_init(&obj->refcount);

	kref_init(&obj->handlecount);

	obj->size = size;