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

Commit 2c1f1895 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: rs600: use correct mask for SW interrupt
  gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
  drm/radeon/radeon_device.c: move a dereference below a NULL test
  drm/radeon/radeon_fence.c: move a dereference below the NULL test
  drm/radeon/radeon_connectors.c: add a NULL test before dereference
  drm/radeon/kms: fix memory leak
  drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
  drm/edid: Fix CVT width/height decode
  drm/edid: Skip empty CVT codepoints
  drm: remove address mask param for drm_pci_alloc()
  drm/radeon/kms: add missing breaks in i2c and ss lookups
  drm/radeon/kms: add primary dac adj values table
  drm/radeon/kms: fallback to default connector table
parents 635b3c9d a81406b4

drivers/gpu/drm/ati_pcigart.c

+8 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev, 
				       struct drm_ati_pcigart_info *gart_info)

{

	gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,

						PAGE_SIZE,

						gart_info->table_mask);

						PAGE_SIZE);

	if (gart_info->table_handle == NULL)

		return -ENOMEM;
@@ -112,6 +111,13 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 
	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {

		DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");



		if (pci_set_dma_mask(dev->pdev, gart_info->table_mask)) {

			DRM_ERROR("fail to set dma mask to 0x%Lx\n",

				  gart_info->table_mask);

			ret = 1;

			goto done;

		}



		ret = drm_ati_alloc_pcigart_table(dev, gart_info);

		if (ret) {

			DRM_ERROR("cannot allocate PCI GART page!\n");

drivers/gpu/drm/drm_bufs.c

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, 
		 * As we're limiting the address to 2^32-1 (or less),

		 * casting it down to 32 bits is no problem, but we

		 * need to point to a 64bit variable first. */

		dmah = drm_pci_alloc(dev, map->size, map->size, 0xffffffffUL);

		dmah = drm_pci_alloc(dev, map->size, map->size);

		if (!dmah) {

			kfree(map);

			return -ENOMEM;
@@ -885,7 +885,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 


	while (entry->buf_count < count) {



		dmah = drm_pci_alloc(dev, PAGE_SIZE << page_order, 0x1000, 0xfffffffful);

		dmah = drm_pci_alloc(dev, PAGE_SIZE << page_order, 0x1000);



		if (!dmah) {

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

drivers/gpu/drm/drm_edid.c

+9 −5
Original line number Diff line number Diff line
@@ -911,23 +911,27 @@ static int drm_cvt_modes(struct drm_connector *connector, 
	struct drm_device *dev = connector->dev;

	struct cvt_timing *cvt;

	const int rates[] = { 60, 85, 75, 60, 50 };

	const u8 empty[3] = { 0, 0, 0 };



	for (i = 0; i < 4; i++) {

		int uninitialized_var(width), height;

		cvt = &(timing->data.other_data.data.cvt[i]);



		height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 8) + 1) * 2;

		switch (cvt->code[1] & 0xc0) {

		if (!memcmp(cvt->code, empty, 3))

			continue;



		height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 4) + 1) * 2;

		switch (cvt->code[1] & 0x0c) {

		case 0x00:

			width = height * 4 / 3;

			break;

		case 0x40:

		case 0x04:

			width = height * 16 / 9;

			break;

		case 0x80:

		case 0x08:

			width = height * 16 / 10;

			break;

		case 0xc0:

		case 0x0c:

			width = height * 15 / 9;

			break;

		}

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con 
			force = DRM_FORCE_ON;

			break;

		case 'D':

			if ((connector->connector_type != DRM_MODE_CONNECTOR_DVII) ||

			if ((connector->connector_type != DRM_MODE_CONNECTOR_DVII) &&

			    (connector->connector_type != DRM_MODE_CONNECTOR_HDMIB))

				force = DRM_FORCE_ON;

			else

drivers/gpu/drm/drm_pci.c

+1 −7
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ 
/**

 * \brief Allocate a PCI consistent memory block, for DMA.

 */

drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align,

				dma_addr_t maxaddr)

drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)

{

	drm_dma_handle_t *dmah;

#if 1
@@ -63,11 +62,6 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali 
	if (align > size)

		return NULL;



	if (pci_set_dma_mask(dev->pdev, maxaddr) != 0) {

		DRM_ERROR("Setting pci dma mask failed\n");

		return NULL;

	}



	dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);

	if (!dmah)

		return NULL;