drm/nouveau: Fix merge commit
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 15 Aug 2017 08:52:50 +0000 (10:52 +0200)
committerDave Airlie <airlied@redhat.com>
Wed, 16 Aug 2017 02:06:02 +0000 (12:06 +1000)
commitefa479352fc780b305fa186cafb5f416fdf2b2cb
tree746fb290dd453b53cd881cdd9c38f72db67049c7
parent0c697fafc66830ca7d5dc19123a1d0641deaa1f6
drm/nouveau: Fix merge commit

The most recent merge commit in airlied/drm-next has problems with
confusing old_crtc_state and new_crtc_state. Use the
for_each_oldnew_crtc_in_state macros to clean up the confusion,
and explicitly look at the correct state instead of looking at
asyh->state.

With these fixes it becomes more obvious what the code is trying to do,
which will hopefully prevent future confusion.

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/nouveau/nv50_display.c