Fix errors pointed out by jonls

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge changes to gamma-drm and resolve merge conflicts

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Remove redudant if at head of else

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge changes to gamma-drm and resolve merge conflicts

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge branch 'multimonitor' into preserve-calibs
Merge branch 'multimonitor' into screen-vs-crtc
Merge branch 'screen-vs-crtc' into future
Merge branch 'preserve-calibs' into future