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

Commit f5c98a40 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: (23 commits)
  drm/radeon: don't poll tv dac if crtc2 is in use.
  drm/radeon: reset i2c valid to avoid incorrect tv-out polling.
  drm/nv50: fix iommu errors caused by device reading from address 0
  drm/nouveau: off by one in init_i2c_device_find()
  nouveau: off by one in nv50_gpio_location()
  drm/nouveau: completely fail init if we fail to map the PRAMIN BAR
  drm/nouveau: match U/DP script against SOR link
  drm/radeon/kms/pm: resurrect printing power states
  drm/radeon/kms: add trivial debugging for voltage
  drm/radeon/kms/r600+: use voltage from requested clock mode (v3)
  drm/radeon/kms/pm: track current voltage (v2)
  drm/radeon/kms/pm: Disable voltage adjust on RS780/RS880
  drm/radeon/kms: fix typo in printing the HPD info
  drm/radeon/kms/pm: add mid profile
  drm/radeon/kms/pm: Misc fixes
  drm/radeon/kms/combios: fix typo in voltage fix
  drm/radeon/kms/evergreen: set accel_enabled
  drm/vmwgfx: return -EFAULT for copy_to_user errors
  drm/drm_crtc: return -EFAULT on copy_to_user errors
  drm/fb: use printk to print out the switching to text mode error.
  ...
parents fbe33a7c b62e948f

drivers/gpu/drm/drm_crtc.c

+3 −1
Original line number Diff line number Diff line
@@ -1840,9 +1840,11 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, 


		ret = copy_from_user(clips, clips_ptr,

				     num_clips * sizeof(*clips));

		if (ret)

		if (ret) {

			ret = -EFAULT;

			goto out_err2;

		}

	}



	if (fb->funcs->dirty) {

		ret = fb->funcs->dirty(fb, flags, r->color, clips, num_clips);

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ bool drm_fb_helper_force_kernel_mode(void) 
int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed,

			void *panic_str)

{

	DRM_ERROR("panic occurred, switching back to text console\n");

	printk(KERN_ERR "panic occurred, switching back to text console\n");

	return drm_fb_helper_force_kernel_mode();

	return 0;

}

drivers/gpu/drm/i915/i915_dma.c

+14 −5
Original line number Diff line number Diff line
@@ -1402,19 +1402,19 @@ static int i915_load_modeset_init(struct drm_device *dev, 
	/* if we have > 1 VGA cards, then disable the radeon VGA resources */

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

	if (ret)

		goto destroy_ringbuffer;

		goto cleanup_ringbuffer;



	ret = vga_switcheroo_register_client(dev->pdev,

					     i915_switcheroo_set_state,

					     i915_switcheroo_can_switch);

	if (ret)

		goto destroy_ringbuffer;

		goto cleanup_vga_client;



	intel_modeset_init(dev);



	ret = drm_irq_install(dev);

	if (ret)

		goto destroy_ringbuffer;

		goto cleanup_vga_switcheroo;



	/* Always safe in the mode setting case. */

	/* FIXME: do pre/post-mode set stuff in core KMS code */
@@ -1426,11 +1426,20 @@ static int i915_load_modeset_init(struct drm_device *dev, 


	I915_WRITE(INSTPM, (1 << 5) | (1 << 21));



	intel_fbdev_init(dev);

	ret = intel_fbdev_init(dev);

	if (ret)

		goto cleanup_irq;



	drm_kms_helper_poll_init(dev);

	return 0;



destroy_ringbuffer:

cleanup_irq:

	drm_irq_uninstall(dev);

cleanup_vga_switcheroo:

	vga_switcheroo_unregister_client(dev->pdev);

cleanup_vga_client:

	vga_client_register(dev->pdev, NULL, NULL, NULL);

cleanup_ringbuffer:

	mutex_lock(&dev->struct_mutex);

	i915_gem_cleanup_ringbuffer(dev);

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ typedef struct drm_i915_private { 
	struct mem_block *agp_heap;

	unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;

	int vblank_pipe;

	int num_pipe;



	/* For hangcheck timer */

#define DRM_I915_HANGCHECK_PERIOD 75 /* in jiffies */

drivers/gpu/drm/i915/intel_display.c

+4 −5
Original line number Diff line number Diff line
@@ -5470,7 +5470,6 @@ static void intel_init_display(struct drm_device *dev) 
void intel_modeset_init(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int num_pipe;

	int i;



	drm_mode_config_init(dev);
@@ -5500,13 +5499,13 @@ void intel_modeset_init(struct drm_device *dev) 
		dev->mode_config.fb_base = pci_resource_start(dev->pdev, 0);



	if (IS_MOBILE(dev) || IS_I9XX(dev))

		num_pipe = 2;

		dev_priv->num_pipe = 2;

	else

		num_pipe = 1;

		dev_priv->num_pipe = 1;

	DRM_DEBUG_KMS("%d display pipe%s available.\n",

		  num_pipe, num_pipe > 1 ? "s" : "");

		      dev_priv->num_pipe, dev_priv->num_pipe > 1 ? "s" : "");



	for (i = 0; i < num_pipe; i++) {

	for (i = 0; i < dev_priv->num_pipe; i++) {

		intel_crtc_init(dev, i);

	}