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

Commit 5b2eef96 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: (390 commits)
  drm/radeon/kms: disable underscan by default
  drm/radeon/kms: only enable hdmi features if the monitor supports audio
  drm: Restore the old_fb upon modeset failure
  drm/nouveau: fix hwmon device binding
  radeon: consolidate asic-specific function decls for pre-r600
  vga_switcheroo: comparing too few characters in strncmp()
  drm/radeon/kms: add NI pci ids
  drm/radeon/kms: don't enable pcie gen2 on NI yet
  drm/radeon/kms: add radeon_asic struct for NI asics
  drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init
  drm/radeon/kms: add ucode loader for NI
  drm/radeon/kms: add support for DCE5 display LUTs
  drm/radeon/kms: add ni_reg.h
  drm/radeon/kms: add bo blit support for NI
  drm/radeon/kms: always use writeback/events for fences on NI
  drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5
  drm/radeon/kms: add backend map workaround for barts
  drm/radeon/kms: fill gpu init for NI asics
  drm/radeon/kms: add disabled vbios accessor for NI asics
  drm/radeon/kms: handle NI thermal controller
  ...
parents 8adbf8d4 56bec7c0

drivers/char/agp/agp.h

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ struct agp_bridge_driver { 
	void (*agp_destroy_page)(struct page *, int flags);

	void (*agp_destroy_pages)(struct agp_memory *);

	int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);

	void (*chipset_flush)(struct agp_bridge_data *);

};



struct agp_bridge_data {

drivers/char/agp/compat_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		break;



	case AGPIOC_CHIPSET_FLUSH32:

		ret_val = agpioc_chipset_flush_wrap(curr_priv);

		break;

	}

drivers/char/agp/compat_ioctl.h

+0 −1
Original line number Diff line number Diff line
@@ -102,6 +102,5 @@ void agp_free_memory_wrap(struct agp_memory *memory); 
struct agp_memory *agp_allocate_memory_wrap(size_t pg_count, u32 type);

struct agp_memory *agp_find_mem_by_key(int key);

struct agp_client *agp_find_client_by_pid(pid_t id);

int agpioc_chipset_flush_wrap(struct agp_file_private *priv);



#endif /* _AGP_COMPAT_H */

drivers/char/agp/frontend.c

+0 −8
Original line number Diff line number Diff line
@@ -957,13 +957,6 @@ static int agpioc_unbind_wrap(struct agp_file_private *priv, void __user *arg) 
	return agp_unbind_memory(memory);

}



int agpioc_chipset_flush_wrap(struct agp_file_private *priv)

{

	DBG("");

	agp_flush_chipset(agp_bridge);

	return 0;

}



static long agp_ioctl(struct file *file,

		     unsigned int cmd, unsigned long arg)

{
@@ -1039,7 +1032,6 @@ static long agp_ioctl(struct file *file, 
		break;

	       

	case AGPIOC_CHIPSET_FLUSH:

		ret_val = agpioc_chipset_flush_wrap(curr_priv);

		break;

	}

drivers/char/agp/generic.c

+0 −27
Original line number Diff line number Diff line
@@ -81,13 +81,6 @@ static int agp_get_key(void) 
	return -1;

}



void agp_flush_chipset(struct agp_bridge_data *bridge)

{

	if (bridge->driver->chipset_flush)

		bridge->driver->chipset_flush(bridge);

}

EXPORT_SYMBOL(agp_flush_chipset);



/*

 * Use kmalloc if possible for the page list. Otherwise fall back to

 * vmalloc. This speeds things up and also saves memory for small AGP
@@ -487,26 +480,6 @@ int agp_unbind_memory(struct agp_memory *curr) 
}

EXPORT_SYMBOL(agp_unbind_memory);



/**

 *	agp_rebind_emmory  -  Rewrite the entire GATT, useful on resume

 */

int agp_rebind_memory(void)

{

	struct agp_memory *curr;

	int ret_val = 0;



	spin_lock(&agp_bridge->mapped_lock);

	list_for_each_entry(curr, &agp_bridge->mapped_list, mapped_list) {

		ret_val = curr->bridge->driver->insert_memory(curr,

							      curr->pg_start,

							      curr->type);

		if (ret_val != 0)

			break;

	}

	spin_unlock(&agp_bridge->mapped_lock);

	return ret_val;

}

EXPORT_SYMBOL(agp_rebind_memory);



/* End - Routines for handling swapping of agp_memory into the GATT */