]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "drm/i915: Use crtc_state->active in primary check_plane func"
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Jul 2015 22:00:20 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Jul 2015 22:00:20 +0000 (15:00 -0700)
commit01d209ab2a2f5a5f1af52c99dadfb14f593a9252
tree87d0a8b5992eda258ccf13d8080504188165446d
parentabe98ca34af2901ca1cf32e2ec07ad9551b4b81f
Revert "drm/i915: Use crtc_state->active in primary check_plane func"

This reverts commit 7e9d18f87ef624419eff5ed89d77a256e47eaa45.

Jörg Otte reports a NULL pointder dereference due to this commit, as
'crtc_state' very much can be NULL:

        crtc_state = state->base.state ?
                intel_atomic_get_crtc_state(state->base.state, intel_crtc) : NULL;

So the change to test 'crtc_state->base.active' cannot possibly be
correct as-is.

There may be some other minimal fix (like just checking crtc_state for
NULL), but I'm just reverting it now for the rc2 release, and people
like Daniel Vetter who actually know this code will figure out what the
right solution is in the longer term.

Reported-and-bisected-by: Jörg Otte <jrg.otte@gmail.com>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
CC: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/gpu/drm/i915/intel_display.c