Commit 5bea1c8c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2021-08-26' of... 

Merge tag 'drm-intel-next-fixes-2021-08-26' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

drm/i915 fixes for v5.15-rc1:
- Disable underrun recovery with eDP MSO panels on ADL-P
- Use designated initializers for init/exit table
- Fix some error pointer usages

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87r1egd1cg.fsf@intel.com
parents 7d8eb202 fb43ebc8

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

+3 −0
Original line number Diff line number Diff line
@@ -2226,6 +2226,9 @@ static bool underrun_recovery_supported(const struct intel_crtc_state *crtc_stat 
	if (crtc_state->has_psr2)

		return false;



	if (crtc_state->splitter.enable)

		return false;



	return true;

}

drivers/gpu/drm/i915/gt/intel_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static struct intel_context *pinned_context(struct intel_gt *gt) 
	ce = intel_engine_create_pinned_context(engine, vm, SZ_512K,

						I915_GEM_HWS_MIGRATE,

						&key, "migrate");

	i915_vm_put(ce->vm);

	i915_vm_put(vm);

	return ce;

}

drivers/gpu/drm/i915/gt/selftest_hangcheck.c

+2 −2
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int igt_reset_nop_engine(void *arg) 


		ce = intel_context_create(engine);

		if (IS_ERR(ce)) {

			pr_err("[%s] Create context failed: %d!\n", engine->name, err);

			pr_err("[%s] Create context failed: %pe!\n", engine->name, ce);

			return PTR_ERR(ce);

		}
@@ -577,7 +577,7 @@ static int igt_reset_fail_engine(void *arg) 


		ce = intel_context_create(engine);

		if (IS_ERR(ce)) {

			pr_err("[%s] Create context failed: %d!\n", engine->name, err);

			pr_err("[%s] Create context failed: %pe!\n", engine->name, ce);

			return PTR_ERR(ce);

		}

drivers/gpu/drm/i915/i915_module.c

+24 −13
Original line number Diff line number Diff line
@@ -47,19 +47,30 @@ static const struct { 
   int (*init)(void);

   void (*exit)(void);

} init_funcs[] = {

	{ i915_check_nomodeset, NULL },

	{ i915_active_module_init, i915_active_module_exit },

	{ i915_buddy_module_init, i915_buddy_module_exit },

	{ i915_context_module_init, i915_context_module_exit },

	{ i915_gem_context_module_init, i915_gem_context_module_exit },

	{ i915_objects_module_init, i915_objects_module_exit },

	{ i915_request_module_init, i915_request_module_exit },

	{ i915_scheduler_module_init, i915_scheduler_module_exit },

	{ i915_vma_module_init, i915_vma_module_exit },

	{ i915_mock_selftests, NULL },

	{ i915_pmu_init, i915_pmu_exit },

	{ i915_register_pci_driver, i915_unregister_pci_driver },

	{ i915_perf_sysctl_register, i915_perf_sysctl_unregister },

	{ .init = i915_check_nomodeset },

	{ .init = i915_active_module_init,

	  .exit = i915_active_module_exit },

	{ .init = i915_buddy_module_init,

	  .exit = i915_buddy_module_exit },

	{ .init = i915_context_module_init,

	  .exit = i915_context_module_exit },

	{ .init = i915_gem_context_module_init,

	  .exit = i915_gem_context_module_exit },

	{ .init = i915_objects_module_init,

	  .exit = i915_objects_module_exit },

	{ .init = i915_request_module_init,

	  .exit = i915_request_module_exit },

	{ .init = i915_scheduler_module_init,

	  .exit = i915_scheduler_module_exit },

	{ .init = i915_vma_module_init,

	  .exit = i915_vma_module_exit },

	{ .init = i915_mock_selftests },

	{ .init = i915_pmu_init,

	  .exit = i915_pmu_exit },

	{ .init = i915_register_pci_driver,

	  .exit = i915_unregister_pci_driver },

	{ .init = i915_perf_sysctl_register,

	  .exit = i915_perf_sysctl_unregister },

};

static int init_progress;