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

Commit fd98a5d7 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/radeon/kms: add pci id to acer travelmate quirk for 5730
  drm/radeon: fix order of doing things in radeon_crtc_cursor_set
  drm: mm: fix debug output
  drm/radeon/kms: ATPX switcheroo fixes
  drm/nouveau: Fix a crash at card takedown for NV40 and older cards
parents 7f4238a0 4f87af46

drivers/gpu/drm/drm_mm.c

+3 −3
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ EXPORT_SYMBOL(drm_mm_search_free_in_range); 
void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)

{

	list_replace(&old->node_list, &new->node_list);

	list_replace(&old->node_list, &new->hole_stack);

	list_replace(&old->hole_stack, &new->hole_stack);

	new->hole_follows = old->hole_follows;

	new->mm = old->mm;

	new->start = old->start;
@@ -699,8 +699,8 @@ int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm) 
				entry->size);

		total_used += entry->size;

		if (entry->hole_follows) {

			hole_start = drm_mm_hole_node_start(&mm->head_node);

			hole_end = drm_mm_hole_node_end(&mm->head_node);

			hole_start = drm_mm_hole_node_start(entry);

			hole_end = drm_mm_hole_node_end(entry);

			hole_size = hole_end - hole_start;

			seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: free\n",

					hole_start, hole_end, hole_size);

drivers/gpu/drm/nouveau/nouveau_mem.c

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ nouveau_mem_vram_fini(struct drm_device *dev) 
{

	struct drm_nouveau_private *dev_priv = dev->dev_private;



	nouveau_bo_ref(NULL, &dev_priv->vga_ram);



	ttm_bo_device_release(&dev_priv->ttm.bdev);



	nouveau_ttm_global_release(dev_priv);

drivers/gpu/drm/nouveau/nouveau_state.c

+5 −0
Original line number Diff line number Diff line
@@ -768,6 +768,11 @@ static void nouveau_card_takedown(struct drm_device *dev) 
	engine->mc.takedown(dev);

	engine->display.late_takedown(dev);



	if (dev_priv->vga_ram) {

		nouveau_bo_unpin(dev_priv->vga_ram);

		nouveau_bo_ref(NULL, &dev_priv->vga_ram);

	}



	mutex_lock(&dev->struct_mutex);

	ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM);

	ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_TT);

drivers/gpu/drm/radeon/radeon_atombios.c

+2 −2
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
		}

	}



	/* Acer laptop (Acer TravelMate 5730G) has an HDMI port

	/* Acer laptop (Acer TravelMate 5730/5730G) has an HDMI port

	 * on the laptop and a DVI port on the docking station and

	 * both share the same encoder, hpd pin, and ddc line.

	 * So while the bios table is technically correct,
@@ -440,7 +440,7 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
	 * with different crtcs which isn't possible on the hardware

	 * side and leaves no crtcs for LVDS or VGA.

	 */

	if ((dev->pdev->device == 0x95c4) &&

	if (((dev->pdev->device == 0x95c4) || (dev->pdev->device == 0x9591)) &&

	    (dev->pdev->subsystem_vendor == 0x1025) &&

	    (dev->pdev->subsystem_device == 0x013c)) {

		if ((*connector_type == DRM_MODE_CONNECTOR_DVII) &&

drivers/gpu/drm/radeon/radeon_atpx_handler.c

+27 −2
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
#define ATPX_VERSION 0

#define ATPX_GPU_PWR 2

#define ATPX_MUX_SELECT 3

#define ATPX_I2C_MUX_SELECT 4

#define ATPX_SWITCH_START 5

#define ATPX_SWITCH_END 6



#define ATPX_INTEGRATED 0

#define ATPX_DISCRETE 1
@@ -149,13 +152,35 @@ static int radeon_atpx_switch_mux(acpi_handle handle, int mux_id) 
	return radeon_atpx_execute(handle, ATPX_MUX_SELECT, mux_id);

}



static int radeon_atpx_switch_i2c_mux(acpi_handle handle, int mux_id)

{

	return radeon_atpx_execute(handle, ATPX_I2C_MUX_SELECT, mux_id);

}



static int radeon_atpx_switch_start(acpi_handle handle, int gpu_id)

{

	return radeon_atpx_execute(handle, ATPX_SWITCH_START, gpu_id);

}



static int radeon_atpx_switch_end(acpi_handle handle, int gpu_id)

{

	return radeon_atpx_execute(handle, ATPX_SWITCH_END, gpu_id);

}



static int radeon_atpx_switchto(enum vga_switcheroo_client_id id)

{

	int gpu_id;



	if (id == VGA_SWITCHEROO_IGD)

		radeon_atpx_switch_mux(radeon_atpx_priv.atpx_handle, 0);

		gpu_id = ATPX_INTEGRATED;

	else

		radeon_atpx_switch_mux(radeon_atpx_priv.atpx_handle, 1);

		gpu_id = ATPX_DISCRETE;



	radeon_atpx_switch_start(radeon_atpx_priv.atpx_handle, gpu_id);

	radeon_atpx_switch_mux(radeon_atpx_priv.atpx_handle, gpu_id);

	radeon_atpx_switch_i2c_mux(radeon_atpx_priv.atpx_handle, gpu_id);

	radeon_atpx_switch_end(radeon_atpx_priv.atpx_handle, gpu_id);



	return 0;

}