diff mbox

[4/4] drm/dp: add DPCD definitions from eDP 1.4

Message ID 1424868414-23532-4-git-send-email-jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula Feb. 25, 2015, 12:46 p.m. UTC 
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 include/drm/drm_dp_helper.h | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

Comments

sonika.jindal@intel.com Feb. 26, 2015, 11:58 a.m. UTC | #1 
On Wednesday 25 February 2015 06:16 PM, Jani Nikula wrote:
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>   include/drm/drm_dp_helper.h | 37 +++++++++++++++++++++++++++++++++++++
>   1 file changed, 37 insertions(+)
>
> diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
> index cc96024e8776..07d94faa9255 100644
> --- a/include/drm/drm_dp_helper.h
> +++ b/include/drm/drm_dp_helper.h
> @@ -168,10 +168,18 @@
>   #define DP_AUD_DEL_INS2			    0x02d
>   /* End of AV_SYNC_DATA_BLOCK */
>   
> +#define DP_RECEIVER_ALPM_CAP		    0x02e   /* eDP 1.4 */
> +# define DP_ALPM_CAP			    (1 << 0)
Yes, it is named ALPM_CAP in spec, but to me something like 
DP_ALPM_SUPPORTED makes more sense to me here.
> +
> +#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP   0x02f   /* eDP 1.4 */
> +# define DP_AUX_FRAME_SYNC_CAP		    (1 << 0)
Same comment as above.
> +
>   #define DP_GUID				    0x030   /* 1.2 */
>   
>   #define DP_PSR_SUPPORT                      0x070   /* XXX 1.2? */
>   # define DP_PSR_IS_SUPPORTED                1
> +# define DP_PSR2_IS_SUPPORTED		    2	    /* eDP 1.4 */
> +
>   #define DP_PSR_CAPS                         0x071   /* XXX 1.2? */
>   # define DP_PSR_NO_TRAIN_ON_EXIT            1
>   # define DP_PSR_SETUP_TIME_330              (0 << 1)
> @@ -211,6 +219,7 @@
>   
>   /* link configuration */
>   #define	DP_LINK_BW_SET		            0x100
> +# define DP_LINK_RATE_TABLE		    0x00    /* eDP 1.4 */
>   # define DP_LINK_BW_1_62		    0x06
>   # define DP_LINK_BW_2_7			    0x0a
>   # define DP_LINK_BW_5_4			    0x14    /* 1.2 */
> @@ -309,15 +318,30 @@
>   #define DP_AUDIO_DELAY2			    0x114
>   
>   #define DP_LINK_RATE_SET		    0x115   /* eDP 1.4 */
> +# define DP_LINK_RATE_SET_SHIFT		    0
> +# define DP_LINK_RATE_SET_MASK		    (7 << 0)
> +
> +#define DP_RECEIVER_ALPM_CONFIG		    0x116   /* eDP 1.4 */
> +# define DP_ALPM_ENABLE			    (1 << 0)
> +# define DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE  (1 << 1)
> +
> +#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF  0x117   /* eDP 1.4 */
> +# define DP_AUX_FRAME_SYNC_ENABLE	    (1 << 0)
> +# define DP_IRQ_HPD_ENABLE		    (1 << 1)
>   
>   #define DP_UPSTREAM_DEVICE_DP_PWR_NEED	    0x118   /* 1.2 */
>   # define DP_PWR_NOT_NEEDED		    (1 << 0)
>   
> +#define DP_AUX_FRAME_SYNC_VALUE		    0x15c   /* eDP 1.4 */
> +# define DP_AUX_FRAME_SYNC_VALID	    (1 << 0)
> +
>   #define DP_PSR_EN_CFG			    0x170   /* XXX 1.2? */
>   # define DP_PSR_ENABLE			    (1 << 0)
>   # define DP_PSR_MAIN_LINK_ACTIVE	    (1 << 1)
>   # define DP_PSR_CRC_VERIFICATION	    (1 << 2)
>   # define DP_PSR_FRAME_CAPTURE		    (1 << 3)
> +# define DP_PSR_SELECTIVE_UPDATE	    (1 << 4)
> +# define DP_PSR_IRQ_HPD_WITH_CRC_ERRORS     (1 << 5)
>   
>   #define DP_ADAPTER_CTRL			    0x1a0
>   # define DP_ADAPTER_CTRL_FORCE_LOAD_SENSE   (1 << 0)
> @@ -425,6 +449,10 @@
>   # define DP_SET_POWER_MASK                  0x3
>   
>   #define DP_EDP_DPCD_REV			    0x700    /* eDP 1.2 */
> +# define DP_EDP_11			    0x00
> +# define DP_EDP_12			    0x01
> +# define DP_EDP_13			    0x02
> +# define DP_EDP_14			    0x03
>   
>   #define DP_EDP_GENERAL_CAP_1		    0x701
>   
> @@ -432,6 +460,8 @@
>   
>   #define DP_EDP_GENERAL_CAP_2		    0x703
>   
> +#define DP_EDP_GENERAL_CAP_3		    0x704    /* eDP 1.4 */
> +
>   #define DP_EDP_DISPLAY_CONTROL_REGISTER     0x720
>   
>   #define DP_EDP_BACKLIGHT_MODE_SET_REGISTER  0x721
> @@ -458,6 +488,9 @@
>   #define DP_EDP_DBC_MINIMUM_BRIGHTNESS_SET   0x732
>   #define DP_EDP_DBC_MAXIMUM_BRIGHTNESS_SET   0x733
>   
> +#define DP_EDP_REGIONAL_BACKLIGHT_BASE      0x740    /* eDP 1.4 */
> +#define DP_EDP_REGIONAL_BACKLIGHT_0	    0x741    /* eDP 1.4 */
> +
>   #define DP_SIDEBAND_MSG_DOWN_REQ_BASE	    0x1000   /* 1.2 MST */
>   #define DP_SIDEBAND_MSG_UP_REP_BASE	    0x1200   /* 1.2 MST */
>   #define DP_SIDEBAND_MSG_DOWN_REP_BASE	    0x1400   /* 1.2 MST */
> @@ -476,6 +509,7 @@
>   #define DP_PSR_ERROR_STATUS                 0x2006  /* XXX 1.2? */
>   # define DP_PSR_LINK_CRC_ERROR              (1 << 0)
>   # define DP_PSR_RFB_STORAGE_ERROR           (1 << 1)
> +# define DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR (1 << 2) /* eDP 1.4 */
>   
>   #define DP_PSR_ESI                          0x2007  /* XXX 1.2? */
>   # define DP_PSR_CAPS_CHANGE                 (1 << 0)
> @@ -489,6 +523,9 @@
>   # define DP_PSR_SINK_INTERNAL_ERROR         7
>   # define DP_PSR_SINK_STATE_MASK             0x07
>   
> +#define DP_RECEIVER_ALPM_STATUS		    0x200b  /* eDP 1.4 */
> +# define DP_ALPM_LOCK_TIMEOUT_ERROR_STATUS  (1 << 0)
> +
Probably just DP_ALPM_LOCK_TIMEOUT_ERROR ?
>   /* DP 1.2 Sideband message defines */
>   /* peer device type - DP 1.2a Table 2-92 */
>   #define DP_PEER_DEVICE_NONE		0x0
Jani Nikula Feb. 26, 2015, 12:37 p.m. UTC | #2 
On Thu, 26 Feb 2015, sonika <sonika.jindal@intel.com> wrote:
> On Wednesday 25 February 2015 06:16 PM, Jani Nikula wrote:
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>   include/drm/drm_dp_helper.h | 37 +++++++++++++++++++++++++++++++++++++
>>   1 file changed, 37 insertions(+)
>>
>> diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
>> index cc96024e8776..07d94faa9255 100644
>> --- a/include/drm/drm_dp_helper.h
>> +++ b/include/drm/drm_dp_helper.h
>> @@ -168,10 +168,18 @@
>>   #define DP_AUD_DEL_INS2			    0x02d
>>   /* End of AV_SYNC_DATA_BLOCK */
>>   
>> +#define DP_RECEIVER_ALPM_CAP		    0x02e   /* eDP 1.4 */
>> +# define DP_ALPM_CAP			    (1 << 0)
> Yes, it is named ALPM_CAP in spec, but to me something like 
> DP_ALPM_SUPPORTED makes more sense to me here.

I would prefer to keep the same name as in the spec. In many places in
the DPCD, _CAP refers to a capability, so I don't find it confusing.

>> +
>> +#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP   0x02f   /* eDP 1.4 */
>> +# define DP_AUX_FRAME_SYNC_CAP		    (1 << 0)
> Same comment as above.

Likewise. :)

>> +
>>   #define DP_GUID				    0x030   /* 1.2 */
>>   
>>   #define DP_PSR_SUPPORT                      0x070   /* XXX 1.2? */
>>   # define DP_PSR_IS_SUPPORTED                1
>> +# define DP_PSR2_IS_SUPPORTED		    2	    /* eDP 1.4 */
>> +
>>   #define DP_PSR_CAPS                         0x071   /* XXX 1.2? */
>>   # define DP_PSR_NO_TRAIN_ON_EXIT            1
>>   # define DP_PSR_SETUP_TIME_330              (0 << 1)
>> @@ -211,6 +219,7 @@
>>   
>>   /* link configuration */
>>   #define	DP_LINK_BW_SET		            0x100
>> +# define DP_LINK_RATE_TABLE		    0x00    /* eDP 1.4 */
>>   # define DP_LINK_BW_1_62		    0x06
>>   # define DP_LINK_BW_2_7			    0x0a
>>   # define DP_LINK_BW_5_4			    0x14    /* 1.2 */
>> @@ -309,15 +318,30 @@
>>   #define DP_AUDIO_DELAY2			    0x114
>>   
>>   #define DP_LINK_RATE_SET		    0x115   /* eDP 1.4 */
>> +# define DP_LINK_RATE_SET_SHIFT		    0
>> +# define DP_LINK_RATE_SET_MASK		    (7 << 0)
>> +
>> +#define DP_RECEIVER_ALPM_CONFIG		    0x116   /* eDP 1.4 */
>> +# define DP_ALPM_ENABLE			    (1 << 0)
>> +# define DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE  (1 << 1)
>> +
>> +#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF  0x117   /* eDP 1.4 */
>> +# define DP_AUX_FRAME_SYNC_ENABLE	    (1 << 0)
>> +# define DP_IRQ_HPD_ENABLE		    (1 << 1)
>>   
>>   #define DP_UPSTREAM_DEVICE_DP_PWR_NEED	    0x118   /* 1.2 */
>>   # define DP_PWR_NOT_NEEDED		    (1 << 0)
>>   
>> +#define DP_AUX_FRAME_SYNC_VALUE		    0x15c   /* eDP 1.4 */
>> +# define DP_AUX_FRAME_SYNC_VALID	    (1 << 0)
>> +
>>   #define DP_PSR_EN_CFG			    0x170   /* XXX 1.2? */
>>   # define DP_PSR_ENABLE			    (1 << 0)
>>   # define DP_PSR_MAIN_LINK_ACTIVE	    (1 << 1)
>>   # define DP_PSR_CRC_VERIFICATION	    (1 << 2)
>>   # define DP_PSR_FRAME_CAPTURE		    (1 << 3)
>> +# define DP_PSR_SELECTIVE_UPDATE	    (1 << 4)
>> +# define DP_PSR_IRQ_HPD_WITH_CRC_ERRORS     (1 << 5)
>>   
>>   #define DP_ADAPTER_CTRL			    0x1a0
>>   # define DP_ADAPTER_CTRL_FORCE_LOAD_SENSE   (1 << 0)
>> @@ -425,6 +449,10 @@
>>   # define DP_SET_POWER_MASK                  0x3
>>   
>>   #define DP_EDP_DPCD_REV			    0x700    /* eDP 1.2 */
>> +# define DP_EDP_11			    0x00
>> +# define DP_EDP_12			    0x01
>> +# define DP_EDP_13			    0x02
>> +# define DP_EDP_14			    0x03
>>   
>>   #define DP_EDP_GENERAL_CAP_1		    0x701
>>   
>> @@ -432,6 +460,8 @@
>>   
>>   #define DP_EDP_GENERAL_CAP_2		    0x703
>>   
>> +#define DP_EDP_GENERAL_CAP_3		    0x704    /* eDP 1.4 */
>> +
>>   #define DP_EDP_DISPLAY_CONTROL_REGISTER     0x720
>>   
>>   #define DP_EDP_BACKLIGHT_MODE_SET_REGISTER  0x721
>> @@ -458,6 +488,9 @@
>>   #define DP_EDP_DBC_MINIMUM_BRIGHTNESS_SET   0x732
>>   #define DP_EDP_DBC_MAXIMUM_BRIGHTNESS_SET   0x733
>>   
>> +#define DP_EDP_REGIONAL_BACKLIGHT_BASE      0x740    /* eDP 1.4 */
>> +#define DP_EDP_REGIONAL_BACKLIGHT_0	    0x741    /* eDP 1.4 */
>> +
>>   #define DP_SIDEBAND_MSG_DOWN_REQ_BASE	    0x1000   /* 1.2 MST */
>>   #define DP_SIDEBAND_MSG_UP_REP_BASE	    0x1200   /* 1.2 MST */
>>   #define DP_SIDEBAND_MSG_DOWN_REP_BASE	    0x1400   /* 1.2 MST */
>> @@ -476,6 +509,7 @@
>>   #define DP_PSR_ERROR_STATUS                 0x2006  /* XXX 1.2? */
>>   # define DP_PSR_LINK_CRC_ERROR              (1 << 0)
>>   # define DP_PSR_RFB_STORAGE_ERROR           (1 << 1)
>> +# define DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR (1 << 2) /* eDP 1.4 */
>>   
>>   #define DP_PSR_ESI                          0x2007  /* XXX 1.2? */
>>   # define DP_PSR_CAPS_CHANGE                 (1 << 0)
>> @@ -489,6 +523,9 @@
>>   # define DP_PSR_SINK_INTERNAL_ERROR         7
>>   # define DP_PSR_SINK_STATE_MASK             0x07
>>   
>> +#define DP_RECEIVER_ALPM_STATUS		    0x200b  /* eDP 1.4 */
>> +# define DP_ALPM_LOCK_TIMEOUT_ERROR_STATUS  (1 << 0)
>> +
> Probably just DP_ALPM_LOCK_TIMEOUT_ERROR ?

Agreed.

>>   /* DP 1.2 Sideband message defines */
>>   /* peer device type - DP 1.2a Table 2-92 */
>>   #define DP_PEER_DEVICE_NONE		0x0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index cc96024e8776..07d94faa9255 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -168,10 +168,18 @@ 
 #define DP_AUD_DEL_INS2			    0x02d
 /* End of AV_SYNC_DATA_BLOCK */
 
+#define DP_RECEIVER_ALPM_CAP		    0x02e   /* eDP 1.4 */
+# define DP_ALPM_CAP			    (1 << 0)
+
+#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP   0x02f   /* eDP 1.4 */
+# define DP_AUX_FRAME_SYNC_CAP		    (1 << 0)
+
 #define DP_GUID				    0x030   /* 1.2 */
 
 #define DP_PSR_SUPPORT                      0x070   /* XXX 1.2? */
 # define DP_PSR_IS_SUPPORTED                1
+# define DP_PSR2_IS_SUPPORTED		    2	    /* eDP 1.4 */
+
 #define DP_PSR_CAPS                         0x071   /* XXX 1.2? */
 # define DP_PSR_NO_TRAIN_ON_EXIT            1
 # define DP_PSR_SETUP_TIME_330              (0 << 1)
@@ -211,6 +219,7 @@ 
 
 /* link configuration */
 #define	DP_LINK_BW_SET		            0x100
+# define DP_LINK_RATE_TABLE		    0x00    /* eDP 1.4 */
 # define DP_LINK_BW_1_62		    0x06
 # define DP_LINK_BW_2_7			    0x0a
 # define DP_LINK_BW_5_4			    0x14    /* 1.2 */
@@ -309,15 +318,30 @@ 
 #define DP_AUDIO_DELAY2			    0x114
 
 #define DP_LINK_RATE_SET		    0x115   /* eDP 1.4 */
+# define DP_LINK_RATE_SET_SHIFT		    0
+# define DP_LINK_RATE_SET_MASK		    (7 << 0)
+
+#define DP_RECEIVER_ALPM_CONFIG		    0x116   /* eDP 1.4 */
+# define DP_ALPM_ENABLE			    (1 << 0)
+# define DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE  (1 << 1)
+
+#define DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF  0x117   /* eDP 1.4 */
+# define DP_AUX_FRAME_SYNC_ENABLE	    (1 << 0)
+# define DP_IRQ_HPD_ENABLE		    (1 << 1)
 
 #define DP_UPSTREAM_DEVICE_DP_PWR_NEED	    0x118   /* 1.2 */
 # define DP_PWR_NOT_NEEDED		    (1 << 0)
 
+#define DP_AUX_FRAME_SYNC_VALUE		    0x15c   /* eDP 1.4 */
+# define DP_AUX_FRAME_SYNC_VALID	    (1 << 0)
+
 #define DP_PSR_EN_CFG			    0x170   /* XXX 1.2? */
 # define DP_PSR_ENABLE			    (1 << 0)
 # define DP_PSR_MAIN_LINK_ACTIVE	    (1 << 1)
 # define DP_PSR_CRC_VERIFICATION	    (1 << 2)
 # define DP_PSR_FRAME_CAPTURE		    (1 << 3)
+# define DP_PSR_SELECTIVE_UPDATE	    (1 << 4)
+# define DP_PSR_IRQ_HPD_WITH_CRC_ERRORS     (1 << 5)
 
 #define DP_ADAPTER_CTRL			    0x1a0
 # define DP_ADAPTER_CTRL_FORCE_LOAD_SENSE   (1 << 0)
@@ -425,6 +449,10 @@ 
 # define DP_SET_POWER_MASK                  0x3
 
 #define DP_EDP_DPCD_REV			    0x700    /* eDP 1.2 */
+# define DP_EDP_11			    0x00
+# define DP_EDP_12			    0x01
+# define DP_EDP_13			    0x02
+# define DP_EDP_14			    0x03
 
 #define DP_EDP_GENERAL_CAP_1		    0x701
 
@@ -432,6 +460,8 @@ 
 
 #define DP_EDP_GENERAL_CAP_2		    0x703
 
+#define DP_EDP_GENERAL_CAP_3		    0x704    /* eDP 1.4 */
+
 #define DP_EDP_DISPLAY_CONTROL_REGISTER     0x720
 
 #define DP_EDP_BACKLIGHT_MODE_SET_REGISTER  0x721
@@ -458,6 +488,9 @@ 
 #define DP_EDP_DBC_MINIMUM_BRIGHTNESS_SET   0x732
 #define DP_EDP_DBC_MAXIMUM_BRIGHTNESS_SET   0x733
 
+#define DP_EDP_REGIONAL_BACKLIGHT_BASE      0x740    /* eDP 1.4 */
+#define DP_EDP_REGIONAL_BACKLIGHT_0	    0x741    /* eDP 1.4 */
+
 #define DP_SIDEBAND_MSG_DOWN_REQ_BASE	    0x1000   /* 1.2 MST */
 #define DP_SIDEBAND_MSG_UP_REP_BASE	    0x1200   /* 1.2 MST */
 #define DP_SIDEBAND_MSG_DOWN_REP_BASE	    0x1400   /* 1.2 MST */
@@ -476,6 +509,7 @@ 
 #define DP_PSR_ERROR_STATUS                 0x2006  /* XXX 1.2? */
 # define DP_PSR_LINK_CRC_ERROR              (1 << 0)
 # define DP_PSR_RFB_STORAGE_ERROR           (1 << 1)
+# define DP_PSR_VSC_SDP_UNCORRECTABLE_ERROR (1 << 2) /* eDP 1.4 */
 
 #define DP_PSR_ESI                          0x2007  /* XXX 1.2? */
 # define DP_PSR_CAPS_CHANGE                 (1 << 0)
@@ -489,6 +523,9 @@ 
 # define DP_PSR_SINK_INTERNAL_ERROR         7
 # define DP_PSR_SINK_STATE_MASK             0x07
 
+#define DP_RECEIVER_ALPM_STATUS		    0x200b  /* eDP 1.4 */
+# define DP_ALPM_LOCK_TIMEOUT_ERROR_STATUS  (1 << 0)
+
 /* DP 1.2 Sideband message defines */
 /* peer device type - DP 1.2a Table 2-92 */
 #define DP_PEER_DEVICE_NONE		0x0