Commit c48c43e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (476 commits)
  vmwgfx: Implement a proper GMR eviction mechanism
  drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2
  drm/radeon/kms: properly compute group_size on 6xx/7xx
  drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker
  drm/radeon/kms/evergreen: set the clear state to the blit state
  drm/radeon/kms: don't poll dac load detect.
  gpu: Add Intel GMA500(Poulsbo) Stub Driver
  drm/radeon/kms: MC vram map needs to be >= pci aperture size
  drm/radeon/kms: implement display watermark support for evergreen
  drm/radeon/kms/evergreen: add some additional safe regs v2
  drm/radeon/r600: fix tiling issues in CS checker.
  drm/i915: Move gpu_write_list to per-ring
  drm/i915: Invalidate the to-ring, flush the old-ring when updating domains
  drm/i915/ringbuffer: Write the value passed in to the tail register
  agp/intel: Restore valid PTE bit for Sandybridge after bdd30729
  drm/i915: Fix flushing regression from 9af90d19
  drm/i915/sdvo: Remove unused encoding member
  i915: enable AVI infoframe for intel_hdmi.c [v4]
  drm/i915: Fix current fb blocking for page flip
  drm/i915: IS_IRONLAKE is synonymous with gen == 5
  ...

Fix up conflicts in
 - drivers/gpu/drm/i915/{i915_gem.c, i915/intel_overlay.c}: due to the
   new simplified stack-based kmap_atomic() interface
 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: added .llseek entry due to BKL
   removal cleanups.
parents 520045db 135cba0d

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2060,6 +2060,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/amd-k7-agp.c

+4 −2
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type) 


	num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries;



	if (type != 0 || mem->type != 0)

	if (type != mem->type ||

	    agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type))

		return -EINVAL;



	if ((pg_start + mem->page_count) > num_entries)
@@ -348,7 +349,8 @@ static int amd_remove_memory(struct agp_memory *mem, off_t pg_start, int type) 
	unsigned long __iomem *cur_gatt;

	unsigned long addr;



	if (type != 0 || mem->type != 0)

	if (type != mem->type ||

	    agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type))

		return -EINVAL;



	for (i = pg_start; i < (mem->page_count + pg_start); i++) {

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);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE