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

Commit bb5b583b 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: (27 commits)
  gpu/stub: fix acpi_video build error, fix stub kconfig dependencies
  drm/radeon/kms: dynamically allocate power state space
  drm/radeon/kms: fix s/r issues with bios scratch regs
  agp: ensure GART has an address before enabling it
  Revert "agp: AMD AGP is used on UP1100 & UP1500 alpha boxen"
  amd-k7-agp: remove non-x86 code
  drm/radeon/kms/evergreen: always set certain VGT regs at CP init
  drm/radeon/kms: add updated ib_execute function for evergreen
  drm/radeon: remove 0x4243 pci id
  drm/radeon/kms: Enable new pll calculation for avivo+ asics
  drm/radeon/kms: add new pll algo for avivo asics
  drm/radeon/kms: add pll debugging output
  drm/radeon/kms: switch back to min->max pll post divider iteration
  drm/radeon/kms: rv6xx+ thermal sensor fixes
  drm/nv50: fix display on 0x50
  drm/nouveau: correctly pair hwmon_init and hwmon_fini
  drm/i915: Only bind to function 0 of the PCI device
  drm/i915: Suppress spurious vblank interrupts
  drm: Avoid leak of adjusted mode along quick set_mode paths
  drm: Simplify and defend later checks when disabling a crtc
  ...
parents 811aaa55 b9e55f5a

drivers/char/agp/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ config AGP_ATI 


config AGP_AMD

	tristate "AMD Irongate, 761, and 762 chipset support"

	depends on AGP && (X86_32 || ALPHA)

	depends on AGP && X86_32

	help

	  This option gives you AGP support for the GLX component of

	  X on AMD Irongate, 761, and 762 chipsets.

drivers/char/agp/amd-k7-agp.c

+0 −19
Original line number Diff line number Diff line
@@ -41,22 +41,8 @@ static int amd_create_page_map(struct amd_page_map *page_map) 
	if (page_map->real == NULL)

		return -ENOMEM;



#ifndef CONFIG_X86

	SetPageReserved(virt_to_page(page_map->real));

	global_cache_flush();

	page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),

					    PAGE_SIZE);

	if (page_map->remapped == NULL) {

		ClearPageReserved(virt_to_page(page_map->real));

		free_page((unsigned long) page_map->real);

		page_map->real = NULL;

		return -ENOMEM;

	}

	global_cache_flush();

#else

	set_memory_uc((unsigned long)page_map->real, 1);

	page_map->remapped = page_map->real;

#endif



	for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {

		writel(agp_bridge->scratch_page, page_map->remapped+i);
@@ -68,12 +54,7 @@ static int amd_create_page_map(struct amd_page_map *page_map) 


static void amd_free_page_map(struct amd_page_map *page_map)

{

#ifndef CONFIG_X86

	iounmap(page_map->remapped);

	ClearPageReserved(virt_to_page(page_map->real));

#else

	set_memory_wb((unsigned long)page_map->real, 1);

#endif

	free_page((unsigned long) page_map->real);

}

drivers/char/agp/intel-agp.c

+16 −11
Original line number Diff line number Diff line
@@ -773,21 +773,15 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 


	dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);



	/*

	* If the device has not been properly setup, the following will catch

	* the problem and should stop the system from crashing.

	* 20030610 - hamish@zot.org

	*/

	if (pci_enable_device(pdev)) {

		dev_err(&pdev->dev, "can't enable PCI device\n");

		agp_put_bridge(bridge);

		return -ENODEV;

	}



	/*

	* The following fixes the case where the BIOS has "forgotten" to

	* provide an address range for the GART.

	* 20030610 - hamish@zot.org

	* This happens before pci_enable_device() intentionally;

	* calling pci_enable_device() before assigning the resource

	* will result in the GART being disabled on machines with such

	* BIOSs (the GART ends up with a BAR starting at 0, which

	* conflicts a lot of other devices).

	*/

	r = &pdev->resource[0];

	if (!r->start && r->end) {
@@ -798,6 +792,17 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		}

	}



	/*

	* If the device has not been properly setup, the following will catch

	* the problem and should stop the system from crashing.

	* 20030610 - hamish@zot.org

	*/

	if (pci_enable_device(pdev)) {

		dev_err(&pdev->dev, "can't enable PCI device\n");

		agp_put_bridge(bridge);

		return -ENODEV;

	}



	/* Fill in the mode register */

	if (cap_ptr) {

		pci_read_config_dword(pdev,

drivers/gpu/drm/drm_crtc.c

+20 −0
Original line number Diff line number Diff line
@@ -2674,3 +2674,23 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, 
	mutex_unlock(&dev->mode_config.mutex);

	return ret;

}



void drm_mode_config_reset(struct drm_device *dev)

{

	struct drm_crtc *crtc;

	struct drm_encoder *encoder;

	struct drm_connector *connector;



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

		if (crtc->funcs->reset)

			crtc->funcs->reset(crtc);



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

		if (encoder->funcs->reset)

			encoder->funcs->reset(encoder);



	list_for_each_entry(connector, &dev->mode_config.connector_list, head)

		if (connector->funcs->reset)

			connector->funcs->reset(connector);

}

EXPORT_SYMBOL(drm_mode_config_reset);

drivers/gpu/drm/drm_crtc_helper.c

+11 −10
Original line number Diff line number Diff line
@@ -343,13 +343,12 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
	struct drm_encoder *encoder;

	bool ret = true;



	adjusted_mode = drm_mode_duplicate(dev, mode);



	crtc->enabled = drm_helper_crtc_in_use(crtc);



	if (!crtc->enabled)

		return true;



	adjusted_mode = drm_mode_duplicate(dev, mode);



	saved_hwmode = crtc->hwmode;

	saved_mode = crtc->mode;

	saved_x = crtc->x;
@@ -437,10 +436,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
	 */

	drm_calc_timestamping_constants(crtc);



	/* XXX free adjustedmode */

	drm_mode_destroy(dev, adjusted_mode);

	/* FIXME: add subpixel order */

done:

	drm_mode_destroy(dev, adjusted_mode);

	if (!ret) {

		crtc->hwmode = saved_hwmode;

		crtc->mode = saved_mode;
@@ -497,14 +495,17 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 


	crtc_funcs = set->crtc->helper_private;



	if (!set->mode)

		set->fb = NULL;



	if (set->fb) {

		DRM_DEBUG_KMS("[CRTC:%d] [FB:%d] #connectors=%d (x y) (%i %i)\n",

				set->crtc->base.id, set->fb->base.id,

				(int)set->num_connectors, set->x, set->y);

	} else {

		DRM_DEBUG_KMS("[CRTC:%d] [NOFB] #connectors=%d (x y) (%i %i)\n",

				set->crtc->base.id, (int)set->num_connectors,

				set->x, set->y);

		DRM_DEBUG_KMS("[CRTC:%d] [NOFB]\n", set->crtc->base.id);

		set->mode = NULL;

		set->num_connectors = 0;

	}



	dev = set->crtc->dev;
@@ -649,8 +650,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
		mode_changed = true;



	if (mode_changed) {

		set->crtc->enabled = (set->mode != NULL);

		if (set->mode != NULL) {

		set->crtc->enabled = drm_helper_crtc_in_use(set->crtc);

		if (set->crtc->enabled) {

			DRM_DEBUG_KMS("attempting to set mode from"

					" userspace\n");

			drm_mode_debug_printmodeline(set->mode);