diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-24 13:54:50 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-24 13:54:50 +0200 |
| commit | f452cbd326dfa57c6f4ca8bc37879bf189f29cff (patch) | |
| tree | 830e766a9296497ade2d35da6a7836d0860622c4 /drivers/gpu/drm/i915/display/intel_display.c | |
| parent | 70102d77ff22dd88a0111b1c3bac5099ac5d0425 (diff) | |
| parent | 289af45508ca890585f329376d16e08f41f75bd5 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get the exynos fbdev updates.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 010ee793e1ff..3c29792137a5 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -959,7 +959,7 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state, num_encoders++; } - drm_WARN(encoder->base.dev, num_encoders != 1, + drm_WARN(state->base.dev, num_encoders != 1, "%d encoders for pipe %c\n", num_encoders, pipe_name(master_crtc->pipe)); |