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

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

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

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: Compare only lower 32 bits of framebuffer map offsets
  drm/i915: Don't leak in i915_gem_shmem_pread_slow()
  drm/radeon/kms: do bounds checking for 3D_LOAD_VBPNTR and bump array limit
  drm/radeon/kms: fix mac g5 quirk
  x86/uv/x2apic: update for change in pci bridge handling.
  alpha, drm: Remove obsolete Alpha support in MGA DRM code
  alpha/drm: Cleanup Alpha support in DRM generic code
  savage: remove unnecessary if statement
  drm/radeon: fix GUI idle IH debug statements
  drm/radeon/kms: check modes against max pixel clock
  drm: fix fbs in DRM_IOCTL_MODE_GETRESOURCES ioctl
parents 6211b3e1 66aa6962

arch/x86/kernel/apic/x2apic_uv_x.c

+4 −4
Original line number Diff line number Diff line
@@ -632,14 +632,14 @@ late_initcall(uv_init_heartbeat); 


/* Direct Legacy VGA I/O traffic to designated IOH */

int uv_set_vga_state(struct pci_dev *pdev, bool decode,

		      unsigned int command_bits, bool change_bridge)

		      unsigned int command_bits, u32 flags)

{

	int domain, bus, rc;



	PR_DEVEL("devfn %x decode %d cmd %x chg_brdg %d\n",

			pdev->devfn, decode, command_bits, change_bridge);

	PR_DEVEL("devfn %x decode %d cmd %x flags %d\n",

			pdev->devfn, decode, command_bits, flags);



	if (!change_bridge)

	if (!(flags & PCI_VGA_STATE_CHANGE_BRIDGE))

		return 0;



	if ((command_bits & PCI_COMMAND_IO) == 0)

drivers/gpu/drm/drm_bufs.c

+9 −8
Original line number Diff line number Diff line
@@ -46,10 +46,11 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, 
	list_for_each_entry(entry, &dev->maplist, head) {

		/*

		 * Because the kernel-userspace ABI is fixed at a 32-bit offset

		 * while PCI resources may live above that, we ignore the map

		 * offset for maps of type _DRM_FRAMEBUFFER or _DRM_REGISTERS.

		 * It is assumed that each driver will have only one resource of

		 * each type.

		 * while PCI resources may live above that, we only compare the

		 * lower 32 bits of the map offset for maps of type

		 * _DRM_FRAMEBUFFER or _DRM_REGISTERS.

		 * It is assumed that if a driver have more than one resource

		 * of each type, the lower 32 bits are different.

		 */

		if (!entry->map ||

		    map->type != entry->map->type ||
@@ -59,8 +60,11 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, 
		case _DRM_SHM:

			if (map->flags != _DRM_CONTAINS_LOCK)

				break;

			return entry;

		case _DRM_REGISTERS:

		case _DRM_FRAME_BUFFER:

			if ((entry->map->offset & 0xffffffff) ==

			    (map->offset & 0xffffffff))

				return entry;

		default: /* Make gcc happy */

			;
@@ -182,9 +186,6 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, 
			kfree(map);

			return -EINVAL;

		}

#endif

#ifdef __alpha__

		map->offset += dev->hose->mem_space->start;

#endif

		/* Some drivers preinitialize some maps, without the X Server

		 * needing to be aware of it.  Therefore, we just return success

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data, 
	if (card_res->count_fbs >= fb_count) {

		copied = 0;

		fb_id = (uint32_t __user *)(unsigned long)card_res->fb_id_ptr;

		list_for_each_entry(fb, &file_priv->fbs, head) {

		list_for_each_entry(fb, &file_priv->fbs, filp_head) {

			if (put_user(fb->base.id, fb_id + copied)) {

				ret = -EFAULT;

				goto out;

drivers/gpu/drm/drm_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) 
static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev)

{

#ifdef __alpha__

	return dev->hose->dense_mem_base - dev->hose->mem_space->start;

	return dev->hose->dense_mem_base;

#else

	return 0;

#endif

drivers/gpu/drm/i915/i915_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -465,8 +465,10 @@ i915_gem_shmem_pread_slow(struct drm_device *dev, 


		page = read_cache_page_gfp(mapping, offset >> PAGE_SHIFT,

					   GFP_HIGHUSER | __GFP_RECLAIMABLE);

		if (IS_ERR(page))

			return PTR_ERR(page);

		if (IS_ERR(page)) {

			ret = PTR_ERR(page);

			goto out;

		}



		if (do_bit17_swizzling) {

			slow_shmem_bit17_copy(page,