Commit e170b030 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt
Browse files

drm/i915: Disable opregion on IGDNG for now 



Disable OpRegion support for now until verified on new chipsets.

Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent b9055052

drivers/gpu/drm/i915/i915_dma.c

+5 −2
Original line number Diff line number Diff line
@@ -1206,6 +1206,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	}



	/* Must be done after probing outputs */

	/* FIXME: verify on IGDNG */

	if (!IS_IGDNG(dev))

		intel_opregion_init(dev, 0);



	return 0;
@@ -1240,6 +1242,7 @@ int i915_driver_unload(struct drm_device *dev) 
	if (dev_priv->regs != NULL)

		iounmap(dev_priv->regs);



	if (!IS_IGDNG(dev))

		intel_opregion_free(dev, 0);



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

drivers/gpu/drm/i915/i915_irq.c

+3 −1
Original line number Diff line number Diff line
@@ -484,6 +484,8 @@ void i915_disable_vblank(struct drm_device *dev, int pipe) 
void i915_enable_interrupt (struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (!IS_IGDNG(dev))

		opregion_enable_asle(dev);

	dev_priv->irq_enabled = 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE