drm : adds Y-coordinate and Colorimetry Format
Subsystems (3)
PATCH 1/2 drm : adds Y-coordinate and Colorimetry Format
PSR2 vsc revision number hb2( as per table 6-11)is updated to 4 or 5 based on Y cordinate and Colorimetry Format as below 04h = 3D stereo + PSR/PSR2 + Y-coordinate.
05h = -3D stereo- + PSR/PSR2 + Y-coordinate + Pixel Encoding/Colorimetry Format indication. A DP Source device is allowed to indicate the pixel encoding/colorimetry format to the DP Sink device with VSC SDP only when the DP Sink device supports it ( i.e.,VSC_SDP_EXTENSION_FOR_COLORIMETRY_SUPPORTED bit in the DPRX_FEATURE_ENUMERATION_LIST register (DPCD Address 02210h, bit 3; is set to 1).
--- include/drm/drm_dp_helper.h | 4 ++++ 1 file changed, 4 insertions(+)
include/drm/drm_dp_helper.h +4 -0
@@ -194,6 +194,7 @@# define DP_PSR_SETUP_TIME_0 (6 << 1)# define DP_PSR_SETUP_TIME_MASK (7 << 1)# define DP_PSR_SETUP_TIME_SHIFT 1 +# define DP_PSR_Y_COORDINATE (1 << 4)/* eDP 1.4 */ /* * 0x80-0x8f describe downstream port capabilities, but there are two layouts
@@ -568,6 +569,9 @@#define DP_RECEIVER_ALPM_STATUS 0x200b/* eDP 1.4 */ # define DP_ALPM_LOCK_TIMEOUT_ERROR (1 << 0) +#define DPRX_FEATURE_ENUMERATION_LIST 0x2210 +# define VSC_SDP_EXT_FOR_COLORIMETRY_SUPPORTED (1 << 3) +/* DP 1.2 Sideband message defines */ /* peer device type - DP 1.2a Table 2-92 */ #define DP_PEER_DEVICE_NONE 0x0
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/psr: program vsc header for psr2
Function hsw_psr_setup handles vsc header setup for psr1 and skl_psr_setup_vsc handles vsc header setup for psr2.
Setup VSC header in function skl_psr_setup_vsc for psr2 support, as per edp 1.4 spec, table 6-11:VSC SDP HEADER Extension for psr2 operation.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dp.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 17 +++++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1232,6 +1232,8 @@ struct i915_psr {bool psr2_support;bool aux_frame_sync;bool link_standby; +bool y_cord_support; +bool colorimetry_support; };enum intel_pch {
drivers/gpu/drm/i915/intel_dp.c +24 -0
@@ -3041,6 +3041,22 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder, DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; } +bool intel_dp_get_y_cord_status (struct intel_dp *intel_dp) +{ +uint8_t psr_caps; + +drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_CAPS , &psr_caps); +return (psr_caps &DP_PSR_Y_COORDINATE ); +} + +bool intel_dp_get_colorimetry_status (struct intel_dp *intel_dp) +{ +uint8_t dprx; + +drm_dp_dpcd_readb (&intel_dp->aux,DPRX_FEATURE_ENUMERATION_LIST , &dprx); +return (dprx &VSC_SDP_EXT_FOR_COLORIMETRY_SUPPORTED ); +} +/* These are source-specific values. */ uint8_t intel_dp_voltage_max (struct intel_dp *intel_dp)
@@ -3619,6 +3635,14 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync;DRM_DEBUG_KMS ("PSR2 %s on sink" , dev_priv->psr.psr2_support ?"supported" :"not supported" ); + +if (dev_priv->psr.psr2_support) { + dev_priv->psr.y_cord_support = +intel_dp_get_y_cord_status (intel_dp); + dev_priv->psr.colorimetry_support = +intel_dp_get_colorimetry_status (intel_dp); + } + }/* Read the eDP Display control capabilities registers */
drivers/gpu/drm/i915/intel_psr.c +15 -2
@@ -122,13 +122,26 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc; +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = intel_dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev);/* Prepare VSC Header for SU as per EDP 1.4 spec, Table 6.11 */ memset (&psr_vsc,0 ,sizeof (psr_vsc)); psr_vsc.sdp_header.HB0 =0 ; psr_vsc.sdp_header.HB1 =0x7 ; - psr_vsc.sdp_header.HB2 =0x3 ; - psr_vsc.sdp_header.HB3 =0xb ; +if (dev_priv->psr.colorimetry_support && + dev_priv->psr.y_cord_support) { + psr_vsc.sdp_header.HB2 =0x5 ; + psr_vsc.sdp_header.HB3 =0x13 ; + }else if (dev_priv->psr.y_cord_support) { + psr_vsc.sdp_header.HB2 =0x4 ; + psr_vsc.sdp_header.HB3 =0xe ; + }else { + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xc ; + } +intel_psr_write_vsc (intel_dp, &psr_vsc); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 2/2] drm/i915/psr: program vsc header for psr2
Quoted 34 lines · vathsala nagaraju
Function
hsw_psr_setuphandles vsc header setup for psr1 andskl_psr_setup_vschandles vsc header setup for psr2.Setup VSC header in function
skl_psr_setup_vscfor psr2 support, as per edp 1.4 spec, table 6-11:VSC SDP HEADER Extension for psr2 operation.Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dp.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 17 +++++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -1232,6 +1232,8 @@ struct i915_psr {bool psr2_support;bool aux_frame_sync;bool link_standby; +bool y_cord_support; +bool colorimetry_support; };enum intel_pch {drivers/gpu/drm/i915/intel_dp.c +0
-0
drivers/gpu/drm/i915/intel_dp.c static void chv_dp_post_pll_disable(struct intel_encoder *encoder, · line 3044
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -3041,6 +3041,22 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder, DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; } +bool intel_dp_get_y_cord_status (struct intel_dp *intel_dp)
static. Sparse would have told you about this.
drivers/gpu/drm/i915/intel_dp.c static void chv_dp_post_pll_disable(struct intel_encoder *encoder, · line 3046
Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+{ +uint8_t psr_caps;
Please initialize psr_caps = 0 to default to false in case aux fails. If the compiler is smart enough, it might even warn you about this.
drivers/gpu/drm/i915/intel_dp.c static void chv_dp_post_pll_disable(struct intel_encoder *encoder, · line 3049
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+ +drm_dp_dpcd_readb (&intel_dp->aux,DP_PSR_CAPS , &psr_caps); +return (psr_caps &DP_PSR_Y_COORDINATE );
Unnecessary braces.
drivers/gpu/drm/i915/intel_dp.c static void chv_dp_post_pll_disable(struct intel_encoder *encoder, · line 3057
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +8
-0+} + +bool intel_dp_get_colorimetry_status (struct intel_dp *intel_dp) +{ +uint8_t dprx; + +drm_dp_dpcd_readb (&intel_dp->aux,DPRX_FEATURE_ENUMERATION_LIST , &dprx); +return (dprx &VSC_SDP_EXT_FOR_COLORIMETRY_SUPPORTED );
Same things here as in intel_dp_get_y_cord_status.
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+} +/* These are source-specific values. */ uint8_t intel_dp_voltage_max (struct intel_dp *intel_dp)
drivers/gpu/drm/i915/intel_dp.c void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) · line 3643
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0@@ -3619,6 +3635,14 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync;DRM_DEBUG_KMS ("PSR2 %s on sink" , dev_priv->psr.psr2_support ?"supported" :"not supported" ); + +if (dev_priv->psr.psr2_support) { + dev_priv->psr.y_cord_support = +intel_dp_get_y_cord_status (intel_dp); + dev_priv->psr.colorimetry_support = +intel_dp_get_colorimetry_status (intel_dp);
The indentation doesn't seem to be right for the continuation lines.
Quoted 24 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+ } + }/* Read the eDP Display control capabilities registers */ drivers/gpu/drm/i915/intel_psr.c +4
-2@@ -122,13 +122,26 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc; +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = intel_dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev);/* Prepare VSC Header for SU as per EDP 1.4 spec, Table 6.11 */ memset (&psr_vsc,0 ,sizeof (psr_vsc)); psr_vsc.sdp_header.HB0 =0 ; psr_vsc.sdp_header.HB1 =0x7 ; - psr_vsc.sdp_header.HB2 =0x3 ; - psr_vsc.sdp_header.HB3 =0xb ; + if (dev_priv->psr.colorimetry_support &&
drivers/gpu/drm/i915/intel_psr.c static void vlv_psr_setup_vsc(struct intel_dp *intel_dp) · line 143
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +10
-0+ dev_priv->psr.y_cord_support) { + psr_vsc.sdp_header.HB2 =0x5 ; + psr_vsc.sdp_header.HB3 =0x13 ; + } else if (dev_priv->psr.y_cord_support) { + psr_vsc.sdp_header.HB2 =0x4 ; + psr_vsc.sdp_header.HB3 =0xe ; + } else { + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xc ; + }
Rodrigo, I'm leaving the review of these to you. ;)
BR,
Jani.
Quoted 3 lines
drivers/gpu/drm/i915/intel_psr.c +1
-0+intel_psr_write_vsc (intel_dp, &psr_vsc); }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/2] drm : adds Y-coordinate and Colorimetry Format
In reply to vathsala nagaraju== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm : adds Y-coordinate and Colorimetry Format
URL : https://patchwork.freedesktop.org/series/17100/
State : failure
== Summary ==
Series 17100v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/17100/revisions/1/mbox/
Test gem_ringfill:
Subgroup basic-default-hang:
pass -> INCOMPLETE (fi-hsw-4770r)
Test kms_force_connector_basic:
Subgroup force-connector-state:
dmesg-warn -> PASS (fi-ivb-3770)fi-bdw-5557u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:247 pass:208 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:247 pass:225 dwarn:1 dfail:0 fail:0 skip:21 fi-bxt-t5700 total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-j1900 total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:118 pass:109 dwarn:0 dfail:0 fail:0 skip:8 fi-ilk-650 total:247 pass:195 dwarn:0 dfail:0 fail:0 skip:52 fi-ivb-3520m total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:247 pass:224 dwarn:3 dfail:0 fail:0 skip:20 fi-skl-6770hq total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32
f45701ec502e5ee9682561be7578bd39741ad4bb drm-tip: 2016y-12m-21d-11h-52m-22s UTC integration manifest a78c66e drm/i915/psr: program vsc header for psr2
a6df9a0 drm : adds Y-coordinate and Colorimetry Format
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3359/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 23 lines · vathsala nagaraju
PSR2 vsc revision number hb2( as per table 6-11)is updated to 4 or 5 based on Y cordinate and Colorimetry Format as below 04h = 3D stereo + PSR/PSR2 + Y-coordinate.
05h = -3D stereo- + PSR/PSR2 + Y-coordinate + Pixel Encoding/Colorimetry Format indication. A DP Source device is allowed to indicate the pixel encoding/colorimetry format to the DP Sink device with VSC SDP only when the DP Sink device supports it ( i.e.,VSC_SDP_EXTENSION_FOR_COLORIMETRY_SUPPORTED bit in theDPRX_FEATURE_ENUMERATION_LISTregister (DPCD Address 02210h, bit 3; is set to 1).Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>--- include/drm/drm_dp_helper.h | 4 ++++ 1 file changed, 4 insertions(+)include/drm/drm_dp_helper.h +0
-0
include/drm/drm_dp_helper.h line 197
Quoted 4 lines
include/drm/drm_dp_helper.h +1
-0@@ -194,6 +194,7 @@# define DP_PSR_SETUP_TIME_0 (6 << 1)# define DP_PSR_SETUP_TIME_MASK (7 << 1)# define DP_PSR_SETUP_TIME_SHIFT 1 +# define DP_PSR_Y_COORDINATE (1 << 4)/* eDP 1.4 */
Do you think DP_PSR2_SU_Y_COORDINATE_REQUIRED would be too long? It was introduced in eDP 1.4a to be specific.
While adding stuff here, please also add DP_PSR2_SU_GRANULARITY_REQUIRED from eDP v1.4b.
include/drm/drm_dp_helper.h line 574
Quoted 10 lines
include/drm/drm_dp_helper.h +3
-0/* * 0x80-0x8f describe downstream port capabilities, but there are two layouts @@ -568,6 +569,9 @@#define DP_RECEIVER_ALPM_STATUS 0x200b/* eDP 1.4 */ # define DP_ALPM_LOCK_TIMEOUT_ERROR (1 << 0) +#define DPRX_FEATURE_ENUMERATION_LIST 0x2210 +# define VSC_SDP_EXT_FOR_COLORIMETRY_SUPPORTED (1 << 3) +
All DPCD register and bit defs in this file are prefixed with DP_. Please add that.
If you're going through the trouble of adding the bits from the spec, you might as well add all of the bits in this register, and I could review them at no extra trouble, instead of everyone adding bits and pieces a little bit at a time. Saves everyone some trouble.
BR,
Jani.
Quoted 3 lines
include/drm/drm_dp_helper.h +0
-0/* DP 1.2 Sideband message defines */ /* peer device type - DP 1.2a Table 2-92 */ #define DP_PEER_DEVICE_NONE 0x0
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel