Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* Fixes that failed to apply to v5.3-rc2
@ 2019-07-29 13:08 Jani Nikula
  2019-08-13  8:06 ` Jani Nikula
  0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2019-07-29 13:08 UTC (permalink / raw)
  To: intel-gfx


The following commits have been marked as Cc: stable or fixing something
in v5.3-rc2 or earlier, but failed to cherry-pick to
drm-intel-fixes. Please see if they are worth backporting, and please do
so if they are.

Failed to cherry-pick:
18398904ca9e ("drm/i915: Only recover active engines")
092be382a260 ("drm/i915: Lift intel_engines_resume() to callers")
fff8102aaed5 ("drm/i915/execlists: Process interrupted context on reset")
6c2b0103ad92 ("drm/i915: Fix and improve MCR selection logic")

Cherry-pick fine but fail to build (*):
2a8db563311a ("drm/i915: Use maximum write flush for pwrite_gtt")


BR,
Jani.


(*)

drivers/gpu/drm/i915/i915_gem.c: In function ‘i915_gem_gtt_pwrite_fast’:
drivers/gpu/drm/i915/i915_gem.c:653:4: error: implicit declaration of function ‘intel_gt_flush_ggtt_writes’; did you mean ‘i915_gem_flush_ggtt_writes’? [-Werror=implicit-function-declaration]
    intel_gt_flush_ggtt_writes(ggtt->vm.gt);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~
    i915_gem_flush_ggtt_writes
drivers/gpu/drm/i915/i915_gem.c:653:39: error: ‘struct i915_address_space’ has no member named ‘gt’
    intel_gt_flush_ggtt_writes(ggtt->vm.gt);
                                       ^
drivers/gpu/drm/i915/i915_gem.c:682:37: error: ‘struct i915_address_space’ has no member named ‘gt’
  intel_gt_flush_ggtt_writes(ggtt->vm.gt);
                                     ^


-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Fixes that failed to apply to v5.3-rc2
  2019-07-29 13:08 Fixes that failed to apply to v5.3-rc2 Jani Nikula
@ 2019-08-13  8:06 ` Jani Nikula
  2019-08-13  8:14   ` Chris Wilson
  0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2019-08-13  8:06 UTC (permalink / raw)
  To: intel-gfx

On Mon, 29 Jul 2019, Jani Nikula <jani.nikula@intel.com> wrote:
> The following commits have been marked as Cc: stable or fixing something
> in v5.3-rc2 or earlier, but failed to cherry-pick to
> drm-intel-fixes. Please see if they are worth backporting, and please do
> so if they are.
>
> Failed to cherry-pick:
> 18398904ca9e ("drm/i915: Only recover active engines")
> 092be382a260 ("drm/i915: Lift intel_engines_resume() to callers")

These have been backported and merged.

> fff8102aaed5 ("drm/i915/execlists: Process interrupted context on reset")
> 6c2b0103ad92 ("drm/i915: Fix and improve MCR selection logic")

These are still open.

This is a new one:

d8af05ff38ae ("drm/i915: Allow sharing the idle-barrier from other kernel requests")

> Cherry-pick fine but fail to build (*):
> 2a8db563311a ("drm/i915: Use maximum write flush for pwrite_gtt")

This is a new one:

576f05865581 ("drm/i915: Flush extra hard after writing relocations through the GTT")

>
>
> BR,
> Jani.
>
>
> (*)
>
> drivers/gpu/drm/i915/i915_gem.c: In function ‘i915_gem_gtt_pwrite_fast’:
> drivers/gpu/drm/i915/i915_gem.c:653:4: error: implicit declaration of function ‘intel_gt_flush_ggtt_writes’; did you mean ‘i915_gem_flush_ggtt_writes’? [-Werror=implicit-function-declaration]
>     intel_gt_flush_ggtt_writes(ggtt->vm.gt);
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~
>     i915_gem_flush_ggtt_writes
> drivers/gpu/drm/i915/i915_gem.c:653:39: error: ‘struct i915_address_space’ has no member named ‘gt’
>     intel_gt_flush_ggtt_writes(ggtt->vm.gt);
>                                        ^
> drivers/gpu/drm/i915/i915_gem.c:682:37: error: ‘struct i915_address_space’ has no member named ‘gt’
>   intel_gt_flush_ggtt_writes(ggtt->vm.gt);
>                                      ^

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Fixes that failed to apply to v5.3-rc2
  2019-08-13  8:06 ` Jani Nikula
@ 2019-08-13  8:14   ` Chris Wilson
  0 siblings, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2019-08-13  8:14 UTC (permalink / raw)
  To: Jani Nikula, intel-gfx

Quoting Jani Nikula (2019-08-13 09:06:45)
> This is a new one:
> 
> d8af05ff38ae ("drm/i915: Allow sharing the idle-barrier from other kernel requests")

That requires a slew of dependencies.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-08-13  8:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-29 13:08 Fixes that failed to apply to v5.3-rc2 Jani Nikula
2019-08-13  8:06 ` Jani Nikula
2019-08-13  8:14   ` Chris Wilson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox