Commit ff747330 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/i915: select framebuffer support automatically
  drm/i915: add get_vblank_counter function for GM45
  drm/i915: capture last_vblank count at IRQ uninstall time too
  drm/i915: Unlock mutex on i915_gem_fault() error path
  drm/i915: Quiet the message on get/setparam ioctl with an unknown value.
  drm/i915: skip LVDS initialization on Apple Mac Mini
  drm/i915: sync SDVO code with stable userland modesetting driver
  drm/i915: Unref the object after failing to set tiling mode.
  drm/i915: add fence register management to execbuf
  drm/i915: Return error from i915_gem_object_get_fence_reg() when failing.
  drm/i915: Set up an MTRR covering the GTT at driver load.
  drm/i915: Skip SDVO/HDMI init when the chipset tells us it's not present.
  drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
  drm/radeon: fix ioremap conflict with AGP mappings
  i915: fix unneeded locking in i915 LVDS get modes code.
parents d7c41b61 d2f59357

drivers/gpu/drm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ config DRM_I915 
	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	depends on FB

	select FB

	tristate "i915 driver"

	help

	  Choose this option if you have a system that has Intel 830M, 845G,

drivers/gpu/drm/drm_irq.c

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ int drm_irq_uninstall(struct drm_device * dev) 
	for (i = 0; i < dev->num_crtcs; i++) {

		DRM_WAKEUP(&dev->vbl_queue[i]);

		dev->vblank_enabled[i] = 0;

		dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);

	}

	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);

drivers/gpu/drm/drm_memory.c

+6 −1
Original line number Diff line number Diff line
@@ -171,9 +171,14 @@ EXPORT_SYMBOL(drm_core_ioremap); 


void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev)

{

	if (drm_core_has_AGP(dev) &&

	    dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)

		map->handle = agp_remap(map->offset, map->size, dev);

	else

		map->handle = ioremap_wc(map->offset, map->size);

}

EXPORT_SYMBOL(drm_core_ioremap_wc);



void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev)

{

	if (!map->handle || !map->size)

drivers/gpu/drm/i915/i915_dma.c

+40 −7
Original line number Diff line number Diff line
@@ -731,8 +731,11 @@ static int i915_getparam(struct drm_device *dev, void *data, 
	case I915_PARAM_HAS_GEM:

		value = dev_priv->has_gem;

		break;

	case I915_PARAM_NUM_FENCES_AVAIL:

		value = dev_priv->num_fence_regs - dev_priv->fence_reg_start;

		break;

	default:

		DRM_ERROR("Unknown parameter %d\n", param->param);

		DRM_DEBUG("Unknown parameter %d\n", param->param);

		return -EINVAL;

	}
@@ -764,8 +767,15 @@ static int i915_setparam(struct drm_device *dev, void *data, 
	case I915_SETPARAM_ALLOW_BATCHBUFFER:

		dev_priv->allow_batchbuffer = param->value;

		break;

	case I915_SETPARAM_NUM_USED_FENCES:

		if (param->value > dev_priv->num_fence_regs ||

		    param->value < 0)

			return -EINVAL;

		/* Userspace can use first N regs */

		dev_priv->fence_reg_start = param->value;

		break;

	default:

		DRM_ERROR("unknown parameter %d\n", param->param);

		DRM_DEBUG("unknown parameter %d\n", param->param);

		return -EINVAL;

	}
@@ -966,10 +976,6 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	if (ret)

		goto kfree_devname;



        dev_priv->mm.gtt_mapping =

		io_mapping_create_wc(dev->agp->base,

				     dev->agp->agp_info.aper_size * 1024*1024);



	/* Allow hardware batchbuffers unless told otherwise.

	 */

	dev_priv->allow_batchbuffer = 1;
@@ -1081,6 +1087,23 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		goto free_priv;

	}



        dev_priv->mm.gtt_mapping =

		io_mapping_create_wc(dev->agp->base,

				     dev->agp->agp_info.aper_size * 1024*1024);

	/* Set up a WC MTRR for non-PAT systems.  This is more common than

	 * one would think, because the kernel disables PAT on first

	 * generation Core chips because WC PAT gets overridden by a UC

	 * MTRR if present.  Even if a UC MTRR isn't present.

	 */

	dev_priv->mm.gtt_mtrr = mtrr_add(dev->agp->base,

					 dev->agp->agp_info.aper_size *

					 1024 * 1024,

					 MTRR_TYPE_WRCOMB, 1);

	if (dev_priv->mm.gtt_mtrr < 0) {

		DRM_INFO("MTRR allocation failed\n.  Graphics "

			 "performance may suffer.\n");

	}



#ifdef CONFIG_HIGHMEM64G

	/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */

	dev_priv->has_gem = 0;
@@ -1089,6 +1112,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	dev_priv->has_gem = 1;

#endif



	dev->driver->get_vblank_counter = i915_get_vblank_counter;

	if (IS_GM45(dev))

		dev->driver->get_vblank_counter = gm45_get_vblank_counter;



	i915_gem_load(dev);



	/* Init HWS */
@@ -1145,8 +1172,14 @@ int i915_driver_unload(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

	io_mapping_free(dev_priv->mm.gtt_mapping);

	if (dev_priv->mm.gtt_mtrr >= 0) {

		mtrr_del(dev_priv->mm.gtt_mtrr, dev->agp->base,

			 dev->agp->agp_info.aper_size * 1024 * 1024);

		dev_priv->mm.gtt_mtrr = -1;

	}



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		drm_irq_uninstall(dev);

	}

drivers/gpu/drm/i915/i915_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static struct drm_driver driver = { 
	.suspend = i915_suspend,

	.resume = i915_resume,

	.device_is_agp = i915_driver_device_is_agp,

	.get_vblank_counter = i915_get_vblank_counter,

	.enable_vblank = i915_enable_vblank,

	.disable_vblank = i915_disable_vblank,

	.irq_preinstall = i915_driver_irq_preinstall,

CRA Git | Maintained and supported by SUSTech CRA and CCSE