Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60222c0c authored by Patrik Jakobsson's avatar Patrik Jakobsson Committed by Daniel Vetter
Browse files

drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits 



Disable bits for ADPA HSYNC and VSYNC where mixed up resulting in suspend
becoming standby and vice versa. Fixed by swapping their bit position.

Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 44498aea

drivers/gpu/drm/i915/i915_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -1613,9 +1613,9 @@ 
#define   ADPA_CRT_HOTPLUG_FORCE_TRIGGER (1<<16)

#define   ADPA_USE_VGA_HVPOLARITY (1<<15)

#define   ADPA_SETS_HVPOLARITY	0

#define   ADPA_VSYNC_CNTL_DISABLE (1<<11)

#define   ADPA_VSYNC_CNTL_DISABLE (1<<10)

#define   ADPA_VSYNC_CNTL_ENABLE 0

#define   ADPA_HSYNC_CNTL_DISABLE (1<<10)

#define   ADPA_HSYNC_CNTL_DISABLE (1<<11)

#define   ADPA_HSYNC_CNTL_ENABLE 0

#define   ADPA_VSYNC_ACTIVE_HIGH (1<<4)

#define   ADPA_VSYNC_ACTIVE_LOW	0