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

Commit 56a50add authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel 

* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: fix up error path leak in i915_cmdbuffer
  drm/i915: fix unpaired i915 device mutex on entervt failure.
  drm/i915: add support for G41 chipset
  drm/i915: Enable ASLE if present
  drm/i915: Unregister ACPI video driver when exiting
  drm/i915: Register ACPI video even when not modesetting
  drm/i915: fix transition to I915_TILING_NONE
  drm/i915: Don't let an oops get triggered from irq_emit without dma init.
  drm/i915: allow tiled front buffers on 965+
parents c2e2ceea 355d7f37

drivers/acpi/video.c

+2 −1
Original line number Diff line number Diff line
@@ -2296,7 +2296,7 @@ static int __init acpi_video_init(void) 
	return acpi_video_register();

}



static void __exit acpi_video_exit(void)

void __exit acpi_video_exit(void)

{



	acpi_bus_unregister_driver(&acpi_video_bus);
@@ -2305,6 +2305,7 @@ static void __exit acpi_video_exit(void) 


	return;

}

EXPORT_SYMBOL(acpi_video_exit);



module_init(acpi_video_init);

module_exit(acpi_video_exit);

drivers/gpu/drm/i915/i915_dma.c

+4 −4
Original line number Diff line number Diff line
@@ -713,18 +713,18 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, 
	mutex_unlock(&dev->struct_mutex);

	if (ret) {

		DRM_ERROR("i915_dispatch_cmdbuffer failed\n");

		goto fail_batch_free;

		goto fail_clip_free;

	}



	if (sarea_priv)

		sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);



fail_batch_free:

	drm_free(batch_data, cmdbuf->sz, DRM_MEM_DRIVER);

fail_clip_free:

	drm_free(cliprects,

		 cmdbuf->num_cliprects * sizeof(struct drm_clip_rect),

		 DRM_MEM_DRIVER);

fail_batch_free:

	drm_free(batch_data, cmdbuf->sz, DRM_MEM_DRIVER);



	return ret;

}
@@ -1232,7 +1232,7 @@ int i915_driver_unload(struct drm_device *dev) 
	if (dev_priv->regs != NULL)

		iounmap(dev_priv->regs);



	intel_opregion_free(dev);

	intel_opregion_free(dev, 0);



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		intel_modeset_cleanup(dev);

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state) 
		drm_irq_uninstall(dev);

	}



	intel_opregion_free(dev);

	intel_opregion_free(dev, 1);



	if (state.event == PM_EVENT_SUSPEND) {

		/* Shut down the device */

drivers/gpu/drm/i915/i915_drv.h

+5 −3
Original line number Diff line number Diff line
@@ -674,12 +674,12 @@ extern int i915_restore_state(struct drm_device *dev); 
#ifdef CONFIG_ACPI

/* i915_opregion.c */

extern int intel_opregion_init(struct drm_device *dev, int resume);

extern void intel_opregion_free(struct drm_device *dev);

extern void intel_opregion_free(struct drm_device *dev, int suspend);

extern void opregion_asle_intr(struct drm_device *dev);

extern void opregion_enable_asle(struct drm_device *dev);

#else

static inline int intel_opregion_init(struct drm_device *dev, int resume) { return 0; }

static inline void intel_opregion_free(struct drm_device *dev) { return; }

static inline void intel_opregion_free(struct drm_device *dev, int suspend) { return; }

static inline void opregion_asle_intr(struct drm_device *dev) { return; }

static inline void opregion_enable_asle(struct drm_device *dev) { return; }

#endif
@@ -787,7 +787,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); 
		       (dev)->pci_device == 0x2A42 || \

		       (dev)->pci_device == 0x2E02 || \

		       (dev)->pci_device == 0x2E12 || \

		       (dev)->pci_device == 0x2E22)

		       (dev)->pci_device == 0x2E22 || \

		       (dev)->pci_device == 0x2E32)



#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
@@ -796,6 +797,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); 
#define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \

		     (dev)->pci_device == 0x2E12 || \

		     (dev)->pci_device == 0x2E22 || \

		     (dev)->pci_device == 0x2E32 || \

		     IS_GM45(dev))



#define IS_IGDG(dev) ((dev)->pci_device == 0xa001)

drivers/gpu/drm/i915/i915_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -4087,8 +4087,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, 
	dev_priv->mm.suspended = 0;



	ret = i915_gem_init_ringbuffer(dev);

	if (ret != 0)

	if (ret != 0) {

		mutex_unlock(&dev->struct_mutex);

		return ret;

	}



	spin_lock(&dev_priv->mm.active_list_lock);

	BUG_ON(!list_empty(&dev_priv->mm.active_list));