linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2019-11-13T00:58:14Z

[-- Attachment #1: Type: text/plain, Size: 1929 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

drivers/gpu/drm/i915/i915_drv.c

between commits:

7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA")
2f216a850715 ("drm/i915: update rawclk also on resume")

from Linus' tree and commits:

5bcd53aa39f3 ("drm/i915: pass i915 to i915_driver_modeset_probe()")
fd6fe087ca47 ("drm/i915/gt: Call intel_gt_sanitize() directly")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/i915_drv.c
index 3d717e282908,ccb5b566795f..000000000000
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -364,11 -296,14 +296,11 @@@ static int i915_driver_modeset_probe(st
if (ret)
goto cleanup_vga_client;

- intel_power_domains_init_hw(dev_priv, false);
- /* must happen before intel_power_domains_init_hw() on VLV/CHV */
- intel_update_rawclk(i915);
-
+ intel_power_domains_init_hw(i915, false);

- intel_csr_ucode_init(dev_priv);
+ intel_csr_ucode_init(i915);

- ret = intel_irq_install(dev_priv);
+ ret = intel_irq_install(i915);
if (ret)
goto cleanup_csr;

@@@ -2048,14 -1948,8 +1947,10 @@@ static int i915_drm_resume_early(struc

intel_display_power_resume_early(dev_priv);

- intel_sanitize_gt_powersave(dev_priv);
-
intel_power_domains_resume(dev_priv);

+ i915_rc6_ctx_wa_resume(dev_priv);
+
- intel_gt_sanitize(&dev_priv->gt, true);
-
enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);

return ret;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]