APPLIED/cmt: [PATCH 0/3] [SRU][Bionic] drm/i915: Fix softpin on 32bit

[Khaled Elmously]

Applied to Bionic. 

Timo, note that there was a conflict with patch 2/3.

The first chunk of delta in drivers/gpu/drm/i915/gvt/cmd_parser.c expects the line:



if (guest_gma >= GTT_PAGE_SIZE / sizeof(u64)) {



but in bionic/master-next, that line is actually:


if (guest_gma >= GTT_PAGE_SIZE) {




I went ahead and replaced the line anyway with:
 

if (guest_gma >= I915_GTT_PAGE_SIZE / sizeof(u64)) {



Khaled



On 2019-08-06 22:00:18 , Timo Aaltonen wrote:
> BugLink: https://bugs.launchpad.net/bugs/1815172
> 
> We've been carrying a commit reverting softpin support from mesa in bionic,
> because softpin support was broken on 4.15 and 4.18. The patches to fix it
> were sent to stable@ but not all of them got applied to 4.15.x because there
> were minor conflicts. The patch for drm/i915/gvt was added to make the other
> one cherry-pick cleanly.
> 
> The reason to get these backported is so that we can drop the revert from
> mesa, because it actually broke Ice Lake which apparently requires softpin
> support in the DRI driver.
> 
> Chris Wilson (2):
>   drm/i915: Mark up GTT sizes as u64
>   drm/i915: Compare user's 64b GTT offset even on 32b
> 
> Zhi Wang (1):
>   drm/i915/gvt: Use I915_GTT_PAGE_SIZE
> 
>  drivers/gpu/drm/i915/gvt/cmd_parser.c         | 13 ++---
>  drivers/gpu/drm/i915/gvt/execlist.c           |  2 +-
>  drivers/gpu/drm/i915/gvt/gtt.c                | 51 ++++++++++---------
>  drivers/gpu/drm/i915/gvt/gtt.h                |  6 +--
>  drivers/gpu/drm/i915/gvt/reg.h                |  3 +-
>  drivers/gpu/drm/i915/gvt/scheduler.c          | 12 ++---
>  drivers/gpu/drm/i915/i915_gem_execbuffer.c    |  2 +-
>  drivers/gpu/drm/i915/i915_gem_gtt.c           |  2 +-
>  drivers/gpu/drm/i915/i915_gem_gtt.h           |  8 +--
>  drivers/gpu/drm/i915/selftests/huge_pages.c   |  2 +-
>  drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |  6 +--
>  11 files changed, 55 insertions(+), 52 deletions(-)
> 
> -- 
> 2.17.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team