Commit 211b4dbc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-gt-next-2021-12-09' of... 

Merge tag 'drm-intel-gt-next-2021-12-09' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

Core Changes:

- Fix PENDING_ERROR leak in dma_fence_array_signaled() (Thomas Hellström)

Driver Changes:

- Fix runtime PM handling during PXP suspend (Tejas Upadhyay)
- Improve eviction performance on discrete by implementing async TTM moves (Thomas Hellström, Maarten Lankhorst)
- Improve robustness of error capture under memory pressure (Thomas Hellström)
- Fix GuC PMU versus GPU reset handling (Umesh Nerlige Ramappa)
- Use per device iommu check (Tvrtko Ursulin)
- Make error capture work with async migration (Thomas Hellström)
- Revert incorrect implementation of Wa_1508744258 causing hangs (José Roberto de Souza)
- Disable coarse power gating on some DG2 steppings workaround (Matt Roper)
- Add IC cache invalidation workaround on DG2 (Ramalingam C)
- Move two Icelake workarounds to the right place (Raviteja Goud Talla)
- Fix error pointer dereference in i915_gem_do_execbuffer() (Dan Carpenter)
- Fixup a couple of generic and DG2 specific issues in migration code (Matthew Auld)

- Fix kernel-doc warnings in i915_drm_object.c (Randy Dunlap)
- Drop stealing of bits from i915_sw_fence function pointer (Matthew Brost)
- Introduce new macros for i915 PTE (Michael Cheng)
- Prep work for engine reset by reset domain lookup (Tejas Upadhyay)

- Fixup drm-intel-gt-next build failure (Matthew Auld)
- Fix live_engine_busy_stats selftests in GuC mode (Umesh Nerlige Ramappa)
- Remove dma_resv_prune (Maarten Lankhorst)
- Preserve huge pages enablement after driver reload (Matthew Auld)
- Fix a NULL pointer dereference in igt_request_rewind() (selftests) (Zhou Qingyang)
- Add workaround numbers to GEN7_COMMON_SLICE_CHICKEN1 whitelisting (José Roberto de Souza)
- Increase timeouts in i915_gem_contexts selftests to handle GuC being slower (Bruce Chang)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# Conflicts:
#	drivers/gpu/drm/i915/display/intel_fbc.c
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YbIBOeqhn+nPzaYD@tursulin-mobl2
parents 15bb7991 20cddfcc

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9496,6 +9496,7 @@ INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) 
M:	Jani Nikula <jani.nikula@linux.intel.com>

M:	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

M:	Rodrigo Vivi <rodrigo.vivi@intel.com>

M:	Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>

L:	intel-gfx@lists.freedesktop.org

S:	Supported

W:	https://01.org/linuxgraphics/

drivers/dma-buf/dma-fence-array.c

+5 −1
Original line number Diff line number Diff line
@@ -104,7 +104,11 @@ static bool dma_fence_array_signaled(struct dma_fence *fence) 
{

	struct dma_fence_array *array = to_dma_fence_array(fence);



	return atomic_read(&array->num_pending) <= 0;

	if (atomic_read(&array->num_pending) > 0)

		return false;



	dma_fence_array_clear_pending_error(array);

	return true;

}



static void dma_fence_array_release(struct dma_fence *fence)

drivers/gpu/drm/i915/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ gem-y += \ 
	gem/i915_gem_throttle.o \

	gem/i915_gem_tiling.o \

	gem/i915_gem_ttm.o \

	gem/i915_gem_ttm_move.o \

	gem/i915_gem_ttm_pm.o \

	gem/i915_gem_userptr.o \

	gem/i915_gem_wait.o \
@@ -172,6 +173,7 @@ i915-y += \ 
	  i915_trace_points.o \

	  i915_ttm_buddy_manager.o \

	  i915_vma.o \

	  i915_vma_snapshot.o \

	  intel_wopcm.o



# general-purpose microcontroller (GuC) support

drivers/gpu/drm/i915/display/intel_bw.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static unsigned int intel_bw_data_rate(struct drm_i915_private *dev_priv, 
	for_each_pipe(dev_priv, pipe)

		data_rate += bw_state->data_rate[pipe];



	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active())

	if (DISPLAY_VER(dev_priv) >= 13 && intel_vtd_active(dev_priv))

		data_rate = data_rate * 105 / 100;



	return data_rate;

drivers/gpu/drm/i915/display/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ static bool needs_async_flip_vtd_wa(const struct intel_crtc_state *crtc_state) 
{

	struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);



	return crtc_state->uapi.async_flip && intel_vtd_active() &&

	return crtc_state->uapi.async_flip && intel_vtd_active(i915) &&

		(DISPLAY_VER(i915) == 9 || IS_BROADWELL(i915) || IS_HASWELL(i915));

}
@@ -8815,7 +8815,7 @@ static void intel_atomic_commit_work(struct work_struct *work) 
	intel_atomic_commit_tail(state);

}



static int __i915_sw_fence_call

static int

intel_atomic_commit_ready(struct i915_sw_fence *fence,

			  enum i915_sw_fence_notify notify)

{