[PULL] drm-intel-fixes

Pull-request

git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2020-01-16

Message

Joonas Lahtinen Jan. 16, 2020, 4:14 p.m. UTC

Hi Dave & Daniel,

Two new fixes still, the VMA activity fixes are overflow from
last week as I couldn't get CI results then.

One important uAPI fix for PMU names to comply with tools/perf,
thanks for our media team for noticing. A compile fix and two
VMA activity tracking fixes for error capture and a dependency.

Regards, Joonas

PS. There were quite a few conflicts due to the renames,
when applying.

***

drm-intel-fixes-2020-01-16:

- uAPI fix: Remove dash and colon from PMU names to comply with tools/perf
- Fix for include file that was indirectly included
- Two fixes to make sure VMA are marked active for error capture

The following changes since commit b3a987b0264d3ddbb24293ebff10eddfc472f653:

  Linux 5.5-rc6 (2020-01-12 16:55:08 -0800)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2020-01-16

for you to fetch changes up to 88550e1c345c6d3f70292fa60d481eb320e11953:

  drm/i915/pmu: Do not use colons or dashes in PMU names (2020-01-14 08:56:58 +0200)

----------------------------------------------------------------
- uAPI fix: Remove dash and colon from PMU names to comply with tools/perf
- Fix for include file that was indirectly included
- Two fixes to make sure VMA are marked active for error capture

----------------------------------------------------------------
Chris Wilson (3):
      drm/i915/gt: Skip trying to unbind in restore_ggtt_mappings
      drm/i915/gt: Mark context->state vma as active while pinned
      drm/i915/gt: Mark ring->vma as active while pinned

Tvrtko Ursulin (1):
      drm/i915/pmu: Do not use colons or dashes in PMU names

YueHaibing (1):
      drm/i915: Add missing include file <linux/math64.h>

 drivers/gpu/drm/i915/gt/intel_context.c      | 40 +++++++++++++++++++++++++---
 drivers/gpu/drm/i915/i915_gem_gtt.c          |  7 ++---
 drivers/gpu/drm/i915/i915_pmu.c              | 11 +++++---
 drivers/gpu/drm/i915/selftests/i915_random.h |  1 +
 4 files changed, 48 insertions(+), 11 deletions(-)