[SRU][B][PATCH 0/2] fix implicit declaration of function 'intel_vgpu_in_aperture'

[Andrea Righi]

It looks like commit 638294e56494 ("drm/i915/gvt: Fix mmap range check")
in bionic (applied for CVE-2019-11085) introduced the following build
error:

 drivers/gpu/drm/i915/gvt/kvmgt.c:844:7: error: implicit declaration of function 'intel_vgpu_in_aperture'

To fix this error we need to backport two additional upstream commits:

 73ebd503034c ("drm/i915: make mappable struct resource centric")
 d480b28a41a6 ("drm/i915/gvt: Fix aperture read/write emulation when enable x-no-mmap=on")

NOTE: only build-tested on amd64, I haven't tried to boot the kernel and
test if the affected driver is actually working.

 drivers/gpu/drm/i915/gvt/cfg_space.c          | 15 +--------
 drivers/gpu/drm/i915/gvt/gvt.h                |  3 +-
 drivers/gpu/drm/i915/gvt/kvmgt.c              | 36 ++++++++++++++++++++--
 drivers/gpu/drm/i915/gvt/mmio.c               | 44 ---------------------------
 drivers/gpu/drm/i915/i915_drv.c               |  2 +-
 drivers/gpu/drm/i915/i915_gem.c               |  8 ++---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c    |  2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c           | 29 ++++++++++++------
 drivers/gpu/drm/i915/i915_gem_gtt.h           |  4 +--
 drivers/gpu/drm/i915/i915_gpu_error.c         |  2 +-
 drivers/gpu/drm/i915/i915_vma.c               |  2 +-
 drivers/gpu/drm/i915/intel_display.c          |  2 +-
 drivers/gpu/drm/i915/intel_overlay.c          |  4 +--
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |  4 +--
 drivers/gpu/drm/i915/selftests/mock_gtt.c     |  4 +--
 15 files changed, 72 insertions(+), 89 deletions(-)