Re: [PATCH] drm/i915/ilk: special case enabling of PCU_EVENT interrupt

[Oliver Hartkopp <socketcan@hartkopp.net>]

On 26.08.2014 22:51, Daniel Vetter wrote:
> 

> 
> Oliver, can you please test the below diff?
> 

> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index f19dbff0e73b..915a60b48159 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1336,12 +1336,17 @@ static int i915_load_modeset_init(struct drm_device *dev)
>  
>  	intel_power_domains_init_hw(dev_priv);
>  
> +	/*
> +	 * We enable some interrupt sources in our postinstall hooks, so mark
> +	 * interrupts as enabled _before_ actually enabling them to avoid
> +	 * special cases in our ordering checks.
> +	 */
> +	dev_priv->pm._irqs_disabled = false;
> +
>  	ret = drm_irq_install(dev, dev->pdev->irq);
>  	if (ret)
>  		goto cleanup_gem_stolen;
>  
> -	dev_priv->pm._irqs_disabled = false;
> -
>  	/* Important: The output setup functions called by modeset_init need
>  	 * working irqs for e.g. gmbus and dp aux transfers. */
>  	intel_modeset_init(dev);
> 

Yes - that one works too! (see below)

Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>

Thanks,
Oliver


[    2.894351] Linux agpgart interface v0.103
[    2.894680] agpgart-intel 0000:00:00.0: Intel HD Graphics Chipset
[    2.894783] agpgart-intel 0000:00:00.0: detected gtt size: 2097152K total, 262144K mappable
[    2.895558] agpgart-intel 0000:00:00.0: detected 32768K stolen memory
[    2.895986] agpgart-intel 0000:00:00.0: AGP aperture is 256M @ 0xe0000000
[    2.896248] [drm] Initialized drm 1.1.0 20060810
[    2.898458] [drm] Memory usable by graphics device = 2048M
[    2.898541] [drm] Replacing VGA console driver
[    2.899207] Console: switching to colour dummy device 80x25
[    2.931603] i915 0000:00:02.0: irq 24 for MSI/MSI-X
[    2.931615] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
[    2.931618] [drm] Driver supports precise vblank timestamp query.
[    2.931964] vgaarb: device changed decodes: PCI:0000:00:02.0,olddecodes=io+mem,decodes=io+mem:owns=io+mem
[    3.023215] fbcon: inteldrmfb (fb0) is primary device
[    3.484082] tsc: Refined TSC clocksource calibration: 2792.999 MHz
[    4.170441] [drm:intel_dp_start_link_train] *ERROR* too many full retries, give up
[    4.485295] Switched to clocksource tsc
[    4.533314] Console: switching to colour frame buffer device 240x67
[    4.550357] i915 0000:00:02.0: fb0: inteldrmfb frame buffer device
[    4.550446] i915 0000:00:02.0: registered panic notifier
[    4.561636] ACPI: Video Device [VID2] (multi-head: yes  rom: no  post: no)
[    4.913748] acpi device:45: registered as cooling_device0
[    4.941732] input: Video Bus as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/LNXVIDEO:02/input/input4
[    4.941822] [drm] Initialized i915 1.6.0 20140725 for 0000:00:02.0 on minor 0