Commit 5e82ea99 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 new radeon_info ioctl query for clock crystal freq
  drm/i915: Prevent uninitialised reads during error state capture
  drm/i915: Use consistent mappings for OpRegion between ACPI and i915
  drm/i915: Handle the no-interrupts case for UMS by polling
  drm/i915: Disable high-precision vblank timestamping for UMS
  drm/i915: Increase the amount of defense before computing vblank timestamps
  drm/i915,agp/intel: Do not clear stolen entries
  drm/radeon/kms: simplify atom adjust pll setup
  drm/radeon/kms: match r6xx/r7xx/evergreen asic_reset with previous asics
  drm/radeon/kms: make the mac rv630 quirk generic
  drm/radeon/kms: fix a spelling error in an error message
  drm/radeon/kms: Initialize pageflip spinlocks.
  drm/i915: Recognise non-VGA display devices
  drm/i915: Fix use of invalid array size for ring->sync_seqno
  drm/i915/ringbuffer: Fix use of stale HEAD position whilst polling for space
  drm/i915: Don't kick-off hangcheck after a DRI interrupt
  drm/i915: Add dependency on CONFIG_TMPFS
  drm/i915: Initialise ring vfuncs for old DRI paths
  drm/i915: make the blitter report buffer modifications to the FBC unit
  drm/i915: set more FBC chicken bits
parents ec30f343 abb72c82

drivers/char/agp/intel-gtt.c

+9 −10
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static struct _intel_private { 
	phys_addr_t gma_bus_addr;

	u32 PGETBL_save;

	u32 __iomem *gtt;		/* I915G */

	bool clear_fake_agp; /* on first access via agp, fill with scratch */

	int num_dcache_entries;

	union {

		void __iomem *i9xx_flush_page;
@@ -869,21 +870,12 @@ static int intel_fake_agp_free_gatt_table(struct agp_bridge_data *bridge) 


static int intel_fake_agp_configure(void)

{

	int i;



	if (!intel_enable_gtt())

	    return -EIO;



	intel_private.clear_fake_agp = true;

	agp_bridge->gart_bus_addr = intel_private.gma_bus_addr;



	for (i = 0; i < intel_private.base.gtt_total_entries; i++) {

		intel_private.driver->write_entry(intel_private.scratch_page_dma,

						  i, 0);

	}

	readl(intel_private.gtt+i-1);	/* PCI Posting. */



	global_cache_flush();



	return 0;

}
@@ -945,6 +937,13 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem, 
{

	int ret = -EINVAL;



	if (intel_private.clear_fake_agp) {

		int start = intel_private.base.stolen_size / PAGE_SIZE;

		int end = intel_private.base.gtt_mappable_entries;

		intel_gtt_clear_range(start, end - start);

		intel_private.clear_fake_agp = false;

	}



	if (INTEL_GTT_GEN == 1 && type == AGP_DCACHE_MEMORY)

		return i810_insert_dcache_entries(mem, pg_start, type);

drivers/gpu/drm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -100,7 +100,10 @@ config DRM_I830 
config DRM_I915

	tristate "i915 driver"

	depends on AGP_INTEL

	# we need shmfs for the swappable backing store, and in particular

	# the shmem_readpage() which depends upon tmpfs

	select SHMEM

	select TMPFS

	select DRM_KMS_HELPER

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

drivers/gpu/drm/i915/i915_dma.c

+15 −20
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) 
{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;

	struct intel_ring_buffer *ring = LP_RING(dev_priv);

	int ret;



	master_priv->sarea = drm_getsarea(dev);

	if (master_priv->sarea) {
@@ -163,33 +163,22 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) 
	}



	if (init->ring_size != 0) {

		if (ring->obj != NULL) {

		if (LP_RING(dev_priv)->obj != NULL) {

			i915_dma_cleanup(dev);

			DRM_ERROR("Client tried to initialize ringbuffer in "

				  "GEM mode\n");

			return -EINVAL;

		}



		ring->size = init->ring_size;



		ring->map.offset = init->ring_start;

		ring->map.size = init->ring_size;

		ring->map.type = 0;

		ring->map.flags = 0;

		ring->map.mtrr = 0;



		drm_core_ioremap_wc(&ring->map, dev);



		if (ring->map.handle == NULL) {

		ret = intel_render_ring_init_dri(dev,

						 init->ring_start,

						 init->ring_size);

		if (ret) {

			i915_dma_cleanup(dev);

			DRM_ERROR("can not ioremap virtual address for"

				  " ring buffer\n");

			return -ENOMEM;

			return ret;

		}

	}



	ring->virtual_start = ring->map.handle;



	dev_priv->cpp = init->cpp;

	dev_priv->back_offset = init->back_offset;

	dev_priv->front_offset = init->front_offset;
@@ -1226,9 +1215,15 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	if (ret)

		DRM_INFO("failed to find VBIOS tables\n");



	/* if we have > 1 VGA cards, then disable the radeon VGA resources */

	/* If we have > 1 VGA cards, then we need to arbitrate access

	 * to the common VGA resources.

	 *

	 * If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA),

	 * then we do not take part in VGA arbitration and the

	 * vga_client_register() fails with -ENODEV.

	 */

	ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);

	if (ret)

	if (ret && ret != -ENODEV)

		goto cleanup_ringbuffer;



	intel_register_dsm_handler();

drivers/gpu/drm/i915/i915_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ extern int intel_agp_enabled; 


#define INTEL_VGA_DEVICE(id, info) {		\

	.class = PCI_CLASS_DISPLAY_VGA << 8,	\

	.class_mask = 0xffff00,			\

	.class_mask = 0xff0000,			\

	.vendor = 0x8086,			\

	.device = id,				\

	.subvendor = PCI_ANY_ID,		\
@@ -752,6 +752,9 @@ static int __init i915_init(void) 
		driver.driver_features &= ~DRIVER_MODESET;

#endif



	if (!(driver.driver_features & DRIVER_MODESET))

		driver.get_vblank_timestamp = NULL;



	return drm_init(&driver);

}

drivers/gpu/drm/i915/i915_drv.h

+4 −1
Original line number Diff line number Diff line
@@ -543,8 +543,11 @@ typedef struct drm_i915_private { 
		/** List of all objects in gtt_space. Used to restore gtt

		 * mappings on resume */

		struct list_head gtt_list;

		/** End of mappable part of GTT */



		/** Usable portion of the GTT for GEM */

		unsigned long gtt_start;

		unsigned long gtt_mappable_end;

		unsigned long gtt_end;



		struct io_mapping *gtt_mapping;

		int gtt_mtrr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE