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

Commit aa9f56b6 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: (55 commits)
  io-mapping: move asm include inside the config option
  vgaarb: drop vga.h include
  drm/radeon: Add probing of clocks from device-tree
  drm/radeon: drop old and broken mesa warning
  drm/radeon: Fix pci_map_page() error checking
  drm: Remove count_lock for calling lastclose() after 58474713 (v2)
  drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx
  drm/radeon/kms: another r6xx/r7xx CS checker fix
  DRM: Replace kmalloc/memset combos with kzalloc
  drm: expand gamma_set
  drm/edid: Split mode lists out to their own header for readability
  drm/edid: Rewrite mode parse to use the generic detailed block walk
  drm/edid: Add detailed block walk for VTB extensions
  drm/edid: Add detailed block walk for CEA extensions
  drm: Remove unused fields from drm_display_info
  drm: Use ENOENT consistently for the error return for an unmatched handle.
  drm/radeon/kms: mark 3D power states as performance
  drm: Only set DPMS once on the CRTC not after every encoder.
  drm/radeon/kms: add additional quirk for Acer rv620 laptop
  drm: Propagate error code from fb_create()
  ...

Fix up trivial conflicts in drivers/gpu/drm/drm_edid.c
parents 58d4ea65 31ce4bfd

drivers/gpu/drm/ati_pcigart.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 
		/* we need to support large memory configurations */

		entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i],

						 0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);

		if (entry->busaddr[i] == 0) {

		if (pci_dma_mapping_error(dev->pdev, entry->busaddr[i])) {

			DRM_ERROR("unable to map PCIGART pages!\n");

			drm_ati_pcigart_cleanup(dev, gart_info);

			address = NULL;

drivers/gpu/drm/drm_bufs.c

+11 −22
Original line number Diff line number Diff line
@@ -328,14 +328,13 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, 
		return -EINVAL;

	}



	list = kmalloc(sizeof(*list), GFP_KERNEL);

	list = kzalloc(sizeof(*list), GFP_KERNEL);

	if (!list) {

		if (map->type == _DRM_REGISTERS)

			iounmap(map->handle);

		kfree(map);

		return -EINVAL;

	}

	memset(list, 0, sizeof(*list));

	list->map = map;



	mutex_lock(&dev->struct_mutex);
@@ -678,13 +677,12 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->buf_size = size;

	entry->page_order = page_order;
@@ -708,7 +706,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 
		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;

		buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);

		buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);

		if (!buf->dev_private) {

			/* Set count correctly so we free the proper amount. */

			entry->buf_count = count;
@@ -717,7 +715,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 
			atomic_dec(&dev->buf_alloc);

			return -ENOMEM;

		}

		memset(buf->dev_private, 0, buf->dev_priv_size);



		DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);
@@ -832,22 +829,20 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->seglist = kmalloc(count * sizeof(*entry->seglist), GFP_KERNEL);

	entry->seglist = kzalloc(count * sizeof(*entry->seglist), GFP_KERNEL);

	if (!entry->seglist) {

		kfree(entry->buflist);

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->seglist, 0, count * sizeof(*entry->seglist));



	/* Keep the original pagelist until we know all the allocations

	 * have succeeded
@@ -911,7 +906,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
			buf->file_priv = NULL;



			buf->dev_priv_size = dev->driver->dev_priv_size;

			buf->dev_private = kmalloc(buf->dev_priv_size,

			buf->dev_private = kzalloc(buf->dev_priv_size,

						GFP_KERNEL);

			if (!buf->dev_private) {

				/* Set count correctly so we free the proper amount. */
@@ -923,7 +918,6 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
				atomic_dec(&dev->buf_alloc);

				return -ENOMEM;

			}

			memset(buf->dev_private, 0, buf->dev_priv_size);



			DRM_DEBUG("buffer %d @ %p\n",

				  entry->buf_count, buf->address);
@@ -1048,14 +1042,13 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist),

	entry->buflist = kzalloc(count * sizeof(*entry->buflist),

				GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->buf_size = size;

	entry->page_order = page_order;
@@ -1080,7 +1073,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 
		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;

		buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);

		buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);

		if (!buf->dev_private) {

			/* Set count correctly so we free the proper amount. */

			entry->buf_count = count;
@@ -1090,8 +1083,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 
			return -ENOMEM;

		}



		memset(buf->dev_private, 0, buf->dev_priv_size);



		DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);



		offset += alignment;
@@ -1209,14 +1200,13 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist),

	entry->buflist = kzalloc(count * sizeof(*entry->buflist),

				GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->buf_size = size;

	entry->page_order = page_order;
@@ -1240,7 +1230,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 
		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;

		buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);

		buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);

		if (!buf->dev_private) {

			/* Set count correctly so we free the proper amount. */

			entry->buf_count = count;
@@ -1249,7 +1239,6 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 
			atomic_dec(&dev->buf_alloc);

			return -ENOMEM;

		}

		memset(buf->dev_private, 0, buf->dev_priv_size);



		DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);

drivers/gpu/drm/drm_crtc.c

+3 −3
Original line number Diff line number Diff line
@@ -1682,9 +1682,9 @@ int drm_mode_addfb(struct drm_device *dev, 
	/* TODO setup destructor callback */



	fb = dev->mode_config.funcs->fb_create(dev, file_priv, r);

	if (!fb) {

	if (IS_ERR(fb)) {

		DRM_ERROR("could not create framebuffer\n");

		ret = -EINVAL;

		ret = PTR_ERR(fb);

		goto out;

	}
@@ -2541,7 +2541,7 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, 
		goto out;

	}



	crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);

	crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);



out:

	mutex_unlock(&dev->mode_config.mutex);

drivers/gpu/drm/drm_crtc_helper.c

+5 −5
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ int drm_helper_resume_force_mode(struct drm_device *dev) 
				if (encoder_funcs->dpms)

					(*encoder_funcs->dpms) (encoder,

								drm_helper_choose_encoder_dpms(encoder));

			}



			crtc_funcs = crtc->helper_private;

			if (crtc_funcs->dpms)
@@ -824,7 +825,6 @@ int drm_helper_resume_force_mode(struct drm_device *dev) 
						     drm_helper_choose_crtc_dpms(crtc));

		}

	}

	}

	/* disable the unused connectors while restoring the modesetting */

	drm_helper_disable_unused_functions(dev);

	return 0;

drivers/gpu/drm/drm_edid.c

+273 −567

File changed.

Preview size limit exceeded, changes collapsed.