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

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

[Patrik Jakobsson]

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
---
 drivers/gpu/drm/i915/i915_reg.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 527b664..848992f 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -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
-- 
1.7.10.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits

[Eric Anholt]

[-- Attachment #1.1: Type: text/plain, Size: 428 bytes --]

Patrik Jakobsson <patrik.r.jakobsson@gmail.com> writes:

> 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: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>

Confirmed in the 945 and 845 specs.

Reviewed-by: Eric Anholt <eric@anholt.net>

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits

[Paul Menzel]

[-- Attachment #1.1: Type: text/plain, Size: 742 bytes --]

Dear Patrik,


Am Dienstag, den 05.03.2013, 19:09 +0100 schrieb Patrik Jakobsson:
> Disable bits for ADPA HSYNC and VSYNC where mixed up resulting in suspend
> becoming standby and vice versa.

nice find. Could you elaborate on the symptoms please as I have never
experienced any issues with suspend and resume on my ASUS Eee PC 701 4G?

> Fixed by swapping their bit position.
> 
> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Where did Ville report this? Maybe my questions are already answered
there.

> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

[…]


Thanks,

Paul

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits

[Daniel Vetter]

On Tue, Mar 05, 2013 at 02:19:31PM -0800, Eric Anholt wrote:
> Patrik Jakobsson <patrik.r.jakobsson@gmail.com> writes:
> 
> > 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: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
> 
> Confirmed in the 945 and 845 specs.
> 
> Reviewed-by: Eric Anholt <eric@anholt.net>

Picked up for -fixes, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [PATCH] drm/i915: Fix incorrect definition of ADPA HSYNC and VSYNC bits

[Patrik Jakobsson]

On Wed, Mar 6, 2013 at 12:17 AM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Dear Patrik,

Hi Paul

> Am Dienstag, den 05.03.2013, 19:09 +0100 schrieb Patrik Jakobsson:
>> Disable bits for ADPA HSYNC and VSYNC where mixed up resulting in suspend
>> becoming standby and vice versa.
>
> nice find. Could you elaborate on the symptoms please as I have never
> experienced any issues with suspend and resume on my ASUS Eee PC 701 4G?

Ville did all the finding, I just wrote the patch to make sure it wasn't
forgotten.

This isn't related to suspend/resume of the system, but putting external
monitors in suspend or standby state. When in standby, the monitor consumes more
power than in suspend but wakes up faster.

>> Fixed by swapping their bit position.
>>
>> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Where did Ville report this? Maybe my questions are already answered
> there.

He found it while looking at another patch I've sent:
http://lists.freedesktop.org/archives/intel-gfx/2013-March/025418.html

-Patrik