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

Commit 1a464cbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux 

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (307 commits)
  drm/nouveau/pm: fix build with HWMON off
  gma500: silence gcc warnings in mid_get_vbt_data()
  drm/ttm: fix condition (and vs or)
  drm/radeon: double lock typo in radeon_vm_bo_rmv()
  drm/radeon: use after free in radeon_vm_bo_add()
  drm/sis|via: don't return stack garbage from free_mem ioctl
  drm/radeon/kms: remove pointless CS flags priority struct
  drm/radeon/kms: check if vm is supported in VA ioctl
  drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)
  radeon: Fix disabling PCI bus mastering on big endian hosts.
  ttm: fix agp since ttm tt rework
  agp: Fix multi-line warning message whitespace
  drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don't try to free freed pages.
  drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.
  drm/radeon/kms: sync across multiple rings when doing bo moves v3
  drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)
  drm/radeon: GPU virtual memory support v22
  drm: make DRM_UNLOCKED ioctls with their own mutex
  drm: no need to hold global mutex for static data
  drm/radeon/benchmark: common modes sweep ignores 640x480@32
  ...

Fix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c
parents dbe950f2 095f979a

drivers/char/agp/generic.c

+4 −4
Original line number Diff line number Diff line
@@ -514,12 +514,12 @@ static void agp_v2_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_ 
	switch (*bridge_agpstat & 7) {

	case 4:

		*bridge_agpstat |= (AGPSTAT2_2X | AGPSTAT2_1X);

		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x4 rate"

		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x4 rate. "

			"Fixing up support for x2 & x1\n");

		break;

	case 2:

		*bridge_agpstat |= AGPSTAT2_1X;

		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x2 rate"

		printk(KERN_INFO PFX "BIOS bug. AGP bridge claims to only support x2 rate. "

			"Fixing up support for x1\n");

		break;

	default:
@@ -956,7 +956,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge) 
	bridge->driver->cache_flush();

#ifdef CONFIG_X86

	if (set_memory_uc((unsigned long)table, 1 << page_order))

		printk(KERN_WARNING "Could not set GATT table memory to UC!");

		printk(KERN_WARNING "Could not set GATT table memory to UC!\n");



	bridge->gatt_table = (void *)table;

#else

drivers/gpu/drm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -162,3 +162,6 @@ config DRM_SAVAGE 
source "drivers/gpu/drm/exynos/Kconfig"



source "drivers/gpu/drm/vmwgfx/Kconfig"



source "drivers/gpu/drm/gma500/Kconfig"

drivers/gpu/drm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ 
		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \

		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \

		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \

		drm_platform.o drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \

		drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \

		drm_crtc.o drm_modes.o drm_edid.o \

		drm_info.o drm_debugfs.o drm_encoder_slave.o \

		drm_trace_points.o drm_global.o drm_usb.o
@@ -36,4 +36,5 @@ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ 
obj-$(CONFIG_DRM_VIA)	+=via/

obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/

obj-$(CONFIG_DRM_EXYNOS) +=exynos/

obj-$(CONFIG_DRM_GMA500) += gma500/

obj-y			+= i2c/

drivers/gpu/drm/drm_context.c

+3 −2
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ int drm_getsareactx(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	mutex_unlock(&dev->struct_mutex);



	request->handle = NULL;

	list_for_each_entry(_entry, &dev->maplist, head) {

		if (_entry->map == map) {
@@ -164,6 +162,9 @@ int drm_getsareactx(struct drm_device *dev, void *data, 
			break;

		}

	}



	mutex_unlock(&dev->struct_mutex);



	if (request->handle == NULL)

		return -EINVAL;

drivers/gpu/drm/drm_crtc.c

+579 −29

File changed.

Preview size limit exceeded, changes collapsed.