diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-22 23:22:22 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-22 23:22:22 +0100 |
| commit | 2e33054e4429339c24f88f9aab91991d85174698 (patch) | |
| tree | 5a825962849f6749da8d29dfdbbb6a5faebd02fb | |
| parent | Merge branch 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux... (diff) | |
| parent | drm/atomic: fix potential null ptr on plane enable (diff) | |
| download | linux-2e33054e4429339c24f88f9aab91991d85174698.tar.xz linux-2e33054e4429339c24f88f9aab91991d85174698.zip | |
Merge tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Yeah a pull for one patch is a bit overkill but I started to assemble the
various patches for 3.20 in a branch for atomic props/ioctl and didn't
realize that this bugfix here at the beginnning of the branch should be in
3.19 (because msm is using the helpers arleady). So if you'd merge we'd
have it twice or or I need to shuffle branches again. Can do if you want.
* tag 'topic/atomic-fixes-2014-12-17' of git://anongit.freedesktop.org/drm-intel:
drm/atomic: fix potential null ptr on plane enable
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 4a78a773151c..bbdbe4721573 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -61,7 +61,7 @@ drm_atomic_helper_plane_changed(struct drm_atomic_state *state, struct drm_crtc_state *crtc_state; if (plane->state->crtc) { - crtc_state = state->crtc_states[drm_crtc_index(plane->crtc)]; + crtc_state = state->crtc_states[drm_crtc_index(plane->state->crtc)]; if (WARN_ON(!crtc_state)) return; |