[PATCH 1/2] WIP: drm/i915/display: Set modeset context to state before run intel_atomic_check()

José Roberto de Souza jose.souza at intel.com
Sat Feb 8 02:25:38 UTC 2020


drm_atomic_helper_duplicate_state() sets and unset context to state,
the lack of context could cause warnings and null-pointer exceptions
during the atomic checks.

Closes: https://gitlab.freedesktop.org/drm/intel/issues/1151
Cc: Ross Zwisler <zwisler at google.com>
Cc: Jani Nikula <jani.nikula at intel.com>
Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 80eebdc4c670..df616afd533a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17717,6 +17717,7 @@ static void sanitize_watermarks(struct drm_i915_private *dev_priv)
 		return;
 
 	intel_state = to_intel_atomic_state(state);
+	state->acquire_ctx = &ctx;
 
 	drm_modeset_acquire_init(&ctx, 0);
 
-- 
2.25.0



More information about the Intel-gfx-trybot mailing list