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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 13 Nov 2019 11:50:49 +1100

Hi all,

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

  drivers/gpu/drm/i915/gt/intel_gt_pm.c

between commit:

  7e34f4e4aad3 ("drm/i915/gen8+: Add RC6 CTX corruption WA")

from Linus' tree and commit:

  3e7abf814193 ("drm/i915: Extract GT render power state management")

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/gt/intel_gt_pm.c
index fac75afed35b,060a27d9af34..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@@ -38,20 -61,10 +61,13 @@@ static int __gt_unpark(struct intel_wak
  	gt->awake = intel_display_power_get(i915, POWER_DOMAIN_GT_IRQ);
  	GEM_BUG_ON(!gt->awake);
  
 +	if (NEEDS_RC6_CTX_CORRUPTION_WA(i915))
 +		intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);
 +
- 	intel_enable_gt_powersave(i915);
- 
- 	i915_update_gfx_val(i915);
- 	if (INTEL_GEN(i915) >= 6)
- 		gen6_rps_busy(i915);
- 
+ 	intel_rps_unpark(&gt->rps);
  	i915_pmu_gt_unparked(i915);
  
- 	intel_gt_queue_hangcheck(gt);
- 
- 	pm_notify(i915, INTEL_GT_UNPARK);
+ 	intel_gt_unpark_requests(gt);
  
  	return 0;
  }
@@@ -64,17 -77,12 +80,17 @@@ static int __gt_park(struct intel_waker
  
  	GEM_TRACE("\n");
  
- 	pm_notify(i915, INTEL_GT_PARK);
+ 	intel_gt_park_requests(gt);
  
+ 	i915_vma_parked(gt);
  	i915_pmu_gt_parked(i915);
- 	if (INTEL_GEN(i915) >= 6)
- 		gen6_rps_idle(i915);
+ 	intel_rps_park(&gt->rps);
  
 +	if (NEEDS_RC6_CTX_CORRUPTION_WA(i915)) {
 +		i915_rc6_ctx_wa_check(i915);
 +		intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL);
 +	}
 +
  	/* Everything switched off, flush any residual interrupt just in case */
  	intel_synchronize_irq(i915);