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

Commit 9a170cae authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next 

* 'intel/drm-intel-next' of ../drm-next: (266 commits)
  drm/i915: Avoid circular locking from intel_fbdev_fini()
  drm/i915: mark display port DPMS state as 'ON' when enabling output
  drm/i915: Skip pread/pwrite if size to copy is 0.
  drm/i915: avoid struct mutex output_poll mutex lock loop on unload
  drm/i915: Rephrase pwrite bounds checking to avoid any potential overflow
  drm/i915: Sanity check pread/pwrite
  drm/i915: Use pipe state to tell when pipe is off
  drm/i915: vblank status not valid while training display port
  drivers/gpu/drm/i915/i915_gem.c: Add missing error handling code
  drm/i915: Don't mask the return code whilst relocating.
  drm/i915: If the GPU hangs twice within 5 seconds, declare it wedged.
  drm/i915: Only print 'generating error event' if we actually are
  drm/i915: Try to reset gen2 devices.
  drm/i915: Clear fence registers on GPU reset
  drm/i915: Force the domain to CPU on unbinding whilst wedged.
  drm: Move the GTT accounting to i915
  drm/i915: Fix refleak during eviction.
  i915: Added function to initialize VBT settings
  drm/i915: Remove redundant deletion of obj->gpu_write_list
  drm/i915: Make get/put pages static
  ...
parents 45ff46c5 7b4f3990

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2051,6 +2051,15 @@ S: Maintained 
F:	drivers/gpu/drm/

F:	include/drm/



INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Chris Wilson <chris@chris-wilson.co.uk>

L:	intel-gfx@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git

S:	Supported

F:	drivers/gpu/drm/i915

F:	include/drm/i915*



DSCC4 DRIVER

M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org

drivers/char/agp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_AGP_HP_ZX1) += hp-agp.o 
obj-$(CONFIG_AGP_PARISC)	+= parisc-agp.o

obj-$(CONFIG_AGP_I460)		+= i460-agp.o

obj-$(CONFIG_AGP_INTEL)		+= intel-agp.o

obj-$(CONFIG_AGP_INTEL)		+= intel-gtt.o

obj-$(CONFIG_AGP_NVIDIA)	+= nvidia-agp.o

obj-$(CONFIG_AGP_SGI_TIOCA)	+= sgi-agp.o

obj-$(CONFIG_AGP_SIS)		+= sis-agp.o

drivers/char/agp/agp.h

+0 −5
Original line number Diff line number Diff line
@@ -121,11 +121,6 @@ struct agp_bridge_driver { 
	void (*agp_destroy_pages)(struct agp_memory *);

	int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);

	void (*chipset_flush)(struct agp_bridge_data *);



	int (*agp_map_page)(struct page *page, dma_addr_t *ret);

	void (*agp_unmap_page)(struct page *page, dma_addr_t dma);

	int (*agp_map_memory)(struct agp_memory *mem);

	void (*agp_unmap_memory)(struct agp_memory *mem);

};



struct agp_bridge_data {

drivers/char/agp/backend.c

+1 −21
Original line number Diff line number Diff line
@@ -151,17 +151,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 
		}



		bridge->scratch_page_page = page;

		if (bridge->driver->agp_map_page) {

			if (bridge->driver->agp_map_page(page,

							 &bridge->scratch_page_dma)) {

				dev_err(&bridge->dev->dev,

					"unable to dma-map scratch page\n");

				rc = -ENOMEM;

				goto err_out_nounmap;

			}

		} else {

		bridge->scratch_page_dma = page_to_phys(page);

		}



		bridge->scratch_page = bridge->driver->mask_memory(bridge,

						   bridge->scratch_page_dma, 0);
@@ -204,12 +194,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 
	return 0;



err_out:

	if (bridge->driver->needs_scratch_page &&

	    bridge->driver->agp_unmap_page) {

		bridge->driver->agp_unmap_page(bridge->scratch_page_page,

					       bridge->scratch_page_dma);

	}

err_out_nounmap:

	if (bridge->driver->needs_scratch_page) {

		void *va = page_address(bridge->scratch_page_page);
@@ -240,10 +224,6 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) 
	    bridge->driver->needs_scratch_page) {

		void *va = page_address(bridge->scratch_page_page);



		if (bridge->driver->agp_unmap_page)

			bridge->driver->agp_unmap_page(bridge->scratch_page_page,

						       bridge->scratch_page_dma);



		bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);

		bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);

	}

drivers/char/agp/generic.c

+0 −8
Original line number Diff line number Diff line
@@ -437,11 +437,6 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start) 
		curr->is_flushed = true;

	}



	if (curr->bridge->driver->agp_map_memory) {

		ret_val = curr->bridge->driver->agp_map_memory(curr);

		if (ret_val)

			return ret_val;

	}

	ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type);



	if (ret_val != 0)
@@ -483,9 +478,6 @@ int agp_unbind_memory(struct agp_memory *curr) 
	if (ret_val != 0)

		return ret_val;



	if (curr->bridge->driver->agp_unmap_memory)

		curr->bridge->driver->agp_unmap_memory(curr);



	curr->is_bound = false;

	curr->pg_start = 0;

	spin_lock(&curr->bridge->mapped_lock);