Commit 6b702462 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: (50 commits)
  drm: include kernel list header file in hashtab header
  drm: Export hash table functionality.
  drm: Split out the mm declarations in a separate header. Add atomic operations.
  drm/radeon: add support for RV790.
  drm/radeon: add rv740 drm support.
  drm_calloc_large: check right size, check integer overflow, use GFP_ZERO
  drm: Eliminate magic I2C frobbing when reading EDID
  drm/i915: duplicate desired mode for use by fbcon.
  drm/via: vfree() no need checking before calling it
  drm: Replace DRM_DEBUG with DRM_DEBUG_DRIVER in i915 driver
  drm: Replace DRM_DEBUG with DRM_DEBUG_MODE in drm_mode
  drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in intel_sdvo
  drm/i915: replace DRM_DEBUG with DRM_DEBUG_KMS in intel_lvds
  drm: add separate drm debugging levels
  radeon: remove _DRM_DRIVER from the preadded sarea map
  drm: don't associate _DRM_DRIVER maps with a master
  drm: simplify kcalloc() call to kzalloc().
  intelfb: fix spelling of "CLOCK"
  drm: fix LOCK_TEST_WITH_RETURN macro
  drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect)
  ...
parents 947ec0b0 3c24475c

drivers/char/agp/intel-agp.c

+15 −1
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ 
#define PCI_DEVICE_ID_INTEL_G45_IG          0x2E22

#define PCI_DEVICE_ID_INTEL_G41_HB          0x2E30

#define PCI_DEVICE_ID_INTEL_G41_IG          0x2E32

#define PCI_DEVICE_ID_INTEL_IGDNG_D_HB	    0x0040

#define PCI_DEVICE_ID_INTEL_IGDNG_D_IG	    0x0042

#define PCI_DEVICE_ID_INTEL_IGDNG_M_HB	    0x0044

#define PCI_DEVICE_ID_INTEL_IGDNG_M_IG	    0x0046



/* cover 915 and 945 variants */

#define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \
@@ -75,7 +79,9 @@ 
		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB)

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_D_HB || \

		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDNG_M_HB)



extern int agp_memory_reserved;
@@ -1211,6 +1217,8 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) 
	case PCI_DEVICE_ID_INTEL_Q45_HB:

	case PCI_DEVICE_ID_INTEL_G45_HB:

	case PCI_DEVICE_ID_INTEL_G41_HB:

	case PCI_DEVICE_ID_INTEL_IGDNG_D_HB:

	case PCI_DEVICE_ID_INTEL_IGDNG_M_HB:

		*gtt_offset = *gtt_size = MB(2);

		break;

	default:
@@ -2186,6 +2194,10 @@ static const struct intel_driver_description { 
	    "G45/G43", NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG, 0,

	    "G41", NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_IGDNG_D_HB, PCI_DEVICE_ID_INTEL_IGDNG_D_IG, 0,

	    "IGDNG/D", NULL, &intel_i965_driver },

	{ PCI_DEVICE_ID_INTEL_IGDNG_M_HB, PCI_DEVICE_ID_INTEL_IGDNG_M_IG, 0,

	    "IGDNG/M", NULL, &intel_i965_driver },

	{ 0, 0, 0, NULL, NULL, NULL }

};
@@ -2387,6 +2399,8 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_Q45_HB),

	ID(PCI_DEVICE_ID_INTEL_G45_HB),

	ID(PCI_DEVICE_ID_INTEL_G41_HB),

	ID(PCI_DEVICE_ID_INTEL_IGDNG_D_HB),

	ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),

	{ }

};

drivers/gpu/drm/drm_bufs.c

+2 −1
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, 
	list->user_token = list->hash.key << PAGE_SHIFT;

	mutex_unlock(&dev->struct_mutex);



	if (!(map->flags & _DRM_DRIVER))

		list->master = dev->primary->master;

	*maplist = list;

	return 0;

drivers/gpu/drm/drm_edid.c

+1 −73
Original line number Diff line number Diff line
@@ -589,85 +589,13 @@ int drm_do_probe_ddc_edid(struct i2c_adapter *adapter, 
}

EXPORT_SYMBOL(drm_do_probe_ddc_edid);



/**

 * Get EDID information.

 *

 * \param adapter : i2c device adaptor.

 * \param buf     : EDID data buffer to be filled

 * \param len     : EDID data buffer length

 * \return 0 on success or -1 on failure.

 *

 * Initialize DDC, then fetch EDID information

 * by calling drm_do_probe_ddc_edid function.

 */

static int drm_ddc_read(struct i2c_adapter *adapter,

			unsigned char *buf, int len)

{

	struct i2c_algo_bit_data *algo_data = adapter->algo_data;

	int i, j;

	int ret = -1;



	algo_data->setscl(algo_data->data, 1);



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

		/* For some old monitors we need the

		 * following process to initialize/stop DDC

		 */

		algo_data->setsda(algo_data->data, 1);

		msleep(13);



		algo_data->setscl(algo_data->data, 1);

		for (j = 0; j < 5; j++) {

			msleep(10);

			if (algo_data->getscl(algo_data->data))

				break;

		}

		if (j == 5)

			continue;



		algo_data->setsda(algo_data->data, 0);

		msleep(15);

		algo_data->setscl(algo_data->data, 0);

		msleep(15);

		algo_data->setsda(algo_data->data, 1);

		msleep(15);



		/* Do the real work */

		ret = drm_do_probe_ddc_edid(adapter, buf, len);

		algo_data->setsda(algo_data->data, 0);

		algo_data->setscl(algo_data->data, 0);

		msleep(15);



		algo_data->setscl(algo_data->data, 1);

		for (j = 0; j < 10; j++) {

			msleep(10);

			if (algo_data->getscl(algo_data->data))

				break;

		}



		algo_data->setsda(algo_data->data, 1);

		msleep(15);

		algo_data->setscl(algo_data->data, 0);

		algo_data->setsda(algo_data->data, 0);

		if (ret == 0)

			break;

	}

	/* Release the DDC lines when done or the Apple Cinema HD display

	 * will switch off

	 */

	algo_data->setsda(algo_data->data, 1);

	algo_data->setscl(algo_data->data, 1);



	return ret;

}



static int drm_ddc_read_edid(struct drm_connector *connector,

			     struct i2c_adapter *adapter,

			     char *buf, int len)

{

	int ret;



	ret = drm_ddc_read(adapter, buf, len);

	ret = drm_do_probe_ddc_edid(adapter, buf, len);

	if (ret != 0) {

		dev_info(&connector->dev->pdev->dev, "%s: no EDID data\n",

			 drm_get_connector_name(connector));

drivers/gpu/drm/drm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size) 


	BUG_ON((size & (PAGE_SIZE - 1)) != 0);



	obj = kcalloc(1, sizeof(*obj), GFP_KERNEL);

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



	obj->dev = dev;

	obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);

drivers/gpu/drm/drm_hashtab.c

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ int drm_ht_create(struct drm_open_hash *ht, unsigned int order) 
	}

	return 0;

}

EXPORT_SYMBOL(drm_ht_create);



void drm_ht_verbose_list(struct drm_open_hash *ht, unsigned long key)

{
@@ -156,6 +157,7 @@ int drm_ht_just_insert_please(struct drm_open_hash *ht, struct drm_hash_item *it 
	}

	return 0;

}

EXPORT_SYMBOL(drm_ht_just_insert_please);



int drm_ht_find_item(struct drm_open_hash *ht, unsigned long key,

		     struct drm_hash_item **item)
@@ -169,6 +171,7 @@ int drm_ht_find_item(struct drm_open_hash *ht, unsigned long key, 
	*item = hlist_entry(list, struct drm_hash_item, head);

	return 0;

}

EXPORT_SYMBOL(drm_ht_find_item);



int drm_ht_remove_key(struct drm_open_hash *ht, unsigned long key)

{
@@ -202,3 +205,4 @@ void drm_ht_remove(struct drm_open_hash *ht) 
		ht->table = NULL;

	}

}

EXPORT_SYMBOL(drm_ht_remove);

CRA Git | Maintained and supported by SUSTech CRA and CCSE