drm/i915: De-magic the PSR AUX message
Subsystems (2)
PATCH 1/1 drm/i915: De-magic the PSR AUX message
From: Ville Syrjälä <[email protected]>
Use pack_aux() to construct the PSR exit DPMS D0 AUX message, and use the defines from dp_dp_helper.h to populate the message contents.
--- drivers/gpu/drm/i915/i915_reg.h | 2 -- drivers/gpu/drm/i915/intel_dp.c | 16 +++++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -2
@@ -2453,9 +2453,7 @@ enum punit_power_well {#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10)#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_DPCD_COMMAND 0x80060000#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_DPCD_NORMAL_OPERATION (1<<24)#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c)#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20)#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24)
drivers/gpu/drm/i915/intel_dp.c +11 -5
@@ -225,7 +225,7 @@ intel_dp_mode_valid(struct drm_connector *connector, }static uint32_t -pack_aux (uint8_t *src,int src_bytes) +pack_aux (const uint8_t *src,int src_bytes) {int i;uint32_t v =0 ;
@@ -1741,8 +1741,14 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv = dev->dev_private;uint32_t aux_clock_divider;int precharge =0x3 ; -int msg_size =5 ;/* Header(4) + Message(1) */ bool only_standby = false; +static const uint8_t aux_msg[] = { + [0 ] =DP_AUX_NATIVE_WRITE <<4 , + [1 ] =DP_SET_POWER >>8 , + [2 ] =DP_SET_POWER &0xff , + [3 ] =1 -1 , + [4 ] =DP_SET_POWER_D0 , + }; aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp,0 );
@@ -1758,11 +1764,11 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);/* Setup AUX registers */ -I915_WRITE (EDP_PSR_AUX_DATA1 (dev),EDP_PSR_DPCD_COMMAND ); -I915_WRITE (EDP_PSR_AUX_DATA2 (dev),EDP_PSR_DPCD_NORMAL_OPERATION ); +I915_WRITE (EDP_PSR_AUX_DATA1 (dev),pack_aux (&aux_msg[0 ],4 )); +I915_WRITE (EDP_PSR_AUX_DATA2 (dev),pack_aux (&aux_msg[4 ],1 ));I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | - (msg_size <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | + (5 <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); }
Signature · 6 lines
1.8.5.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 58 lines · On Wed, 10 Sep 2014, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Use
pack_aux()to construct the PSR exit DPMS D0 AUX message, and use the defines fromdp_dp_helper.hto populate the message contents.Cc Rodrigo Vivi <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 -- drivers/gpu/drm/i915/intel_dp.c | 16 +++++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-2@@ -2453,9 +2453,7 @@ enum punit_power_well {#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10)#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_DPCD_COMMAND 0x80060000#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_DPCD_NORMAL_OPERATION (1<<24)#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c)#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20)#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24)drivers/gpu/drm/i915/intel_dp.c +8
-2@@ -225,7 +225,7 @@ intel_dp_mode_valid(struct drm_connector *connector, }static uint32_t -pack_aux (uint8_t *src,int src_bytes) +pack_aux (const uint8_t *src,int src_bytes) {int i;uint32_t v =0 ;@@ -1741,8 +1741,14 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv = dev->dev_private;uint32_t aux_clock_divider;int precharge =0x3 ; -int msg_size =5 ;/* Header(4) + Message(1) */ bool only_standby = false; +static const uint8_t aux_msg[] = { + [0 ] =DP_AUX_NATIVE_WRITE <<4 , + [1 ] =DP_SET_POWER >>8 , + [2 ] =DP_SET_POWER &0xff , + [3 ] =1 -1 , + [4 ] =DP_SET_POWER_D0 , + }; aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp,0 );@@ -1758,11 +1764,11 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);
drivers/gpu/drm/i915/intel_dp.c static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) · line 1771
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +3
-3/* Setup AUX registers */ -I915_WRITE (EDP_PSR_AUX_DATA1 (dev),EDP_PSR_DPCD_COMMAND ); -I915_WRITE (EDP_PSR_AUX_DATA2 (dev),EDP_PSR_DPCD_NORMAL_OPERATION ); +I915_WRITE (EDP_PSR_AUX_DATA1 (dev),pack_aux (&aux_msg[0 ],4 )); +I915_WRITE (EDP_PSR_AUX_DATA2 (dev),pack_aux (&aux_msg[4 ],1 )); I915_WRITE(EDP_PSR_AUX_CTL(dev), DP_AUX_CH_CTL_TIME_OUT_400us | - (msg_size << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) | + (5 << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |
s/5/ARRAY_SIZE(aux_msg)/ ?
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +0
-0(precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider << DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT)); }Signature · 6 lines
1.8.5.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 60 lines · Jani Nikula
Quoted 59 lines · On Wed, 10 Sep 2014, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Use
pack_aux()to construct the PSR exit DPMS D0 AUX message, and use the defines fromdp_dp_helper.hto populate the message contents.Cc Rodrigo Vivi <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 -- drivers/gpu/drm/i915/intel_dp.c | 16 +++++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-2@@ -2453,9 +2453,7 @@ enum punit_power_well {#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10)#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_DPCD_COMMAND 0x80060000#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_DPCD_NORMAL_OPERATION (1<<24)#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c)#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20)#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24)drivers/gpu/drm/i915/intel_dp.c +8
-2@@ -225,7 +225,7 @@ intel_dp_mode_valid(struct drm_connector *connector, }static uint32_t -pack_aux (uint8_t *src,int src_bytes) +pack_aux (const uint8_t *src,int src_bytes) {int i;uint32_t v =0 ;@@ -1741,8 +1741,14 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv = dev->dev_private;uint32_t aux_clock_divider;int precharge =0x3 ; -int msg_size =5 ;/* Header(4) + Message(1) */ bool only_standby = false; +static const uint8_t aux_msg[] = { + [0 ] =DP_AUX_NATIVE_WRITE <<4 , + [1 ] =DP_SET_POWER >>8 , + [2 ] =DP_SET_POWER &0xff , + [3 ] =1 -1 , + [4 ] =DP_SET_POWER_D0 , + }; aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp,0 );@@ -1758,11 +1764,11 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) · line 1771
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +3
-3/* Setup AUX registers */ -I915_WRITE (EDP_PSR_AUX_DATA1 (dev),EDP_PSR_DPCD_COMMAND ); -I915_WRITE (EDP_PSR_AUX_DATA2 (dev),EDP_PSR_DPCD_NORMAL_OPERATION ); +I915_WRITE (EDP_PSR_AUX_DATA1 (dev),pack_aux (&aux_msg[0 ],4 )); +I915_WRITE (EDP_PSR_AUX_DATA2 (dev),pack_aux (&aux_msg[4 ],1 )); I915_WRITE(EDP_PSR_AUX_CTL(dev), DP_AUX_CH_CTL_TIME_OUT_400us | - (msg_size << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) | + (5 << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) |s/5/ARRAY_SIZE(aux_msg)/ ?
Or just sizeof(). Either is fine by me.
Quoted 14 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +0
-0(precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider << DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT)); }Signature · 6 lines
1.8.5.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH v2 1/1 drm/i915: De-magic the PSR AUX message
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Use pack_aux() to construct the PSR exit DPMS D0 AUX message, and use the defines from dp_dp_helper.h to populate the message contents.
v2: Use sizeof() for message size (Jani)
Use a generic loop to write EDP_PSR_AUX_DATA registers
--- drivers/gpu/drm/i915/i915_reg.h | 2 -- drivers/gpu/drm/i915/intel_dp.c | 21 ++++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -2
@@ -2506,9 +2506,7 @@ enum punit_power_well {#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10)#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_DPCD_COMMAND 0x80060000#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_DPCD_NORMAL_OPERATION (1<<24)#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c)#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20)#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24)
drivers/gpu/drm/i915/intel_dp.c +16 -5
@@ -225,7 +225,7 @@ intel_dp_mode_valid(struct drm_connector *connector, }static uint32_t -pack_aux (uint8_t *src,int src_bytes) +pack_aux (const uint8_t *src,int src_bytes) {int i;uint32_t v =0 ;
@@ -2049,8 +2049,17 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv = dev->dev_private;uint32_t aux_clock_divider;int precharge =0x3 ; -int msg_size =5 ;/* Header(4) + Message(1) */ bool only_standby = false; +static const uint8_t aux_msg[] = { + [0 ] =DP_AUX_NATIVE_WRITE <<4 , + [1 ] =DP_SET_POWER >>8 , + [2 ] =DP_SET_POWER &0xff , + [3 ] =1 -1 , + [4 ] =DP_SET_POWER_D0 , + }; +int i; + +BUILD_BUG_ON (sizeof (aux_msg) >20 ); aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp,0 );
@@ -2066,11 +2075,13 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);/* Setup AUX registers */ -I915_WRITE (EDP_PSR_AUX_DATA1 (dev),EDP_PSR_DPCD_COMMAND ); -I915_WRITE (EDP_PSR_AUX_DATA2 (dev),EDP_PSR_DPCD_NORMAL_OPERATION ); +for (i =0 ; i <sizeof (aux_msg); i +=4 ) +I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i, +pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | - (msg_size <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | + (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); }
Signature · 6 lines
1.8.5.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 6 lines · On Wed, Oct 01, 2014 at 04:56:56PM +0300, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Use
pack_aux()to construct the PSR exit DPMS D0 AUX message, and use the defines fromdp_dp_helper.hto populate the message contents.
Quoted 6 lines
v2: Use
sizeof()for message size (Jani)
Use a generic loop to writeEDP_PSR_AUX_DATAregistersCc Jani Nikula <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 75 lines
--- drivers/gpu/drm/i915/i915_reg.h | 2 -- drivers/gpu/drm/i915/intel_dp.c | 21 ++++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-2@@ -2506,9 +2506,7 @@ enum punit_power_well {#define EDP_PSR_AUX_CTL (dev) (EDP_PSR_BASE(dev) + 0x10)#define EDP_PSR_AUX_DATA1 (dev) (EDP_PSR_BASE(dev) + 0x14) -#define EDP_PSR_DPCD_COMMAND 0x80060000#define EDP_PSR_AUX_DATA2 (dev) (EDP_PSR_BASE(dev) + 0x18) -#define EDP_PSR_DPCD_NORMAL_OPERATION (1<<24)#define EDP_PSR_AUX_DATA3 (dev) (EDP_PSR_BASE(dev) + 0x1c)#define EDP_PSR_AUX_DATA4 (dev) (EDP_PSR_BASE(dev) + 0x20)#define EDP_PSR_AUX_DATA5 (dev) (EDP_PSR_BASE(dev) + 0x24)drivers/gpu/drm/i915/intel_dp.c +16
-5@@ -225,7 +225,7 @@ intel_dp_mode_valid(struct drm_connector *connector, }static uint32_t -pack_aux (uint8_t *src,int src_bytes) +pack_aux (const uint8_t *src,int src_bytes) {int i;uint32_t v =0 ;@@ -2049,8 +2049,17 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv = dev->dev_private;uint32_t aux_clock_divider;int precharge =0x3 ; -int msg_size =5 ;/* Header(4) + Message(1) */ bool only_standby = false; +static const uint8_t aux_msg[] = { + [0 ] =DP_AUX_NATIVE_WRITE <<4 , + [1 ] =DP_SET_POWER >>8 , + [2 ] =DP_SET_POWER &0xff , + [3 ] =1 -1 , + [4 ] =DP_SET_POWER_D0 , + }; +int i; + +BUILD_BUG_ON (sizeof (aux_msg) >20 ); aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp,0 );@@ -2066,11 +2075,13 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp) DP_PSR_ENABLE | DP_PSR_MAIN_LINK_ACTIVE);/* Setup AUX registers */ -I915_WRITE (EDP_PSR_AUX_DATA1 (dev),EDP_PSR_DPCD_COMMAND ); -I915_WRITE (EDP_PSR_AUX_DATA2 (dev),EDP_PSR_DPCD_NORMAL_OPERATION ); +for (i =0 ; i <sizeof (aux_msg); i +=4 ) +I915_WRITE (EDP_PSR_AUX_DATA1 (dev) + i, +pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); +I915_WRITE (EDP_PSR_AUX_CTL (dev), DP_AUX_CH_CTL_TIME_OUT_400us | - (msg_size <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | + (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | (precharge <<DP_AUX_CH_CTL_PRECHARGE_2US_SHIFT ) | (aux_clock_divider <<DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT )); }Signature · 6 lines
1.8.5.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch