Enable Display Stream Compression on eDP/DP
Subsystems (4)
cover Enable Display Stream Compression on eDP/DP
VESA has developed an industry standard Display Stream Compression(DSC) for interoperable, visually lossless compression over display links to address the needs for higher resolution displays.
This patch series enables DSC on Gen 10 eDP and Gen 11 eDP/DP panels. This implementation is based on VESA DP 1.4 and DSC specifications.
These patches have been validated on 1080p eDP 1.4 panel with DSC support and FPGA based DP 1.4 sink device.
Gaurav K Singh (6):
drm/dsc: Define VESA Display Stream Compression Capabilities drm/dsc: Define the DSC 1.1 and 1.2 Line Buffer depth constants drm/i915/dsc: Define & Compute VESA DSC params drm/i915/dsc: Compute Rate Control parameters for DSC drm/i915/dp: Enable/Disable DSC in DP Sink drm/i915/dp: Disable DSC in source by disabling DSS CTL bits
Manasi Navare (15):
drm/dp: Add DP DSC DPCD receiver capability size define and missing
SHIFT
drm/i915/dp: Cache the DP/eDP DSC DPCD register set on Hotplug/eDP
Init
drm/dp: DRM DP helper/macros to get DP sink DSC parameters drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC drm/i915/dp: Validate modes using max Output BPP and slice count when
DSC supported
drm/dp: Define payload size for DP SDP PPS packet
drm/dsc: Define Display Stream Compression PPS infoframe drm/dsc: Add helpers for DSC picture parameter set infoframes drm/i915/dp: Add DSC params and DSC config to intel_crtc_state drm/i915/dp: Compute DSC pipe config in atomic check drm/i915/dp: Do not enable PSR2 if DSC is enabled drm/i915/dp: Configure i915 Picture parameter Set registers during DSC
enabling
drm/i915/dp: Use the existing write_infoframe() for DSC PPS SDPs drm/i915/dp: Populate DSC PPS SDP and send PPS infoframes drm/i915/dp: Configure Display stream splitter registers during DSC
enable
Srivatsa, Anusha (2):
drm/dsc: Define Rate Control values that do not change over
configurations
drm/i915/icl: Add Display Stream Splitter control registers
Documentation/gpu/drm-kms-helpers.rst | 12 + drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_dp_helper.c | 89 +++ drivers/gpu/drm/drm_dsc.c | 221 +++++++ drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_reg.h | 34 ++ drivers/gpu/drm/i915/intel_ddi.c | 5 + drivers/gpu/drm/i915/intel_display.c | 34 +- drivers/gpu/drm/i915/intel_display.h | 3 +- drivers/gpu/drm/i915/intel_dp.c | 325 +++++++++- drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 21 + drivers/gpu/drm/i915/intel_hdmi.c | 23 +- drivers/gpu/drm/i915/intel_psr.c | 10 + drivers/gpu/drm/i915/intel_vdsc.c | 1080 +++++++++++++++++++++++++++++++++ include/drm/drm_dp_helper.h | 40 ++ include/drm/drm_dsc.h | 506 +++++++++++++++ 18 files changed, 2380 insertions(+), 33 deletions(-) create mode 100644 drivers/gpu/drm/drm_dsc.c create mode 100644 drivers/gpu/drm/i915/intel_vdsc.c create mode 100644 include/drm/drm_dsc.h
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/23 drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFT
This patch defines the DP DSC receiver capability size that gives total number of DP DSC DPCD registers.
This also adds a missing #defines for DP DSC support missed in the commit id (ab6a46ea6842ce "Add DPCD definitions for DP 1.4 DSC feature")
v3:
* MIN_SLICE_WIDTH = 2560 (Anusha)
* Define DP_DSC_SLICE_WIDTH_MULTIPLIER = 320
v2:
* Add SHIFT define and DECOMPRESSION_EN define misse din prev patch
--- include/drm/drm_dp_helper.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/drm/drm_dp_helper.h +6 -0
@@ -230,6 +230,8 @@#define DP_DSC_MAX_BITS_PER_PIXEL_LOW 0x067/* eDP 1.4 */ #define DP_DSC_MAX_BITS_PER_PIXEL_HI 0x068/* eDP 1.4 */ +# define DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK (0x3 << 0) +# define DP_DSC_MAX_BITS_PER_PIXEL_HI_SHIFT 8#define DP_DSC_DEC_COLOR_FORMAT_CAP 0x069# define DP_DSC_RGB (1 << 0)
@@ -278,6 +280,8 @@# define DP_DSC_THROUGHPUT_MODE_1_1000 (14 << 4)#define DP_DSC_MAX_SLICE_WIDTH 0x06C +#define DP_DSC_MIN_SLICE_WIDTH_VALUE 2560 +#define DP_DSC_SLICE_WIDTH_MULTIPLIER 320#define DP_DSC_SLICE_CAP_2 0x06D# define DP_DSC_16_PER_DP_DSC_SINK (1 << 0)
@@ -476,6 +480,7 @@# define DP_AUX_FRAME_SYNC_VALID (1 << 0)#define DP_DSC_ENABLE 0x160/* DP 1.4 */ +# define DP_DECOMPRESSION_EN (1 << 0)#define DP_PSR_EN_CFG 0x170/* XXX 1.2? */ # define DP_PSR_ENABLE (1 << 0)
@@ -962,6 +967,7 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI#define DP_BRANCH_OUI_HEADER_SIZE 0xc#define DP_RECEIVER_CAP_SIZE 0xf +#define DP_DSC_RECEIVER_CAP_SIZE 0xf#define EDP_PSR_RECEIVER_CAP_SIZE 2#define EDP_DISPLAY_CTL_CAP_SIZE 3
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/23] drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFT
Quoted 18 lines
-----Original Message-----
From: Navare, Manasi D
Sent: Monday, July 30, 2018 7:13 PM
To: [email protected]
Cc: [email protected]; [email protected]; Srivatsa, Anusha <[email protected]>; Singh, Gaurav K <[email protected]>; Navare, Manasi D <[email protected]>; dri- [email protected]
Subject: [PATCH 01/23] drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFTThis patch defines the DP DSC receiver capability size that gives total number of DP DSC DPCD registers.
This also adds a missing #defines for DP DSC support missed in the commit id (ab6a46ea6842ce"Add DPCD definitions for DP 1.4 DSC feature")
Quoted 5 lines
v3:
*MIN_SLICE_WIDTH= 2560 (Anusha)
* DefineDP_DSC_SLICE_WIDTH_MULTIPLIER= 320
v2:
* Add SHIFT define andDECOMPRESSION_ENdefine misse din prev patch
^^^^ missed in previous
Quoted 6 lines
Cc Jani Nikula <[email protected]>Cc Ville Syrjala <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Gaurav K Singh <[email protected]>Signed-off-by Manasi Navare <[email protected]>
But that apart, checked with spec. Changes look good.
Quoted 37 lines
---
include/drm/drm_dp_helper.h| 6 ++++++1 file changed, 6 insertions(+)include/drm/drm_dp_helper.h index renamed from include/drm/drm_dp_helper.h +0
-005cc31b..eb0d86c 100644
include/drm/drm_dp_helper.h +5
-0@@ -230,6 +230,8 @@#define DP_DSC_MAX_BITS_PER_PIXEL_LOW 0x067/* eDP 1.4 */ #define DP_DSC_MAX_BITS_PER_PIXEL_HI 0x068/* eDP 1.4 */ +# define DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK (0x3 << 0) # define +DP_DSC_MAX_BITS_PER_PIXEL_HI_SHIFT 8#define DP_DSC_DEC_COLOR_FORMAT_CAP 0x069# define DP_DSC_RGB (1 << 0)@@ -278,6 +280,8 @@# define DP_DSC_THROUGHPUT_MODE_1_1000 (14 << 4)#define DP_DSC_MAX_SLICE_WIDTH 0x06C +#define DP_DSC_MIN_SLICE_WIDTH_VALUE 2560 +#define DP_DSC_SLICE_WIDTH_MULTIPLIER 320#define DP_DSC_SLICE_CAP_2 0x06D# define DP_DSC_16_PER_DP_DSC_SINK (1 << 0)@@ -476,6 +480,7 @@# define DP_AUX_FRAME_SYNC_VALID (1 << 0)#define DP_DSC_ENABLE 0x160/* DP 1.4 */ +# define DP_DECOMPRESSION_EN (1 << 0)#define DP_PSR_EN_CFG 0x170/* XXX 1.2? */ # define DP_PSR_ENABLE (1 << 0)@@ -962,6 +967,7 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8link_status[DP_LINK_STATUS_SI
Quoted 8 lines
#define
DP_BRANCH_OUI_HEADER_SIZE0xc
#defineDP_RECEIVER_CAP_SIZE0xf
+#defineDP_DSC_RECEIVER_CAP_SIZE0xf
#defineEDP_PSR_RECEIVER_CAP_SIZE2
#defineEDP_DISPLAY_CTL_CAP_SIZE3--
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/23 drm/i915/dp: Cache the DP/eDP DSC DPCD register set on Hotplug/eDP Init
In reply to Manasi NavareDSC is supported on eDP starting GEN 10 display and on DP starting GEN 11.
This patch implements the discovery phase of DSC. On hotplug, source reads the DSC DPCD register set (0x00060 - 0x006F) to read the decompression capabilities of the sink device. This entire block of registers is cached in intel_dp so that capability information can be used during DSC configuration phase during compute_config phase of the modeset.
For eDP, this caching happens during the eDP initialization. This caching is done only for eDP and DP rev >= 1.4
v5:
* Fix the block comment (Gaurav)
* Use DRM_ERROR for dpcd_read fail (Gaurav,Anusha) v4:
* Cache these only for Gen >= 11
v3:
* Remove the dsc_sink_support field in intel_dp (Jani N) v2:
* Clear the cached registers on hotplug always (Jani N)
* Combine the eDP and DP caching in same function (Jani N)
--- drivers/gpu/drm/i915/intel_dp.c | 32 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + 2 files changed, 33 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +32 -0
@@ -3877,6 +3877,29 @@ intel_dp_read_dpcd(struct intel_dp *intel_dp)return intel_dp->dpcd[DP_DPCD_REV ] !=0 ; } +static void intel_dp_get_dsc_sink_cap (struct intel_dp *intel_dp) +{ +/* +*Clear the cached register set to avoid using stale values +* for the sinks that do not support DSC. +*/ +memset (intel_dp->dsc_dpcd,0 ,sizeof (intel_dp->dsc_dpcd)); + +/* Cache the DSC DPCD if eDP or DP rev >= 1.4 */ +if (intel_dp->dpcd[DP_DPCD_REV ] >=0x14 || + intel_dp->edp_dpcd[0 ] >=DP_EDP_14 ) { +if (drm_dp_dpcd_read (&intel_dp->aux,DP_DSC_SUPPORT , + intel_dp->dsc_dpcd, +sizeof (intel_dp->dsc_dpcd)) <0 ) +DRM_ERROR ("Failed to read DPCD register 0x%x\n" , +DP_DSC_SUPPORT ); + +DRM_DEBUG_KMS ("DSC DPCD: %*ph\n" , + (int )sizeof (intel_dp->dsc_dpcd), + intel_dp->dsc_dpcd); + } +} +static bool intel_edp_init_dpcd (struct intel_dp *intel_dp) {
@@ -3953,6 +3976,10 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)intel_dp_set_common_rates (intel_dp); +/* Read the eDP DSC DPCD registers */ +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) +intel_dp_get_dsc_sink_cap (intel_dp); +return true; }
@@ -4944,6 +4971,7 @@ intel_dp_long_pulse(struct intel_connector *connector)if (status == connector_status_disconnected) {memset (&intel_dp->compliance,0 ,sizeof (intel_dp->compliance)); +memset (intel_dp->dsc_dpcd,0 ,sizeof (intel_dp->dsc_dpcd));if (intel_dp->is_mst) { DRM_DEBUG_KMS("MST device may have disappeared %d vs %d\n",
@@ -4969,6 +4997,10 @@ intel_dp_long_pulse(struct intel_connector *connector)intel_dp_print_rates (intel_dp); +/* Read DP Sink DSC Cap DPCD regs for DP v1.4 */ +if (INTEL_GEN (dev_priv) >=11 ) +intel_dp_get_dsc_sink_cap (intel_dp); +drm_dp_read_desc (&intel_dp->aux, &intel_dp->desc,drm_dp_is_branch (intel_dp->dpcd));
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1070,6 +1070,7 @@ struct intel_dp {uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE ];uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS ];uint8_t edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE ]; +uint8_t dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ];/* source rates */ int num_source_rates;const int *source_rates;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/23 drm/dp: DRM DP helper/macros to get DP sink DSC parameters
In reply to Manasi NavareThis patch adds inline functions and helpers for obtaining DP sink's supported DSC parameters like DSC sink support, eDP compressed BPP supported, maximum slice count supported by the sink devices, DSC line buffer bit depth supported on DP sink, DSC sink maximum color depth by parsing corresponding DPCD registers.
v4:
* Add helper to give line buf bit depth (Manasi)
v3:
* Use SLICE_CAP_2 for DP (Anusha)
v2:
* Add DSC sink support macro (Jani N)
--- drivers/gpu/drm/drm_dp_helper.c | 89 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_dp_helper.h | 30 ++++++++++++++ 2 files changed, 119 insertions(+)
drivers/gpu/drm/drm_dp_helper.c +89 -0
@@ -1336,3 +1336,92 @@ int drm_dp_read_desc(struct drm_dp_aux *aux, struct drm_dp_desc *desc,return 0 ; }EXPORT_SYMBOL (drm_dp_read_desc); + +/** +* DRM DP Helpers for DSC +*/ +u8 drm_dp_dsc_sink_max_slice_count (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ], +bool is_edp) +{ +u8 slice_cap1 = dsc_dpcd[DP_DSC_SLICE_CAP_1 -DP_DSC_SUPPORT ]; + +if (is_edp) { +/* For eDP, register DSC_SLICE_CAPABILITIES_1 gives slice count */ +if (slice_cap1 &DP_DSC_4_PER_DP_DSC_SINK ) +return 4 ; +if (slice_cap1 &DP_DSC_2_PER_DP_DSC_SINK ) +return 2 ; +if (slice_cap1 &DP_DSC_1_PER_DP_DSC_SINK ) +return 1 ; + }else { +/* For DP, use values from DSC_SLICE_CAP_1 and DSC_SLICE_CAP2 */ +u8 slice_cap2 = dsc_dpcd[DP_DSC_SLICE_CAP_2 -DP_DSC_SUPPORT ]; + +if (slice_cap2 &DP_DSC_24_PER_DP_DSC_SINK ) +return 24 ; +if (slice_cap2 &DP_DSC_20_PER_DP_DSC_SINK ) +return 20 ; +if (slice_cap2 &DP_DSC_16_PER_DP_DSC_SINK ) +return 16 ; +if (slice_cap1 &DP_DSC_12_PER_DP_DSC_SINK ) +return 12 ; +if (slice_cap1 &DP_DSC_10_PER_DP_DSC_SINK ) +return 10 ; +if (slice_cap1 &DP_DSC_8_PER_DP_DSC_SINK ) +return 8 ; +if (slice_cap1 &DP_DSC_6_PER_DP_DSC_SINK ) +return 6 ; +if (slice_cap1 &DP_DSC_4_PER_DP_DSC_SINK ) +return 4 ; +if (slice_cap1 &DP_DSC_2_PER_DP_DSC_SINK ) +return 2 ; +if (slice_cap1 &DP_DSC_1_PER_DP_DSC_SINK ) +return 1 ; + } + +return 0 ; +} +EXPORT_SYMBOL (drm_dp_dsc_sink_max_slice_count); + +u8 drm_dp_dsc_sink_line_buf_depth (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ]) +{ +u8 line_buf_depth = dsc_dpcd[DP_DSC_LINE_BUF_BIT_DEPTH -DP_DSC_SUPPORT ]; + +switch (line_buf_depth &DP_DSC_LINE_BUF_BIT_DEPTH_MASK ) { +case DP_DSC_LINE_BUF_BIT_DEPTH_9 : +return 9 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_10 : +return 10 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_11 : +return 11 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_12 : +return 12 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_13 : +return 13 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_14 : +return 14 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_15 : +return 15 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_16 : +return 16 ; +case DP_DSC_LINE_BUF_BIT_DEPTH_8 : +return 8 ; + } + +return 0 ; +} +EXPORT_SYMBOL (drm_dp_dsc_sink_line_buf_depth); + +u8 drm_dp_dsc_sink_max_color_depth (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ]) +{ +switch (dsc_dpcd[DP_DSC_DEC_COLOR_DEPTH_CAP -DP_DSC_SUPPORT ]) { +case DP_DSC_12_BPC : +return 12 ; +case DP_DSC_10_BPC : +return 10 ; +case DP_DSC_8_BPC : +return 8 ; + } +return 0 ; +} +EXPORT_SYMBOL (drm_dp_dsc_sink_max_color_depth);
include/drm/drm_dp_helper.h +30 -0
@@ -1064,6 +1064,36 @@ drm_dp_is_branch(const u8 dpcd[DP_RECEIVER_CAP_SIZE])return dpcd[DP_DOWNSTREAMPORT_PRESENT ] &DP_DWN_STRM_PORT_PRESENT ; } +/* DP/eDP DSC support */ +u8 drm_dp_dsc_sink_max_slice_count (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ], +bool is_edp); +u8 drm_dp_dsc_sink_line_buf_depth (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ]); +u8 drm_dp_dsc_sink_max_color_depth (const u8 dsc_dpc[DP_DSC_RECEIVER_CAP_SIZE ]); + +static inline bool +drm_dp_sink_supports_dsc (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ]) +{ +return dsc_dpcd[DP_DSC_SUPPORT -DP_DSC_SUPPORT ] & +DP_DSC_DECOMPRESSION_IS_SUPPORTED ; +} + +static inline u16 +drm_edp_dsc_sink_output_bpp (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ]) +{ +return dsc_dpcd[DP_DSC_MAX_BITS_PER_PIXEL_LOW -DP_DSC_SUPPORT ] | + (dsc_dpcd[DP_DSC_MAX_BITS_PER_PIXEL_HI -DP_DSC_SUPPORT ] & +DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK << +DP_DSC_MAX_BITS_PER_PIXEL_HI_SHIFT ); +} + +static inline u32 +drm_dp_dsc_sink_max_slice_width (const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ]) +{ +/* Max Slicewidth = Number of Pixels * 320 */ +return dsc_dpcd[DP_DSC_MAX_SLICE_WIDTH -DP_DSC_SUPPORT ] * +DP_DSC_SLICE_WIDTH_MULTIPLIER ; +} +/* * DisplayPort AUX channel */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/23 drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC
In reply to Manasi NavareThis patch adds helpers for calculating the maximum compressed BPP supported with small joiner.
This also adds a helper for calculating the slice count in case of small joiner.
These are inside intel_dp since they take into account hardware limitations.
v5:
* Get the max slice width from DPCD
* Check against Min_Slice_width of 2560 (Anusha)
v4:
* #defines for PPR in slice count helper (Gaurav)
v3:
* Simply logic for bpp (DK)
* Limit the valid slice count by max supported by Sink (Manasi) v2:
* Change the small joiner RAM buffer constant as bspec changed (Manasi)
* rename it as SMALL_JOINER since we are not enabling big joiner yet (Anusha)
--- drivers/gpu/drm/i915/intel_dp.c | 103 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 4 ++ 2 files changed, 107 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +103 -0
@@ -45,6 +45,17 @@#define DP_DPRX_ESI_LEN 14 +/* DP DSC small joiner has 2 FIFOs each of 640 x 6 bytes */ +#define DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER 61440 + +/* DP DSC throughput values used for slice count calculations KPixels/s */ +#define DP_DSC_PEAK_PIXEL_RATE 2720000 +#define DP_DSC_MAX_ENC_THROUGHPUT_0 340000 +#define DP_DSC_MAX_ENC_THROUGHPUT_1 400000 + +/* DP DSC FEC Overhead factor = (100 - 2.4)/100 */ +#define DP_DSC_FEC_OVERHEAD_FACTOR 976 +/* Compliance test status bits */ #define INTEL_DP_RESOLUTION_SHIFT_MASK 0#define INTEL_DP_RESOLUTION_PREFERRED (1 << INTEL_DP_RESOLUTION_SHIFT_MASK)
@@ -93,6 +104,14 @@ static const struct dp_link_dpll chv_dpll[] = { { .p1 = 4, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } }, }; +/* Constants for DP DSC configurations */ +static const uint8_t valid_dsc_bpp[] = {6 ,8 ,10 ,12 ,15 }; + +/* With Single pipe configuration, HW is capable of supporting maximum +* of 4 slices per line. +*/ +static const uint8_t valid_dsc_slicecount[] = {1 ,2 ,4 }; +/** * intel_dp_is_edp - is the given port attached to an eDP panel (either CPU or PCH) * @intel_dp: DP struct
@@ -4087,6 +4106,90 @@ intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *sink_irq_vector)DP_DPRX_ESI_LEN ; } +uint16_t intel_dp_dsc_get_output_bpp (int link_clock,uint8_t lane_count, +int mode_clock,int mode_hdisplay) +{ +uint16_t bits_per_pixel, max_bpp_small_joiner_ram; +int i; + +/* +* Available Link Bandwidth(Kbits/sec) = (NumberOfLanes)* +* (LinkSymbolClock)* 8 * ((100-FECOverhead)/100)*(TimeSlotsPerMTP) +* FECOverhead = 2.4%, for SST -> TimeSlotsPerMTP is 1, +* for MST -> TimeSlotsPerMTP has to be calculated +*/ + bits_per_pixel = (link_clock * lane_count *8 * +DP_DSC_FEC_OVERHEAD_FACTOR ) / + (mode_clock *1000 ); + +/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ + max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / + mode_hdisplay; + +/* +* Greatest allowed DSC BPP = MIN (output BPP from avaialble Link BW +* check, output bpp from small joiner RAM check) +*/ + bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram); + +/* Error out if the max bpp is less than smallest allowed valid bpp */ +if (bits_per_pixel < valid_dsc_bpp[0 ]) { +DRM_DEBUG_KMS ("Unsupported BPP %d\n" , bits_per_pixel); +return 0 ; + } + +/* Find the nearest match in the array of known BPPs from VESA */ +for (i =0 ; i <ARRAY_SIZE (valid_dsc_bpp) -1 ; i++) { +if (bits_per_pixel < valid_dsc_bpp[i +1 ]) +break ; + } + bits_per_pixel = valid_dsc_bpp[i]; + +/* +* Compressed BPP in U6.4 format so multiply by 16, for Gen 11, +* fractional part is 0 */ +return bits_per_pixel <<4 ; +} + +uint8_t intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp, +int mode_clock, +int mode_hdisplay) +{ +uint8_t min_slice_count, i; +int max_slice_width; + +if (mode_clock <=DP_DSC_PEAK_PIXEL_RATE ) + min_slice_count =DIV_ROUND_UP (mode_clock, +DP_DSC_MAX_ENC_THROUGHPUT_0 ); +else + min_slice_count =DIV_ROUND_UP (mode_clock, +DP_DSC_MAX_ENC_THROUGHPUT_1 ); + + max_slice_width =drm_dp_dsc_sink_max_slice_width (intel_dp->dsc_dpcd); +if (max_slice_width <DP_DSC_MIN_SLICE_WIDTH_VALUE ) { +DRM_DEBUG_KMS ("Unsupported slice width %d by DP DSC Sink device\n" , + max_slice_width); +return 0 ; + } +/* Also take into account max slice width */ + min_slice_count =min_t (uint8_t, min_slice_count, +DIV_ROUND_UP (mode_hdisplay, + max_slice_width)); + +/* Find the closest match to the valid slice count values */ +for (i =0 ; i <ARRAY_SIZE (valid_dsc_slicecount); i++) { +if (valid_dsc_slicecount[i] > +drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, + false)) +break ; +if (min_slice_count <= valid_dsc_slicecount[i]) +return valid_dsc_slicecount[i]; + } + +DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count); +return 0 ; +} +static uint8_t intel_dp_autotest_link_training (struct intel_dp *intel_dp) {int status =0 ;
drivers/gpu/drm/i915/intel_drv.h +4 -0
@@ -1735,6 +1735,10 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);bool intel_dp_source_supports_hbr3 (struct intel_dp *intel_dp);bool intel_dp_get_link_status (struct intel_dp *intel_dp,uint8_t link_status[DP_LINK_STATUS_SIZE ]); +uint16_t intel_dp_dsc_get_output_bpp (int link_clock,uint8_t lane_count, +int mode_clock,int mode_hdisplay); +uint8_t intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock, +int mode_hdisplay);static inline unsigned int intel_dp_unused_lane_mask (int lane_count) {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/23 drm/i915/dp: Validate modes using max Output BPP and slice count when DSC supported
In reply to Manasi NavareWhen DSC is supported we need to validate the modes based on the maximum supported compressed BPP and maximum supported slice count. This allows us to allow the modes with pixel clock greater than the available link BW as long as it meets the compressed BPP and slice count requirements.
v3:
* Use the macro for dsc sink support (Jani N)
v2:
* Properly comment why we are right shifting the bpp value (Anusha)
--- drivers/gpu/drm/i915/intel_dp.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +26 -1
@@ -612,9 +612,12 @@ intel_dp_mode_valid(struct drm_connector *connector,struct intel_dp *intel_dp =intel_attached_dp (connector);struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode; +struct drm_i915_private *dev_priv =to_i915 (connector->dev);int target_clock = mode->clock;int max_rate, mode_rate, max_lanes, max_link_clock;int max_dotclk; +uint16_t dsc_max_output_bpp =0 ; +uint8_t dsc_slice_count =0 ;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;
@@ -637,7 +640,29 @@ intel_dp_mode_valid(struct drm_connector *connector, max_rate =intel_dp_max_data_rate (max_link_clock, max_lanes); mode_rate =intel_dp_link_required (target_clock,18 ); -if (mode_rate > max_rate || target_clock > max_dotclk) +/* +* Output bpp is stored in 6.4 format so right shift by 4 to get the +* integer value since we support only integer values of bpp. +*/ +if ((INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) && +drm_dp_sink_supports_dsc (intel_dp->dsc_dpcd)) { +if (intel_dp_is_edp (intel_dp)) { + dsc_max_output_bpp =drm_edp_dsc_sink_output_bpp (intel_dp->dsc_dpcd) >>4 ; + dsc_slice_count =drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, + true); + }else { + dsc_max_output_bpp =intel_dp_dsc_get_output_bpp (max_link_clock, + max_lanes, + target_clock, + mode->hdisplay) >>4 ; + dsc_slice_count =intel_dp_dsc_get_slice_count (intel_dp, + target_clock, + mode->hdisplay); + } + } + +if ((mode_rate > max_rate && !(dsc_max_output_bpp && dsc_slice_count)) || + target_clock > max_dotclk)return MODE_CLOCK_HIGH ;if (mode->clock <10000 )
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/23 drm/dp: Define payload size for DP SDP PPS packet
In reply to Manasi NavareDP 1.4 spec defines DP secondary data packet for DSC picture parameter set. This patch defines its payload size according to the DP 1.4 specification.
--- include/drm/drm_dp_helper.h | 1 + 1 file changed, 1 insertion(+)
include/drm/drm_dp_helper.h +1 -0
@@ -998,6 +998,7 @@ struct dp_sdp_header {#define EDP_SDP_HEADER_REVISION_MASK 0x1F#define EDP_SDP_HEADER_VALID_PAYLOAD_BYTES 0x1F +#define DP_SDP_PPS_HEADER_PAYLOAD_BYTES_MINUS_1 0x7Fstruct edp_vsc_psr {struct dp_sdp_header sdp_header;
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 7/23 drm/dsc: Define Display Stream Compression PPS infoframe
In reply to Manasi NavareThis patch defines a new header file for all the DSC 1.2 structures and creates a structure for PPS infoframe which will be used to send picture parameter set secondary data packet for display stream compression. All the PPS infoframe syntax elements are taken from DSC 1.2 specification from VESA.
--- include/drm/drm_dsc.h | 365 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 365 insertions(+) create mode 100644 include/drm/drm_dsc.h
include/drm/drm_dsc.h new file +365 -0
@@ -0,0 +1,365 @@ +/* +* Copyright (C) 2018 Intel Corp. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: +* Manasi Navare <[email protected]> +*/ + +#ifndef DRM_DSC_H_ +#define DRM_DSC_H_ + +#include <drm/drm_dp_helper.h> + +/* VESA Display Stream Compression DSC 1.2 constants */ +#define DSC_NUM_BUF_RANGES 15 + +/** +* struct picture_parameter_set - Represents 128 bytes of Picture Parameter Set +* +* The VESA DSC standard defines picture parameter set (PPS) which display +* stream compression encoders must communicate to decoders. +* The PPS is encapsulated in 128 bytes (PPS 0 through PPS 127). The fields in +* this structure are as per Table 4.1 in Vesa DSC specification v1.1/v1.2. +* The PPS fields that span over more than a byte should be stored in Big Endian +* format. +*/ +struct picture_parameter_set { +/** +* @dsc_version: +* PPS0[3:0] - dsc_version_minor: Contains Minor version of DSC +* PPS0[7:4] - dsc_version_major: Contains major version of DSC +*/ +u8 dsc_version; +/** +* @pps_identifier: +* PPS1[7:0] - Application specific identifier that can be +* used to differentiate between different PPS tables. +*/ +u8 pps_identifier; +/** +* @pps_reserved: +* PPS2[7:0]- RESERVED Byte +*/ +u8 pps_reserved; +/** +* @pps_3: +* PPS3[3:0] - linebuf_depth: Contains linebuffer bit depth used to +* generate the bitstream. (0x0 - 16 bits for DSC 1.2, 0x8 - 8 bits, +* 0xA - 10 bits, 0xB - 11 bits, 0xC - 12 bits, 0xD - 13 bits, +* 0xE - 14 bits for DSC1.2, 0xF - 14 bits for DSC 1.2. +* PPS3[7:4] - bits_per_component: Bits per component for the original +* pixels of the encoded picture. +* 0x0 = 16bpc (allowed only when dsc_version_minor = 0x2) +* 0x8 = 8bpc, 0xA = 10bpc, 0xC = 12bpc, 0xE = 14bpc (also +* allowed only when dsc_minor_version = 0x2) +*/ +u8 pps_3; +/** +* @pps_4: +* PPS4[1:0] -These are the most significant 2 bits of +* compressed BPP bits_per_pixel[9:0] syntax element. +* PPS4[2] - vbr_enable: 0 = VBR disabled, 1 = VBR enabled +* PPS4[3] - simple_422: Indicates if decoder drops samples to +* reconstruct the 4:2:2 picture. +* PPS4[4] - Convert_rgb: Indicates if DSC color space conversion is +* active. +* PPS4[5] - blobk_pred_enable: Indicates if BP is used to code any +* groups in picture +* PPS4[7:6] - Reseved bits +*/ +u8 pps_4; +/** +* @bits_per_pixel_low: +* PPS5[7:0] - This indicates the lower significant 8 bits of +* the compressed BPP bits_per_pixel[9:0] element. +*/ +u8 bits_per_pixel_low; +/** +* @pic_height: +* PPS6[7:0], PPS7[7:0] -pic_height: Specifies the number of pixel rows +* within the raster. +*/ +__be16 pic_height; +/** +* @pic_width: +* PPS8[7:0], PPS9[7:0] - pic_width: Number of pixel columns within +* the raster. +*/ +__be16 pic_width; +/** +* @slice_height: +* PPS10[7:0], PPS11[7:0] - Slice height in units of pixels. +*/ +__be16 slice_height; +/** +* @slice_width: +* PPS12[7:0], PPS13[7:0] - Slice width in terms of pixels. +*/ +__be16 slice_width; +/** +* @chunk_size: +* PPS14[7:0], PPS15[7:0] - Size in units of bytes of the chunks +* that are used for slice multiplexing. +*/ +__be16 chunk_size; +/** +* @initial_xmit_delay_high: +* PPS16[1:0] - Most Significant two bits of initial transmission delay. +* It specifies the number of pixel times that the encoder waits before +* transmitting data from its rate buffer. +* PPS16[7:2] - Reserved +*/ +u8 initial_xmit_delay_high; +/** +* @initial_xmit_delay_low: +* PPS17[7:0] - Least significant 8 bits of initial transmission delay. +*/ +u8 initial_xmit_delay_low; +/** +* @initial_dec_delay: +* +* PPS18[7:0], PPS19[7:0] - Initial decoding delay which is the number +* of pixel times that the decoder accumulates data in its rate buffer +* before starting to decode and output pixels. +*/ +__be16 initial_dec_delay; +/** +* @pps20_reserved: +* +* PPS20[7:0] - Reserved +*/ +u8 pps20_reserved; +/** +* @initial_scale_value: +* PPS21[5:0] - Initial rcXformScale factor used at beginning +* of a slice. +* PPS21[7:6] - Reserved +*/ +u8 initial_scale_value; +/** +* @scale_increment_interval: +* PPS22[7:0], PPS23[7:0] - Number of group times between incrementing +* the rcXformScale factor at end of a slice. +*/ +__be16 scale_increment_interval; +/** +* @scale_decrement_interval_high: +* PPS24[3:0] - Higher 4 bits indicating number of group times between +* decrementing the rcXformScale factor at beginning of a slice. +* PPS24[7:4] - Reserved +*/ +u8 scale_decrement_interval_high; +/** +* @scale_decrement_interval_low: +* PPS25[7:0] - Lower 8 bits of scale decrement interval +*/ +u8 scale_decrement_interval_low; +/** +* @pps26_reserved: +* PPS26[7:0] +*/ +u8 pps26_reserved; +/** +* @first_line_bpg_offset: +* PPS27[4:0] - Number of additional bits that are allocated +* for each group on first line of a slice. +* PPS27[7:5] - Reserved +*/ +u8 first_line_bpg_offset; +/** +* @nfl_bpg_offset: +* PPS28[7:0], PPS29[7:0] - Number of bits including frac bits +* deallocated for each group for groups after the first line of slice. +*/ +__be16 nfl_bpg_offset; +/** +* @slice_bpg_offset: +* PPS30, PPS31[7:0] - Number of bits that are deallocated for each +* group to enforce the slice constraint. +*/ +__be16 slice_bpg_offset; +/** +* @initial_offset: +* PPS32,33[7:0] - Initial value for rcXformOffset +*/ +__be16 initial_offset; +/** +* @final_offset: +* PPS34,35[7:0] - Maximum end-of-slice value for rcXformOffset +*/ +__be16 final_offset; +/** +* @flatness_min_qp: +* PPS36[4:0] - Minimum QP at which flatness is signaled and +* flatness QP adjustment is made. +* PPS36[7:5] - Reserved +*/ +u8 flatness_min_qp; +/** +* @flatness_max_qp: +* PPS37[4:0] - Max QP at which flatness is signalled and +* the flatness adjustment is made. +* PPS37[7:5] - Reserved +*/ +u8 flatness_max_qp; +/** +* @rc_model_size: +* PPS38,39[7:0] - Number of bits within RC Model. +*/ +__be16 rc_model_size; +/** +* @rc_edge_factor: +* PPS40[3:0] - Ratio of current activity vs, previous +* activity to determine presence of edge. +* PPS40[7:4] - Reserved +*/ +u8 rc_edge_factor; +/** +* @rc_quant_incr_limit0: +* PPS41[4:0] - QP threshold used in short term RC +* PPS41[7:5] - Reserved +*/ +u8 rc_quant_incr_limit0; +/** +* @rc_quant_incr_limit1: +* PPS42[4:0] - QP threshold used in short term RC +* PPS42[7:5] - Reserved +*/ +u8 rc_quant_incr_limit1; +/** +* @rc_tgt_offset: +* PPS43[3:0] - Lower end of the variability range around the target +* bits per group that is allowed by short term RC. +* PPS43[7:4]- Upper end of the variability range around the target +* bits per group that i allowed by short term rc. +*/ +u8 rc_tgt_offset; +/** +* @rc_buf_thresh: +* PPS44[7:0] - PPS57[7:0] - Specifies the thresholds in RC model for +* the 15 ranges defined by 14 thresholds. +*/ +u8 rc_buf_thresh[DSC_NUM_BUF_RANGES -1 ]; +/** +* @rc_range_parameters: +* PPS58[7:0] - PPS87[7:0] +* Parameters that correspond to each of the 15 ranges. +*/ +__be16 rc_range_parameters[DSC_NUM_BUF_RANGES ]; +/** +* @native_422_420: +* PPS88[0] - 0 = Native 4:2:2 not used +* 1 = Native 4:2:2 used +* PPS88[1] - 0 = Native 4:2:0 not use +* 1 = Native 4:2:0 used +* PPS88[7:2] - Reserved 6 bits +*/ +u8 native_422_420; +/** +* @second_line_bpg_offset: +* PPS89[4:0] - Additional bits/group budget for the +* second line of a slice in Native 4:2:0 mode. +* Set to 0 if DSC minor version is 1 or native420 is 0. +* PPS89[7:5] - Reserved +*/ +u8 second_line_bpg_offset; +/** +* @nsl_bpg_offset: +* PPS90[7:0], PPS91[7:0] - Number of bits that are deallocated +* for each group that is not in the second line of a slice. +*/ +__be16 nsl_bpg_offset; +/** +* @second_line_offset_adj: +* PPS92[7:0], PPS93[7:0] - Used as offset adjustment for the second +* line in Native 4:2:0 mode. +*/ +__be16 second_line_offset_adj; +/** +* @pps_long_94_reserved: +* PPS 94, 95, 96, 97 - Reserved +*/ +u32 pps_long_94_reserved; +/** +* @pps_long_98_reserved: +* PPS 98, 99, 100, 101 - Reserved +*/ +u32 pps_long_98_reserved; +/** +* @pps_long_102_reserved: +* PPS 102, 103, 104, 105 - Reserved +*/ +u32 pps_long_102_reserved; +/** +* @pps_long_106_reserved: +* PPS 106, 107, 108, 109 - reserved +*/ +u32 pps_long_106_reserved; +/** +* @pps_long_110_reserved: +* PPS 110, 111, 112, 113 - reserved +*/ +u32 pps_long_110_reserved; +/** +* @pps_long_114_reserved: +* PPS 114 - 117 - reserved +*/ +u32 pps_long_114_reserved; +/** +* @pps_long_118_reserved: +* PPS 118 - 121 - reserved +*/ +u32 pps_long_118_reserved; +/** +* @pps_long_122_reserved: +* PPS 122- 125 - reserved +*/ +u32 pps_long_122_reserved; +/** +* @pps_short_126_reserved: +* PPS 126, 127 - reserved +*/ +__be16 pps_short_126_reserved; +}; + +/** +* struct drm_dsc_pps_infoframe - DSC infoframe carrying the Picture Parameter +* Set Metadata +* +* This structure represents the DSC PPS infoframe required to send the Picture +* Parameter Set metadata required before enabling VESA Display Stream +* Compression. This is based on the DP Secondary Data Packet structure and +* comprises of SDP Header as defined in drm_dp_helper.h and PPS payload. +* +* @pps_header: +* +* Header for PPS as per DP SDP header format +* +* @pps_payload: +* +* PPS payload fields as per DSC specification Table 4-1 +*/ +struct drm_dsc_pps_infoframe { +struct dp_sdp_header pps_header; +struct picture_parameter_set pps_payload; +} __packed; + +#endif /* _DRM_DSC_H_ */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 8/23 drm/dsc: Define VESA Display Stream Compression Capabilities
In reply to Manasi NavareFrom: Gaurav K Singh <[email protected]>
This defines all the DSC parameters as per the VESA DSC spec that will be required for DSC encoder/decoder
v4 (From Manasi)
* Add the DSC_MUX_WORD_SIZE constants (Manasi)
v3 (From Manasi)
* Remove the duplicate define (Suggested By:Harry Wentland)
v2: Define this struct in DRM (From Manasi)
* Changed the data types to u8/u16 instead of unsigned longs (Manasi)
* Remove driver specific fields (Manasi)
* Move this struct definition to DRM (Manasi)
* Define DSC 1.2 parameters (Manasi)
* Use DSC_NUM_BUF_RANGES (Manasi)
* Call it drm_dsc_config (Manasi)
--- include/drm/drm_dsc.h | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+)
include/drm/drm_dsc.h +110 -0
@@ -30,6 +30,116 @@/* VESA Display Stream Compression DSC 1.2 constants */ #define DSC_NUM_BUF_RANGES 15 +#define DSC_MUX_WORD_SIZE_8_10_BPC 48 +#define DSC_MUX_WORD_SIZE_12_BPC 64 + +/* Configuration for a single Rate Control model range */ +struct dsc_rc_range_parameters { +/* Min Quantization Parameters allowed for this range */ +u8 range_min_qp; +/* Max Quantization Parameters allowed for this range */ +u8 range_max_qp; +/* Bits/group offset to apply to target for this group */ +u8 range_bpg_offset; +}; + +struct drm_dsc_config { +/* Bits / component for previous reconstructed line buffer */ +u8 line_buf_depth; +/* Bits per component to code (must be 8, 10, or 12) */ +u8 bits_per_component; +/* +* Flag indicating to do RGB - YCoCg conversion +* and back (should be 1 for RGB input) +*/ +bool convert_rgb; +u8 slice_count; +/* Slice Width */ +u16 slice_width; +/* Slice Height */ +u16 slice_height; +/* +* 4:2:2 enable mode (from PPS, 4:2:2 conversion happens +* outside of DSC encode/decode algorithm) +*/ +bool enable422; +/* Picture Width */ +u16 pic_width; +/* Picture Height */ +u16 pic_height; +/* Offset to bits/group used by RC to determine QP adjustment */ +u8 rc_tgt_offset_high; +/* Offset to bits/group used by RC to determine QP adjustment */ +u8 rc_tgt_offset_low; +/* Bits/pixel target << 4 (ie., 4 fractional bits) */ +u16 bits_per_pixel; +/* +* Factor to determine if an edge is present based +* on the bits produced +*/ +u8 rc_edge_factor; +/* Slow down incrementing once the range reaches this value */ +u8 rc_quant_incr_limit1; +/* Slow down incrementing once the range reaches this value */ +u8 rc_quant_incr_limit0; +/* Number of pixels to delay the initial transmission */ +u16 initial_xmit_delay; +/* Number of pixels to delay the VLD on the decoder,not including SSM */ +u16 initial_dec_delay; +/* Block prediction enable */ +bool block_pred_enable; +/* Bits/group offset to use for first line of the slice */ +u8 first_line_bpg_offset; +/* Value to use for RC model offset at slice start */ +u16 initial_offset; +/* Thresholds defining each of the buffer ranges */ +u16 rc_buf_thresh[DSC_NUM_BUF_RANGES -1 ]; +/* Parameters for each of the RC ranges */ +struct dsc_rc_range_parameters rc_range_params[DSC_NUM_BUF_RANGES ]; +/* Total size of RC model */ +u16 rc_model_size; +/* Minimum QP where flatness information is sent */ +u8 flatness_min_qp; +/* Maximum QP where flatness information is sent */ +u8 flatness_max_qp; +/* Initial value for scale factor */ +u8 initial_scale_value; +/* Decrement scale factor every scale_decrement_interval groups */ +u16 scale_decrement_interval; +/* Increment scale factor every scale_increment_interval groups */ +u16 scale_increment_interval; +/* Non-first line BPG offset to use */ +u16 nfl_bpg_offset; +/* BPG offset used to enforce slice bit */ +u16 slice_bpg_offset; +/* Final RC linear transformation offset value */ +u16 final_offset; +/* Enable on-off VBR (ie., disable stuffing bits) */ +bool vbr_enable; +/* Mux word size (in bits) for SSM mode */ +u8 mux_word_size; +/* +* The (max) size in bytes of the "chunks" that are +* used in slice multiplexing +*/ +u16 slice_chunk_size; +/* Rate Control buffer siz in bits */ +u16 rc_bits; +/* DSC Minor Version */ +u8 dsc_version_minor; +/* DSC Major version */ +u8 dsc_version_major; +/* Native 4:2:2 support */ +bool native_422; +/* Native 4:2:0 support */ +bool native_420; +/* Additional bits/grp for seconnd line of slice for native 4:2:0 */ +u8 second_line_bpg_offset; +/* Num of bits deallocated for each grp that is not in second line of slice */ +u16 nsl_bpg_offset; +/* Offset adj fr second line in Native 4:2:0 mode */ +u16 second_line_offset_adj; +};/** * struct picture_parameter_set - Represents 128 bytes of Picture Parameter Set
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 9/23 drm/dsc: Define Rate Control values that do not change over configurations
In reply to Manasi NavareFrom: "Srivatsa, Anusha" <[email protected]>
DSC has some Rate Control values that remain constant across all configurations. These are as per the DSC standard.
v3:
* Define them in drm_dsc.h as they are
DSC constants (Manasi)
v2:
* Add DP_DSC_ prefix (Jani Nikula)
--- include/drm/drm_dsc.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/drm/drm_dsc.h +6 -0
@@ -33,6 +33,12 @@#define DSC_MUX_WORD_SIZE_8_10_BPC 48#define DSC_MUX_WORD_SIZE_12_BPC 64 +/* DSC Rate Control Constants */ +#define DSC_RC_MODEL_SIZE_CONST 8192 +#define DSC_RC_EDGE_FACTOR_CONST 6 +#define DSC_RC_TGT_OFFSET_HI_CONST 3 +#define DSC_RC_TGT_OFFSET_LO_CONST 3 +/* Configuration for a single Rate Control model range */ struct dsc_rc_range_parameters {/* Min Quantization Parameters allowed for this range */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 10/23 drm/dsc: Add helpers for DSC picture parameter set infoframes
In reply to Manasi NavareAccording to Display Stream compression spec 1.2, the picture parameter set metadata is sent from source to sink device using the DP Secondary data packet. An infoframe is formed for the PPS SDP header and PPS SDP payload bytes. This patch adds helpers to fill the PPS SDP header and PPS SDP payload according to the DSC 1.2 specification.
v5:
Do not use bitfields for DRM structs (Jani N)
v4:
* Use DSC constants for params that dont change across configurations
v3:
* Add reference to added kernel-docs in Documentation/gpu/drm-kms-helpers.rst (Daniel Vetter)
v2:
* Add EXPORT_SYMBOL for the drm functions (Manasi)
--- Documentation/gpu/drm-kms-helpers.rst | 12 ++ drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_dsc.c | 221 ++++++++++++++++++++++++++++++++++ include/drm/drm_dsc.h | 22 ++++ 4 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/drm_dsc.c
Documentation/gpu/drm-kms-helpers.rst +12 -0
@@ -223,6 +223,18 @@ MIPI DSI Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_mipi_dsi.c :export: +Display Stream Compression Helper Functions Reference +===================================================== + +.. kernel-doc:: drivers/gpu/drm/drm_dsc.c + :doc: dsc helpers + +.. kernel-doc:: include/drm/drm_dsc.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_dsc.c + :export: + Output Probing Helper Functions Reference =========================================
drivers/gpu/drm/Makefile +1 -1
@@ -31,7 +31,7 @@ drm-$(CONFIG_AGP) += drm_agpsupport.o drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o -drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \ +drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper.o \ drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \ drm_kms_helper_common.o drm_dp_dual_mode_helper.o \ drm_simple_kms_helper.o drm_modeset_helper.o \
drivers/gpu/drm/drm_dsc.c new file +221 -0
221 lines not on this page · raw message
include/drm/drm_dsc.h +22 -0
@@ -26,6 +26,7 @@#ifndef DRM_DSC_H_ #define DRM_DSC_H_ +#include <linux/byteorder/generic.h> #include <drm/drm_dp_helper.h> /* VESA Display Stream Compression DSC 1.2 constants */
@@ -39,6 +40,23 @@#define DSC_RC_TGT_OFFSET_HI_CONST 3#define DSC_RC_TGT_OFFSET_LO_CONST 3 +/* DSC PPS constants and macros */ +#define DSC_PPS_VERSION_MAJOR_SHIFT 4 +#define DSC_PPS_BPC_SHIFT 4 +#define DSC_PPS_MSB_SHIFT 8 +#define DSC_PPS_LSB_MASK (0xFF << 0) +#define DSC_PPS_BPP_HIGH_MASK (0x3 << 8) +#define DSC_PPS_VBR_EN_SHIFT 2 +#define DSC_PPS_SIMPLE422_SHIFT 3 +#define DSC_PPS_CONVERT_RGB_SHIFT 4 +#define DSC_PPS_BLOCK_PRED_EN_SHIFT 5 +#define DSC_PPS_INIT_XMIT_DELAY_HIGH_MASK (0x3 << 8) +#define DSC_PPS_SCALE_DEC_INT_HIGH_MASK (0xF << 8) +#define DSC_PPS_RC_TGT_OFFSET_HI_SHIFT 4 +#define DSC_PPS_RC_RANGE_MINQP_SHIFT 11 +#define DSC_PPS_RC_RANGE_MAXQP_SHIFT 6 +#define DSC_PPS_NATIVE_420_SHIFT 1 +/* Configuration for a single Rate Control model range */ struct dsc_rc_range_parameters {/* Min Quantization Parameters allowed for this range */
@@ -478,4 +496,8 @@ struct drm_dsc_pps_infoframe { struct picture_parameter_set pps_payload; } __packed; +void drm_dsc_dp_pps_header_init (struct drm_dsc_pps_infoframe *pps_sdp); +void drm_dsc_pps_infoframe_pack (struct drm_dsc_pps_infoframe *pps_sdp, +struct drm_dsc_config *dsc_cfg); +#endif /* _DRM_DSC_H_ */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 11/23 drm/i915/dp: Add DSC params and DSC config to intel_crtc_state
In reply to Manasi NavareBasic DSC parameters and DSC configuration data needs to be computed for each of the requested mode during atomic check. This is required since for certain modes, valid DSC parameters and config data might not be computed in which case compression cannot be enabled for that mode.
For that reason we need to add these params and config structure to the intel_crtc_state so that if valid this state information can directly be used while enabling DSC in atomic commit.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_drv.h | 9 +++++++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -52,6 +52,7 @@#include <drm/drm_gem.h> #include <drm/drm_auth.h> #include <drm/drm_cache.h> +#include <drm/drm_dsc.h> #include "i915_params.h" #include "i915_reg.h"
drivers/gpu/drm/i915/intel_drv.h +9 -0
@@ -895,6 +895,15 @@ struct intel_crtc_state {/* output format is YCBCR 4:2:0 */ bool ycbcr420; + +/* Display Stream compression state */ +struct { +bool compression_enable; +bool dsc_split; +u16 compressed_bpp; +u8 slice_count; + } dsc_params; +struct drm_dsc_config dp_dsc_cfg; };struct intel_crtc {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/23 drm/i915/dp: Compute DSC pipe config in atomic check
In reply to Manasi NavareDSC params like the enable, compressed bpp, slice ocunt and dsc_split are added to the intel_crtc_state. These parameters are set based on the requested mode and available link parameters during the pipe configuration in atomic check phase. These values are then later used to populate the remaining DSC and RC parameters before enbaling DSC in atomic commit.
v6 (From Gaurav):
* Remove function call of intel_dp_compute_dsc_params() and invoke intel_dp_compute_dsc_params() in the patch where it is defined to fix compilation warning (Gaurav)
v5:
Add drm_dsc_cfg in intel_crtc_state (Manasi)
v4:
* Rebase on refactoring of intel_dp_compute_config on tip (Manasi)
* Add a comment why we need to check PSR while enabling DSC (Gaurav)
v3:
* Check PPR > max_cdclock to use 2 VDSC instances (Ville)
v2:
* Add if-else for eDP/DP (Gaurav)
--- drivers/gpu/drm/i915/intel_display.c | 28 ++++--- drivers/gpu/drm/i915/intel_display.h | 3 +- drivers/gpu/drm/i915/intel_dp.c | 141 +++++++++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- 4 files changed, 146 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/intel_display.c +18 -10
@@ -6460,7 +6460,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc, pipe_config->fdi_lanes = lane; -intel_link_compute_m_n (pipe_config->pipe_bpp, lane, fdi_dotclock, +intel_link_compute_m_n (pipe_config->pipe_bpp,0 , lane, fdi_dotclock, link_bw, &pipe_config->fdi_m_n, false); ret =ironlake_check_fdi_lanes (dev, intel_crtc->pipe, pipe_config);
@@ -6697,21 +6697,29 @@ static void compute_m_n(unsigned int m, unsigned int n, }void -intel_link_compute_m_n (int bits_per_pixel,int nlanes, +intel_link_compute_m_n (int bits_per_pixel,uint16_t compressed_bpp, +int nlanes,int pixel_clock,int link_clock,struct intel_link_m_n *m_n,bool reduce_m_n) { m_n->tu =64 ; -compute_m_n (bits_per_pixel * pixel_clock, - link_clock * nlanes *8 , - &m_n->gmch_m, &m_n->gmch_n, - reduce_m_n); - -compute_m_n (pixel_clock, link_clock, - &m_n->link_m, &m_n->link_n, - reduce_m_n); +/* For DSC, Data M/N calculation uses compressed BPP */ +if (compressed_bpp) +compute_m_n (compressed_bpp * pixel_clock, + link_clock * nlanes *8 , + &m_n->gmch_m, &m_n->gmch_n, + reduce_m_n); +else +compute_m_n (bits_per_pixel * pixel_clock, + link_clock * nlanes *8 , + &m_n->gmch_m, &m_n->gmch_n, + reduce_m_n); + +compute_m_n (pixel_clock, link_clock, + &m_n->link_m, &m_n->link_n, + reduce_m_n); }static inline bool intel_panel_use_ssc (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_display.h +2 -1
@@ -360,7 +360,8 @@ struct intel_link_m_n { (__i)++) \for_each_if (plane) -void intel_link_compute_m_n(int bpp, int nlanes, +void intel_link_compute_m_n(int bpp, uint16_t compressed_bpp, +int nlanes,int pixel_clock,int link_clock,struct intel_link_m_n *m_n,bool reduce_m_n);
drivers/gpu/drm/i915/intel_dp.c +125 -16
201 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp_mst.c +1 -1
@@ -83,7 +83,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,return false; } - intel_link_compute_m_n(bpp, lane_count, + intel_link_compute_m_n(bpp, 0, lane_count, adjusted_mode->crtc_clock, pipe_config->port_clock, &pipe_config->dp_m_n,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/dp: Compute DSC pipe config in atomic check
DSC params like the enable, compressed bpp, slice ocunt and dsc_split are added to the intel_crtc_state. These parameters are set based on the requested mode and available link parameters during the pipe configuration in atomic check phase. These values are then later used to populate the remaining DSC and RC parameters before enbaling DSC in atomic commit.
v7:
* Fix indentation in compute_m_n (Manasi)
v6 (From Gaurav):
* Remove function call of intel_dp_compute_dsc_params() and invoke intel_dp_compute_dsc_params() in the patch where it is defined to fix compilation warning (Gaurav)
v5:
Add drm_dsc_cfg in intel_crtc_state (Manasi)
v4:
* Rebase on refactoring of intel_dp_compute_config on tip (Manasi)
* Add a comment why we need to check PSR while enabling DSC (Gaurav)
v3:
* Check PPR > max_cdclock to use 2 VDSC instances (Ville)
v2:
* Add if-else for eDP/DP (Gaurav)
--- drivers/gpu/drm/i915/intel_display.c | 20 +++-- drivers/gpu/drm/i915/intel_display.h | 3 +- drivers/gpu/drm/i915/intel_dp.c | 141 +++++++++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- 4 files changed, 142 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_display.c +14 -6
@@ -6460,7 +6460,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc, pipe_config->fdi_lanes = lane; -intel_link_compute_m_n (pipe_config->pipe_bpp, lane, fdi_dotclock, +intel_link_compute_m_n (pipe_config->pipe_bpp,0 , lane, fdi_dotclock, link_bw, &pipe_config->fdi_m_n, false); ret =ironlake_check_fdi_lanes (dev, intel_crtc->pipe, pipe_config);
@@ -6697,17 +6697,25 @@ static void compute_m_n(unsigned int m, unsigned int n, }void -intel_link_compute_m_n (int bits_per_pixel,int nlanes, +intel_link_compute_m_n (int bits_per_pixel,uint16_t compressed_bpp, +int nlanes,int pixel_clock,int link_clock,struct intel_link_m_n *m_n,bool reduce_m_n) { m_n->tu =64 ; -compute_m_n (bits_per_pixel * pixel_clock, - link_clock * nlanes *8 , - &m_n->gmch_m, &m_n->gmch_n, - reduce_m_n); +/* For DSC, Data M/N calculation uses compressed BPP */ +if (compressed_bpp) +compute_m_n (compressed_bpp * pixel_clock, + link_clock * nlanes *8 , + &m_n->gmch_m, &m_n->gmch_n, + reduce_m_n); +else +compute_m_n (bits_per_pixel * pixel_clock, + link_clock * nlanes *8 , + &m_n->gmch_m, &m_n->gmch_n, + reduce_m_n); compute_m_n(pixel_clock, link_clock, &m_n->link_m, &m_n->link_n,
drivers/gpu/drm/i915/intel_display.h +2 -1
@@ -360,7 +360,8 @@ struct intel_link_m_n { (__i)++) \for_each_if (plane) -void intel_link_compute_m_n(int bpp, int nlanes, +void intel_link_compute_m_n(int bpp, uint16_t compressed_bpp, +int nlanes,int pixel_clock,int link_clock,struct intel_link_m_n *m_n,bool reduce_m_n);
drivers/gpu/drm/i915/intel_dp.c +125 -16
201 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp_mst.c +1 -1
@@ -83,7 +83,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,return false; } - intel_link_compute_m_n(bpp, lane_count, + intel_link_compute_m_n(bpp, 0, lane_count, adjusted_mode->crtc_clock, pipe_config->port_clock, &pipe_config->dp_m_n,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/23 drm/i915/dp: Do not enable PSR2 if DSC is enabled
In reply to Manasi NavareIf a eDP panel supports both PSR2 and VDSC, our HW cannot support both at a time. Give priority to PSR2 if a requested resolution can be supported without compression else enable VDSC and keep PSR2 disabled.
--- drivers/gpu/drm/i915/intel_psr.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_psr.c +10 -0
@@ -441,6 +441,16 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,if (!dev_priv->psr.sink_psr2_support)return false; +/* +* DSC and PSR2 cannot be enabled simultaneously. If a requested +* resolution requires DSC to be enabled, priority is given to DSC +* over PSR2. +*/ +if (crtc_state->dsc_params.compression_enable) { +DRM_DEBUG_KMS ("PSR2 cannot be enabled since DSC is enabled\n" ); +return false; + } +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) { psr_max_h =4096 ; psr_max_v =2304 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 13/23] drm/i915/dp: Do not enable PSR2 if DSC is enabled
Quoted 12 lines
-----Original Message-----
From: Navare, Manasi D
Sent: Monday, July 30, 2018 7:13 PM
To: [email protected]
Cc: [email protected]; [email protected]; Srivatsa, Anusha <[email protected]>; Singh, Gaurav K <[email protected]>; Navare, Manasi D <[email protected]>; Vivi, Rodrigo <[email protected]>; Nikula, Jani <[email protected]>
Subject: [PATCH 13/23] drm/i915/dp: Do not enable PSR2 if DSC is enabled
Quoted 3 lines
If a eDP panel supports both PSR2 and VDSC, our HW cannot support both at a time. Give priority to PSR2 if a requested resolution can be supported without compression else enable VDSC and keep PSR2 disabled.
Nit: Commit message uses VDSC and the comment below says DSC.
Quoted 4 lines
Cc Rodrigo Vivi <[email protected]>Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by Manasi Navare <[email protected]>
But the check is proper, ofc.
Quoted 27 lines
---
drivers/gpu/drm/i915/intel_psr.c| 10 ++++++++++1 file changed, 10 insertions(+)drivers/gpu/drm/i915/intel_psr.c +10
-0@@ -441,6 +441,16 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, if (!dev_priv->psr.sink_psr2_support)return false; +/* +* DSC and PSR2 cannot be enabled simultaneously. If a requested +* resolution requires DSC to be enabled, priority is given to DSC +* over PSR2. +*/ +if (crtc_state->dsc_params.compression_enable) { +DRM_DEBUG_KMS ("PSR2 cannot be enabled since DSC is enabled\n"); +return false; + } +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) {psr_max_h = 4096; psr_max_v = 2304;
Quoted 2 lines
--
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/23 drm/dsc: Define the DSC 1.1 and 1.2 Line Buffer depth constants
In reply to Manasi NavareFrom: Gaurav K Singh <[email protected]>
DSC specification defines linebuf_depth which contains the line buffer bit depth used to generate the bitstream. These values are defined as per Table 4.1 in DSC 1.2 spec
v2 (From Manasi):
* Rename as MAX_LINEBUF_DEPTH for DSC 1.1 and DSC 1.2
--- include/drm/drm_dsc.h | 3 +++ 1 file changed, 3 insertions(+)
include/drm/drm_dsc.h +3 -0
@@ -56,6 +56,9 @@#define DSC_PPS_RC_RANGE_MINQP_SHIFT 11#define DSC_PPS_RC_RANGE_MAXQP_SHIFT 6#define DSC_PPS_NATIVE_420_SHIFT 1 +#define DSC_1_2_MAX_LINEBUF_DEPTH_BITS 16 +#define DSC_1_2_MAX_LINEBUF_DEPTH_VAL 0 +#define DSC_1_1_MAX_LINEBUF_DEPTH_BITS 13/* Configuration for a single Rate Control model range */ struct dsc_rc_range_parameters {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RE: [PATCH 14/23] drm/dsc: Define the DSC 1.1 and 1.2 Line Buffer depth constants
Quoted 18 lines
-----Original Message-----
From: Navare, Manasi D
Sent: Monday, July 30, 2018 7:13 PM
To: [email protected]
Cc: [email protected]; [email protected]; Srivatsa, Anusha <[email protected]>; Singh, Gaurav K <[email protected]>; dri- [email protected]; Navare, Manasi D <[email protected]>
Subject: [PATCH 14/23] drm/dsc: Define the DSC 1.1 and 1.2 Line Buffer depth constantsFrom: Gaurav K Singh <[email protected]>
DSC specification defines
linebuf_depthwhich contains the line buffer bit depth used to generate the bitstream.
These values are defined as per Table 4.1 in DSC 1.2 spec
Quoted 8 lines
v2 (From Manasi):
* Rename asMAX_LINEBUF_DEPTHfor DSC 1.1 and DSC 1.2Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Manasi Navare <[email protected]>
Quoted 19 lines
---
include/drm/drm_dsc.h| 3 +++1 file changed, 3 insertions(+)include/drm/drm_dsc.h index renamed from include/drm/drm_dsc.h +0
-030adc15..4cfcd03 100644
include/drm/drm_dsc.h +3
-1@@ -56,6 +56,9 @@#define DSC_PPS_RC_RANGE_MINQP_SHIFT 11#define DSC_PPS_RC_RANGE_MAXQP_SHIFT 6#define DSC_PPS_NATIVE_420_SHIFT 1 +#define DSC_1_2_MAX_LINEBUF_DEPTH_BITS 16 +#define DSC_1_2_MAX_LINEBUF_DEPTH_VAL 0 +#define DSC_1_1_MAX_LINEBUF_DEPTH_BITS 13/* Configuration for a single Rate Control model range */ struct dsc_rc_range_parameters { --
Quoted 1 line
2.7.4
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 15/23 drm/i915/dsc: Define & Compute VESA DSC params
In reply to Manasi NavareFrom: Gaurav K Singh <[email protected]>
This patches does the following:
1. This patch defines all the DSC parameters as per the VESA DSC specification. These are stored in the encoder and used to compute the PPS parameters to be sent to the Sink.
2. Compute all the DSC parameters which are derived from DSC state of intel_crtc_state.
3. Compute all parameters that are VESA DSC specific
This computation happens in the atomic check phase during compute_config() to validate if display stream compression can be enabled for the requested mode.
v5 (From Manasi):
* Add logic to limit the max line buf depth for DSC 1.1 to 13 as per DSC 1.1 spec
v4 (From Gaurav):
* Rebase on latest drm tip
* rename variable name(Manasi)
* Populate linebuf_depth variable(Manasi)
v3 (From Gaurav):
* Rebase my previous patches on top of Manasi's latest patch series
* Using >>n rather than /2^n (Manasi)
* Change the commit message to explain what the patch is doing(Gaurav)
Fixed review comments from Ville:
* Don't use macro TWOS_COMPLEMENT
* Mention in comment about the source of RC params
* Return directly from case statements
* Using single asssignment for assigning rc_range_params
* Using <<n rather than *2^n and removing the comments about the fixed point numbers
v2 (From Manasi):
* Update logic for minor version to consider the dpcd value and what supported by the HW platform
* Use DRM DSC config struct instead of intel_dp struct
* Move the DSC constants to DRM DSC header file
* Use u16, u8 where bigger data types not needed
* * Compute the DSC parameters as part of DSC compute config since the computation can fail (Manasi)
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/intel_dp.c | 7 + drivers/gpu/drm/i915/intel_drv.h | 4 + drivers/gpu/drm/i915/intel_vdsc.c | 459 ++++++++++++++++++++++++++++++++++++++ include/drm/drm_dp_helper.h | 3 + include/drm/drm_dsc.h | 2 +- 6 files changed, 476 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_vdsc.c
drivers/gpu/drm/i915/Makefile +2 -1
@@ -153,7 +153,8 @@ i915-y += dvo_ch7017.o \ intel_sdvo.o \ intel_tv.o \ vlv_dsi.o \ - vlv_dsi_pll.o + vlv_dsi_pll.o \ + intel_vdsc.o # Post-mortem debug and GPU hang state capture i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
drivers/gpu/drm/i915/intel_dp.c +7 -0
@@ -2042,6 +2042,13 @@ static bool intel_dp_dsc_compute_config(struct intel_dp *intel_dp,return false; } } +if (intel_dp_compute_dsc_params (intel_dp, pipe_config) <0 ) { +DRM_ERROR ("Cannot compute valid DSC parameters for Input Bpp = %d" +"Compressed BPP = %d\n" , + pipe_config->pipe_bpp, + pipe_config->dsc_params.compressed_bpp); +return false; + } pipe_config->dsc_params.compression_enable = true; DRM_DEBUG_KMS("DP DSC computed with Input Bpp = %d " "Compressed Bpp = %d Slice Count = %d\n",
drivers/gpu/drm/i915/intel_drv.h +4 -0
@@ -1749,6 +1749,10 @@ uint16_t intel_dp_dsc_get_output_bpp(int link_clock, uint8_t lane_count,uint8_t intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock,int mode_hdisplay); +/* intel_vdsc.c */ +int intel_dp_compute_dsc_params (struct intel_dp *intel_dp, +struct intel_crtc_state *pipe_config); +static inline unsigned int intel_dp_unused_lane_mask (int lane_count) {return ~((1 << lane_count) -1 ) &0xf ;
drivers/gpu/drm/i915/intel_vdsc.c new file +459 -0
459 lines not on this page · raw message
include/drm/drm_dp_helper.h +3 -0
@@ -186,6 +186,9 @@#define DP_GUID 0x030/* 1.2 */ +#define DP_DSC_RC_PIXELS_PER_GROUP 3 +#define DP_DSC_SCALE_DECREMENT_INTERVAL_MAX 4095 +#define DP_DSC_SUPPORT 0x060/* DP 1.4 */ # define DP_DSC_DECOMPRESSION_IS_SUPPORTED (1 << 0)
include/drm/drm_dsc.h +1 -1
@@ -67,7 +67,7 @@ struct dsc_rc_range_parameters {/* Max Quantization Parameters allowed for this range */ u8 range_max_qp;/* Bits/group offset to apply to target for this group */ -u8 range_bpg_offset; +s8 range_bpg_offset; };struct drm_dsc_config {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 16/23 drm/i915/dsc: Compute Rate Control parameters for DSC
In reply to Manasi NavareFrom: Gaurav K Singh <[email protected]>
This computation of RC params happens in the atomic commit phase during compute_config() to validate if display stream compression can be enabled for the requested mode.
v4(From Gaurav):
* No change.Rebase on drm-tip
v3 (From Gaurav):
* Rebase on top of Manasi's latest series
* Return -ve value in case of failure scenarios (Manasi)
Fix review comments from Ville:
* Remove unnecessary comments
* Remove unnecessary paranthesis
* Add comments for few RC params calculations
v2 (From Manasi):
* Rebase Gaurav's patch from intel-gfx to gfx-internal
* Use struct drm_dsc_cfg instead of struct intel_dp as a parameter
--- drivers/gpu/drm/i915/intel_vdsc.c | 129 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+)
drivers/gpu/drm/i915/intel_vdsc.c +129 -0
@@ -335,6 +335,132 @@ static int get_column_index_for_rc_params(u8 bits_per_component) } } +static int intel_compute_rc_parameters (struct drm_dsc_config *vdsc_cfg) +{ +unsigned long groups_per_line =0 ; +unsigned long groups_total =0 ; +unsigned long num_extra_mux_bits =0 ; +unsigned long slice_bits =0 ; +unsigned long hrd_delay =0 ; +unsigned long final_scale =0 ; +unsigned long rbs_min =0 ; + +/* RC_MODEL_SIZE is a constant across all configurations */ + vdsc_cfg->rc_model_size =DSC_RC_MODEL_SIZE_CONST ; +/* Number of groups used to code each line of a slice */ + groups_per_line =DIV_ROUND_UP (vdsc_cfg->slice_width, +DP_DSC_RC_PIXELS_PER_GROUP ); + +/* chunksize in Bytes */ + vdsc_cfg->slice_chunk_size =DIV_ROUND_UP (vdsc_cfg->slice_width * + vdsc_cfg->bits_per_pixel,8 ); + +if (vdsc_cfg->convert_rgb) + num_extra_mux_bits =3 * + (vdsc_cfg->mux_word_size + + (4 * vdsc_cfg->bits_per_component +4 ) -2 ); +else + num_extra_mux_bits =3 * vdsc_cfg->mux_word_size + + (4 * vdsc_cfg->bits_per_component +4 ) + +2 * (4 * vdsc_cfg->bits_per_component) -2 ; +/* Number of bits in one Slice */ + slice_bits =8 * vdsc_cfg->slice_chunk_size * vdsc_cfg->slice_height; + +while ((num_extra_mux_bits >0 ) && + ((slice_bits - num_extra_mux_bits) % vdsc_cfg->mux_word_size)) + num_extra_mux_bits--; + +if (groups_per_line < vdsc_cfg->initial_scale_value -8 ) + vdsc_cfg->initial_scale_value = groups_per_line +8 ; + +/* scale_decrement_interval calculation according to DSC spec 1.11 */ +if (vdsc_cfg->initial_scale_value >8 ) + vdsc_cfg->scale_decrement_interval = groups_per_line / + (8 * vdsc_cfg->initial_scale_value -8 ); +else + vdsc_cfg->scale_decrement_interval = +DP_DSC_SCALE_DECREMENT_INTERVAL_MAX ; + + vdsc_cfg->final_offset = vdsc_cfg->rc_model_size - + (vdsc_cfg->initial_xmit_delay * + vdsc_cfg->bits_per_pixel) + num_extra_mux_bits; + +if (vdsc_cfg->final_offset >= vdsc_cfg->rc_model_size) { +DRM_ERROR ("FinalOfs < RcModelSze for this InitialXmitDelay\n" ); +return -1 ; + } + + final_scale = (vdsc_cfg->rc_model_size <<3 ) / + (vdsc_cfg->rc_model_size - vdsc_cfg->final_offset); +if (vdsc_cfg->slice_height >1 ) +/* +* NflBpgOffset is 16 bit value with 11 fractional bits +* hence we multiply by 2^11 for preserving the +* fractional part +*/ + vdsc_cfg->nfl_bpg_offset =DIV_ROUND_UP ( + (vdsc_cfg->first_line_bpg_offset <<11 ), + (vdsc_cfg->slice_height -1 )); +else + vdsc_cfg->nfl_bpg_offset =0 ; + +/* 2^16 - 1 */ +if (vdsc_cfg->nfl_bpg_offset >65535 ) { +DRM_ERROR ("NflBpgOffset is too large for this slice height\n" ); +return -1 ; + } + +/* Number of groups used to code the entire slice */ + groups_total = groups_per_line * vdsc_cfg->slice_height; + +/* slice_bpg_offset is 16 bit value with 11 fractional bits */ + vdsc_cfg->slice_bpg_offset =DIV_ROUND_UP ( + ((vdsc_cfg->rc_model_size - vdsc_cfg->initial_offset + + num_extra_mux_bits) <<11 ), groups_total); + +if (final_scale >0x9 ) { +/* +* ScaleIncrementInterval = +* finaloffset/((NflBpgOffset + SliceBpgOffset)*8(finalscale - 1.125)) +* as (NflBpgOffset + SliceBpgOffset) has 11 bit fractional value, +* we need divide by 2^11 from pstDscCfg values +*/ + vdsc_cfg->scale_increment_interval = + (vdsc_cfg->final_offset * (1 <<11 )) / + ((vdsc_cfg->nfl_bpg_offset + + vdsc_cfg->slice_bpg_offset)* + (final_scale -9 )); + }else { +/* +* If finalScaleValue is less than or equal to 9, a value of 0 should +* be used to disable the scale increment at the end of the slice +*/ + vdsc_cfg->scale_increment_interval =0 ; + } + +if (vdsc_cfg->scale_increment_interval >65535 ) { +DRM_ERROR ("ScaleIncrementInterval is large for slice height\n" ); +return -1 ; + } + +/* +* DSC spec mentions that bits_per_pixel specifies the target +* bits/pixel (bpp) rate that is used by the encoder, +* in steps of 1/16 of a bit per pixel +*/ + rbs_min = vdsc_cfg->rc_model_size - vdsc_cfg->initial_offset + +DIV_ROUND_UP (vdsc_cfg->initial_xmit_delay * + vdsc_cfg->bits_per_pixel,16 ) + + groups_per_line * vdsc_cfg->first_line_bpg_offset; + + hrd_delay =DIV_ROUND_UP ((rbs_min *16 ), vdsc_cfg->bits_per_pixel); + vdsc_cfg->rc_bits = (hrd_delay * vdsc_cfg->bits_per_pixel) /16 ; + vdsc_cfg->initial_dec_delay = hrd_delay - vdsc_cfg->initial_xmit_delay; + +return 0 ; +} + +int intel_dp_compute_dsc_params (struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config) {
@@ -455,5 +581,8 @@ int intel_dp_compute_dsc_params(struct intel_dp *intel_dp, vdsc_cfg->initial_scale_value = (vdsc_cfg->rc_model_size <<3 ) / (vdsc_cfg->rc_model_size - vdsc_cfg->initial_offset); +if (intel_compute_rc_parameters (vdsc_cfg) <0 ) +return -1 ; +return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 17/23 drm/i915/dp: Enable/Disable DSC in DP Sink
In reply to Manasi NavareFrom: Gaurav K Singh <[email protected]>
This patch enables decompression support in sink device before link training and disables the same during the DDI disabling.
v2:(From Manasi)
* Change the enable/disable function to take crtc_state instead of intel_dp as an argument (Manasi)
* Use the compression_enable flag as part of crtc_state (Manasi)
--- drivers/gpu/drm/i915/intel_ddi.c | 5 +++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 3 +++ 3 files changed, 23 insertions(+)
drivers/gpu/drm/i915/intel_ddi.c +5 -0
@@ -2825,6 +2825,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,intel_ddi_init_dp_buf_reg (encoder);if (!is_mst)intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); +intel_dp_sink_set_decompression_state (intel_dp, crtc_state, +DP_DECOMPRESSION_EN );intel_dp_start_link_train (intel_dp);if (port !=PORT_A ||INTEL_GEN (dev_priv) >=9 )intel_dp_stop_link_train (intel_dp);
@@ -3154,6 +3156,9 @@ static void intel_disable_ddi_dp(struct intel_encoder *encoder,intel_edp_drrs_disable (intel_dp, old_crtc_state);intel_psr_disable (intel_dp, old_crtc_state);intel_edp_backlight_off (old_conn_state); +/* Disable the decompression in DP Sink */ +intel_dp_sink_set_decompression_state (intel_dp, old_crtc_state, + ~DP_DECOMPRESSION_EN ); } static void intel_disable_ddi_hdmi(struct intel_encoder *encoder,
drivers/gpu/drm/i915/intel_dp.c +15 -0
@@ -2925,6 +2925,21 @@ static bool downstream_hpd_needs_d0(struct intel_dp *intel_dp) intel_dp->downstream_ports[0 ] &DP_DS_PORT_HPD ; } +void intel_dp_sink_set_decompression_state (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state, +int state) +{ +int ret; + +if (!crtc_state->dsc_params.compression_enable) +return ; + + ret =drm_dp_dpcd_writeb (&intel_dp->aux,DP_DSC_ENABLE , state); +if (ret <0 ) +DRM_DEBUG_KMS ("Failed to %s sink decompression state\n" , + state ==DP_DECOMPRESSION_EN ?"enable" :"disable" ); +} +/* If the sink supports it, try to set the power state appropriately */ void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode) {
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1691,6 +1691,9 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp);int intel_dp_retrain_link (struct intel_encoder *encoder,struct drm_modeset_acquire_ctx *ctx);void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode); +void intel_dp_sink_set_decompression_state (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state, +int state);void intel_dp_encoder_reset (struct drm_encoder *encoder);void intel_dp_encoder_suspend (struct intel_encoder *intel_encoder);void intel_dp_encoder_destroy (struct drm_encoder *encoder);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 17/23] drm/i915/dp: Enable/Disable DSC in DP Sink
Quoted 21 lines
-----Original Message-----
From: Navare, Manasi D
Sent: Monday, July 30, 2018 7:13 PM
To: [email protected]
Cc: [email protected]; [email protected]; Srivatsa, Anusha <[email protected]>; Singh, Gaurav K <[email protected]>; Navare, Manasi D <[email protected]>
Subject: [PATCH 17/23] drm/i915/dp: Enable/Disable DSC in DP SinkFrom: Gaurav K Singh <[email protected]>
This patch enables decompression support in sink device before link training and disables the same during the DDI disabling.
v2:(From Manasi)
* Change the enable/disable function to takecrtc_stateinstead ofintel_dpas an argument (Manasi)
* Use thecompression_enableflag as part ofcrtc_state(Manasi)
Quoted 6 lines
Cc Jani Nikula <[email protected]>Cc Ville Syrjala <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Gaurav K Singh <[email protected]>Signed-off-by Gaurav K Singh <[email protected]>Signed-off-by Manasi Navare <[email protected]>
Looks good.
Quoted 68 lines
---
drivers/gpu/drm/i915/intel_ddi.c| 5 +++++drivers/gpu/drm/i915/intel_dp.c| 15 +++++++++++++++drivers/gpu/drm/i915/intel_drv.h| 3 +++3 files changed, 23 insertions(+)drivers/gpu/drm/i915/intel_ddi.c +2
-0@@ -2825,6 +2825,8 @@ static void intel_ddi_pre_enable_dp(structintel_encoder *encoder,intel_ddi_init_dp_buf_reg (encoder );if (!is_mst)intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); +intel_dp_sink_set_decompression_state (intel_dp, crtc_state, +DP_DECOMPRESSION_EN );intel_dp_start_link_train (intel_dp);if (port !=PORT_A ||INTEL_GEN (dev_priv) >=9 )intel_dp_stop_link_train(intel_dp);drivers/gpu/drm/i915/intel_ddi.c +3
-0@@ -3154,6 +3156,9 @@ static void intel_disable_ddi_dp(struct intel_encoder *encoder,intel_edp_drrs_disable (intel_dp, old_crtc_state);intel_psr_disable (intel_dp, old_crtc_state);intel_edp_backlight_off (old_conn_state); +/* Disable the decompression in DP Sink */ +intel_dp_sink_set_decompression_state (intel_dp, old_crtc_state, + ~DP_DECOMPRESSION_EN ); }static void intel_disable_ddi_hdmi(struct
intel_encoder*encoder, diff --gita/drivers/gpu/drm/i915/intel_dp.cb/drivers/gpu/drm/i915/intel_dp.cindex d7fc50f..436cbfb 100644drivers/gpu/drm/i915/intel_dp.c +14
-0@@ -2925,6 +2925,21 @@ static bool downstream_hpd_needs_d0(struct intel_dp *intel_dp) intel_dp->downstream_ports[0] & DP_DS_PORT_HPD; } +void intel_dp_sink_set_decompression_state (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state, +int state) +{ +int ret; + +if (!crtc_state->dsc_params.compression_enable) +return ; + + ret =drm_dp_dpcd_writeb (&intel_dp->aux,DP_DSC_ENABLE , state); +if (ret <0 ) +DRM_DEBUG_KMS ("Failed to %s sink decompression state\n" , + state ==DP_DECOMPRESSION_EN ?"enable" :"disable" ); } +/* If the sink supports it, try to set the power state appropriately */ void
intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode){ diff --gita/drivers/gpu/drm/i915/intel_drv.hb/drivers/gpu/drm/i915/intel_drv.hindex 01ab23d..85b6a37 100644drivers/gpu/drm/i915/intel_drv.h +3
-0@@ -1691,6 +1691,9 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp); int intel_dp_retrain_link(struct intel_encoder *encoder,struct drm_modeset_acquire_ctx *ctx);void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode); +void intel_dp_sink_set_decompression_state (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state, +int state);
Quoted 5 lines
void
intel_dp_encoder_reset(struct drm_encoder *encoder); voidintel_dp_encoder_suspend(struct intel_encoder *intel_encoder); voidintel_dp_encoder_destroy(struct drm_encoder *encoder);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 18/23 drm/i915/dp: Configure i915 Picture parameter Set registers during DSC enabling
In reply to Manasi NavareAfter encoder->pre_enable() hook, after link training sequence is completed, PPS registers for DSC encoder are configured using the DSC state parameters in intel_crtc_state as part of DSC enabling routine in the source. DSC enabling routine is called after encoder->pre_enable() before enbaling the pipe and after compression is enabled on the sink.
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_display.c | 6 + drivers/gpu/drm/i915/intel_vdsc.c | 417 +++++++++++++++++++++++++++++++++++ 3 files changed, 425 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -3425,6 +3425,8 @@ extern void intel_init_pch_refclk(struct drm_i915_private *dev_priv);extern int intel_set_rps (struct drm_i915_private *dev_priv,u8 val);extern bool intel_set_memory_cxsr (struct drm_i915_private *dev_priv,bool enable); +extern void intel_dsc_enable (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state);int i915_reg_read_ioctl (struct drm_device *dev,void *data,struct drm_file *file);
drivers/gpu/drm/i915/intel_display.c +6 -0
@@ -5410,6 +5410,12 @@ static void intel_encoders_pre_enable(struct drm_crtc *crtc,if (encoder->pre_enable) encoder->pre_enable (encoder, crtc_state, conn_state); + +/* +* Enable and Configure Display Stream Compression in the source +* if enabled in intel_crtc_state. +*/ +intel_dsc_enable (encoder, crtc_state); } }
drivers/gpu/drm/i915/intel_vdsc.c +417 -0
420 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 19/23 drm/i915/dp: Use the existing write_infoframe() for DSC PPS SDPs
In reply to Manasi NavareInfoframes are used to send secondary data packets. This patch adds support for DSC Picture parameter set secondary data packets in the existing write_infoframe helpers.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4658,6 +4658,7 @@ enum {* of the infoframe structure specified by CEA-861. */ #define VIDEO_DIP_DATA_SIZE 32#define VIDEO_DIP_VSC_DATA_SIZE 36 +#define VIDEO_DIP_PPS_DATA_SIZE 132#define VIDEO_DIP_CTL _MMIO(0x61170)/* Pre HSW: */ #define VIDEO_DIP_ENABLE (1 << 31)
drivers/gpu/drm/i915/intel_hdmi.c +21 -2
@@ -115,6 +115,8 @@ static u32 hsw_infoframe_enable(unsigned int type)switch (type) {case DP_SDP_VSC :return VIDEO_DIP_ENABLE_VSC_HSW ; +case DP_SDP_PPS : +return VDIP_ENABLE_PPS ;case HDMI_INFOFRAME_TYPE_AVI :return VIDEO_DIP_ENABLE_AVI_HSW ;case HDMI_INFOFRAME_TYPE_SPD :
@@ -136,6 +138,8 @@ hsw_dip_data_reg(struct drm_i915_private *dev_priv,switch (type) {case DP_SDP_VSC :return HSW_TVIDEO_DIP_VSC_DATA (cpu_transcoder, i); +case DP_SDP_PPS : +return ICL_VIDEO_DIP_PPS_DATA (cpu_transcoder, i);case HDMI_INFOFRAME_TYPE_AVI :return HSW_TVIDEO_DIP_AVI_DATA (cpu_transcoder, i);case HDMI_INFOFRAME_TYPE_SPD :
@@ -148,6 +152,18 @@ hsw_dip_data_reg(struct drm_i915_private *dev_priv, } } +static int hsw_dip_data_size (unsigned int type) +{ +switch (type) { +case DP_SDP_VSC : +return VIDEO_DIP_VSC_DATA_SIZE ; +case DP_SDP_PPS : +return VIDEO_DIP_PPS_DATA_SIZE ; +default : +return VIDEO_DIP_DATA_SIZE ; + } +} + static void g4x_write_infoframe(struct drm_encoder *encoder, const struct intel_crtc_state *crtc_state, unsigned int type,
@@ -390,11 +406,14 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t ctl_reg =HSW_TVIDEO_DIP_CTL (cpu_transcoder); -int data_size = type ==DP_SDP_VSC ? -VIDEO_DIP_VSC_DATA_SIZE :VIDEO_DIP_DATA_SIZE ; +i915_reg_t data_reg; +int data_size =0 ;int i;u32 val =I915_READ (ctl_reg); + data_size =hsw_dip_data_size (type); + data_reg =hsw_dip_data_reg (dev_priv, cpu_transcoder, type,0 ); + val &= ~hsw_infoframe_enable (type);I915_WRITE (ctl_reg, val);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 20/23 drm/i915/dp: Populate DSC PPS SDP and send PPS infoframes
In reply to Manasi NavareDSC PPS secondary data packet infoframes are filled with DSC picure parameter set metadata according to the DSC standard. These infoframes are sent to the sink device and used during DSC decoding.
--- drivers/gpu/drm/i915/intel_vdsc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/gpu/drm/i915/intel_vdsc.c +21 -0
@@ -992,6 +992,25 @@ static void intel_configure_pps_for_dsc_encoder(struct intel_encoder *encoder, } } +static void intel_dp_send_dsc_pps_sdp (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state) +{ +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_dsc_config *vdsc_cfg = &crtc_state->dp_dsc_cfg; +struct drm_dsc_pps_infoframe dp_dsc_pps_sdp; + +/* Prepare DP SDP PPS header as per DP 1.4 spec, Table 2-123 */ +drm_dsc_dp_pps_header_init (&dp_dsc_pps_sdp); + +/* Fill the PPS payload bytes as per DSC spec 1.2 Table 4-1 */ +drm_dsc_pps_infoframe_pack (&dp_dsc_pps_sdp, vdsc_cfg); + + intel_dig_port->write_infoframe (&encoder->base, crtc_state, +DP_SDP_PPS , &dp_dsc_pps_sdp, +sizeof (dp_dsc_pps_sdp)); +} +void intel_dsc_enable (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) {
@@ -1001,5 +1020,7 @@ void intel_dsc_enable(struct intel_encoder *encoder,intel_configure_pps_for_dsc_encoder (encoder, crtc_state); +intel_dp_send_dsc_pps_sdp (encoder, crtc_state); +return ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 21/23 drm/i915/icl: Add Display Stream Splitter control registers
In reply to Manasi NavareFrom: "Srivatsa, Anusha" <[email protected]>
Add defines for DSS_CTL registers.
These registers specify the big joiner, splitter, overlap pixels and info regarding display stream compression enabled on left or right branch.
v2:
- Add define to conditionally check the buffer target depth (James Ausmus)
--- drivers/gpu/drm/i915/i915_reg.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +33 -0
@@ -7792,6 +7792,39 @@ enum {#define RC_MAX_QP_SHIFT 5#define RC_MIN_QP_SHIFT 0 +/* Display Stream Splitter Control */ +#define DSS_CTL1 _MMIO(0x67400) +#define SPLITTER_ENABLE (1 << 31) +#define JOINER_ENABLE (1 << 30) +#define DUAL_LINK_MODE_INTERLEAVE (1 << 24) +#define DUAL_LINK_MODE_FRONTBACK (0 << 24) +#define OVERLAP_PIXELS_MASK (0xf << 16) +#define OVERLAP_PIXELS (pixels) ((pixels) << 16) +#define LEFT_DL_BUF_TARGET_DEPTH_MASK (0xfff << 0) +#define LEFT_DL_BUF_TARGET_DEPTH (pixels) ((pixels) << 0) +#define MAX_DL_BUFFER_TARGET_DEPTH 0x5A0 + +#define DSS_CTL2 _MMIO(0x67404) +#define LEFT_BRANCH_VDSC_ENABLE (1 << 31) +#define RIGHT_BRANCH_VDSC_ENABLE (1 << 15) +#define RIGHT_DL_BUF_TARGET_DEPTH_MASK (0xfff << 0) +#define RIGHT_DL_BUF_TARGET_DEPTH (pixels) ((pixels) << 0) + +#define _ICL_PIPE_DSS_CTL1_PB 0x78200 +#define _ICL_PIPE_DSS_CTL1_PC 0x78400 +#define ICL_PIPE_DSS_CTL1 (pipe) _MMIO_PIPE((pipe) - PIPE_B, \ + _ICL_PIPE_DSS_CTL1_PB, \ + _ICL_PIPE_DSS_CTL1_PC) +#define BIG_JOINER_ENABLE (1 << 29) +#define MASTER_BIG_JOINER_ENABLE (1 << 28) +#define VGA_CENTERING_ENABLE (1 << 27) + +#define _ICL_PIPE_DSS_CTL2_PB 0x78204 +#define _ICL_PIPE_DSS_CTL2_PC 0x78404 +#define ICL_PIPE_DSS_CTL2 (pipe) _MMIO_PIPE((pipe) - PIPE_B, \ + _ICL_PIPE_DSS_CTL2_PB, \ + _ICL_PIPE_DSS_CTL2_PC) +#define DSCA_RC_RANGE_PARAMETERS_1 _MMIO(0x6B248)#define DSCA_RC_RANGE_PARAMETERS_1_UDW _MMIO(0x6B248 + 4)#define DSCC_RC_RANGE_PARAMETERS_1 _MMIO(0x6BA48)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 21/23] drm/i915/icl: Add Display Stream Splitter control registers
Quoted 28 lines · Manasi Navare
From: "Srivatsa, Anusha" <[email protected]>
Add defines for
DSS_CTLregisters.
These registers specify the big joiner, splitter, overlap pixels and info regarding display stream compression enabled on left or right branch.v2:
- Add define to conditionally check the buffer target depth (James Ausmus)Suggested-by Madhav Chauhan <[email protected]>Cc Madhav Chauhan <[email protected]>Cc Manasi Navare <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -7792,6 +7792,39 @@ enum {#define RC_MAX_QP_SHIFT 5#define RC_MIN_QP_SHIFT 0 +/* Display Stream Splitter Control */
drivers/gpu/drm/i915/i915_reg.h enum { · line 7805
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +10
-0+#define DSS_CTL1 _MMIO(0x67400) +#define SPLITTER_ENABLE (1 << 31) +#define JOINER_ENABLE (1 << 30) +#define DUAL_LINK_MODE_INTERLEAVE (1 << 24) +#define DUAL_LINK_MODE_FRONTBACK (0 << 24) +#define OVERLAP_PIXELS_MASK (0xf << 16) +#define OVERLAP_PIXELS (pixels) ((pixels) << 16) +#define LEFT_DL_BUF_TARGET_DEPTH_MASK (0xfff << 0) +#define LEFT_DL_BUF_TARGET_DEPTH (pixels) ((pixels) << 0) +#define MAX_DL_BUFFER_TARGET_DEPTH 0x5A0
Please use lower case for hex values. With this fix,
Regards,
Madhav
Quoted 15 lines
drivers/gpu/drm/i915/i915_reg.h +15
-0+ +#define DSS_CTL2 _MMIO(0x67404) +#define LEFT_BRANCH_VDSC_ENABLE (1 << 31) +#define RIGHT_BRANCH_VDSC_ENABLE (1 << 15) +#define RIGHT_DL_BUF_TARGET_DEPTH_MASK (0xfff << 0) +#define RIGHT_DL_BUF_TARGET_DEPTH (pixels) ((pixels) << 0) + +#define _ICL_PIPE_DSS_CTL1_PB 0x78200 +#define _ICL_PIPE_DSS_CTL1_PC 0x78400 +#define ICL_PIPE_DSS_CTL1 (pipe) _MMIO_PIPE((pipe) - PIPE_B, \ + _ICL_PIPE_DSS_CTL1_PB, \ + _ICL_PIPE_DSS_CTL1_PC) +#define BIG_JOINER_ENABLE (1 << 29) +#define MASTER_BIG_JOINER_ENABLE (1 << 28) +#define VGA_CENTERING_ENABLE (1 << 27)
drivers/gpu/drm/i915/i915_reg.h enum { · line 7830
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +7
-0+ +#define _ICL_PIPE_DSS_CTL2_PB 0x78204 +#define _ICL_PIPE_DSS_CTL2_PC 0x78404 +#define ICL_PIPE_DSS_CTL2 (pipe) _MMIO_PIPE((pipe) - PIPE_B, \ + _ICL_PIPE_DSS_CTL2_PB, \ + _ICL_PIPE_DSS_CTL2_PC) +#define DSCA_RC_RANGE_PARAMETERS_1 _MMIO(0x6B248)#define DSCA_RC_RANGE_PARAMETERS_1_UDW _MMIO(0x6B248 + 4)#define DSCC_RC_RANGE_PARAMETERS_1 _MMIO(0x6BA48)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 22/23 drm/i915/dp: Configure Display stream splitter registers during DSC enable
In reply to Manasi NavareDisplay Stream Splitter registers need to be programmed to enable the joiner if two DSC engines are used and also to enable the left and the right DSC engines. This happens as part of the DSC enabling routine in the source in atomic commit.
--- drivers/gpu/drm/i915/intel_vdsc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/gpu/drm/i915/intel_vdsc.c +22 -0
@@ -1014,6 +1014,12 @@ static void intel_dp_send_dsc_pps_sdp(struct intel_encoder *encoder,void intel_dsc_enable (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum pipe pipe = crtc->pipe; +i915_reg_t dss_ctl1_reg, dss_ctl2_reg; +u32 dss_ctl1_val =0 ; +u32 dss_ctl2_val =0 ;if (!crtc_state->dsc_params.compression_enable)return ;
@@ -1022,5 +1028,21 @@ void intel_dsc_enable(struct intel_encoder *encoder,intel_dp_send_dsc_pps_sdp (encoder, crtc_state); +/* Configure DSS_CTL registers for DSC */ +if (encoder->type ==INTEL_OUTPUT_EDP ) { + dss_ctl1_reg =DSS_CTL1 ; + dss_ctl2_reg =DSS_CTL2 ; + }else { + dss_ctl1_reg =ICL_PIPE_DSS_CTL1 (pipe); + dss_ctl2_reg =ICL_PIPE_DSS_CTL2 (pipe); + } + dss_ctl2_val |=LEFT_BRANCH_VDSC_ENABLE ; +if (crtc_state->dsc_params.dsc_split) { + dss_ctl2_val |=RIGHT_BRANCH_VDSC_ENABLE ; + dss_ctl1_val |=JOINER_ENABLE ; + } +I915_WRITE (dss_ctl1_reg, dss_ctl1_val); +I915_WRITE (dss_ctl2_reg, dss_ctl2_val); +return ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 23/23 drm/i915/dp: Disable DSC in source by disabling DSS CTL bits
In reply to Manasi NavareFrom: Gaurav K Singh <[email protected]>
1. Disable Left/right VDSC branch in DSS Ctrl reg depending on the number of VDSC engines being used
2. Disable joiner in DSS Ctrl reg
v4: (From Manasi)
* Rebase on top of revised patches
v3 (From Manasi):
* Use old_crtc_state to find dsc params
* Add a condition to disable only if
dsc state compression is enabled
* Use correct DSS CTL regs
v2 (From Manasi):
* Fix tons of compilation errors like undefined variables, incorrect use of macros and all dirty laundry
--- drivers/gpu/drm/i915/intel_vdsc.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/gpu/drm/i915/intel_vdsc.c +32 -0
@@ -1046,3 +1046,35 @@ void intel_dsc_enable(struct intel_encoder *encoder,return ; } + +void intel_dsc_disable (struct intel_encoder *encoder, +struct intel_crtc_state *old_crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum pipe pipe = crtc->pipe; +i915_reg_t dss_ctl1_reg, dss_ctl2_reg; +u32 dss_ctl1_val =0 , dss_ctl2_val =0 ; + +if (!old_crtc_state->dsc_params.compression_enable) +return ; + +if (encoder->type ==INTEL_OUTPUT_EDP ) { + dss_ctl1_reg =DSS_CTL1 ; + dss_ctl2_reg =DSS_CTL2 ; + }else { + dss_ctl1_reg =ICL_PIPE_DSS_CTL1 (pipe); + dss_ctl2_reg =ICL_PIPE_DSS_CTL2 (pipe); + } + dss_ctl1_val =I915_READ (dss_ctl1_reg); +if (dss_ctl1_val &JOINER_ENABLE ) + dss_ctl1_val &= ~JOINER_ENABLE ; +I915_WRITE (dss_ctl1_reg, dss_ctl1_val); + + dss_ctl2_val =I915_READ (dss_ctl2_reg); +if (dss_ctl2_val &LEFT_BRANCH_VDSC_ENABLE || + dss_ctl2_val &RIGHT_BRANCH_VDSC_ENABLE ) + dss_ctl2_val &= ~(LEFT_BRANCH_VDSC_ENABLE | +RIGHT_BRANCH_VDSC_ENABLE ); +I915_WRITE (dss_ctl2_reg, dss_ctl2_val); +}
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Enable Display Stream Compression on eDP/DP
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Enable Display Stream Compression on eDP/DP
URL : https://patchwork.freedesktop.org/series/47461/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/intel_display.odrivers/gpu/drm/i915/intel_display.c: In function ‘intel_link_compute_m_n’:drivers/gpu/drm/i915/intel_display.c:6720:2: error: this ‘else’ clause does not guard... [-Werror=misleading-indentation]
else
^~~~drivers/gpu/drm/i915/intel_display.c:6726:3: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’
compute_m_n(pixel_clock, link_clock,
^~~~~~~~~~~
cc1: all warnings being treated as errorsscripts/Makefile.build:317: recipe for target 'drivers/gpu/drm/i915/intel_display.o' failed
make[4]: *** [drivers/gpu/drm/i915/intel_display.o] Error 1scripts/Makefile.build:558: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:558: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:558: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1029: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Enable Display Stream Compression on eDP/DP (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Enable Display Stream Compression on eDP/DP (rev2)
URL : https://patchwork.freedesktop.org/series/47461/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 27c39427ec85 drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFT 5c8ad85804c4 drm/i915/dp: Cache the DP/eDP DSC DPCD register set on Hotplug/eDP Init -:62: CHECK:SPACING: No space is necessary after a cast #62: FILE: drivers/gpu/drm/i915/intel_dp.c:3898: + (int) sizeof(intel_dp->dsc_dpcd),
total: 0 errors, 0 warnings, 1 checks, 63 lines checked0081fe19d05d drm/dp: DRM DP helper/macros to get DP sink DSC parameters08e091309edb drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC
-:24: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #24:
* rename it as SMALL_JOINER since we are not enabling big joiner yet (Anusha)
-:115: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #115: FILE: drivers/gpu/drm/i915/intel_dp.c:4150:
+ * fractional part is 0 */
total: 0 errors, 2 warnings, 0 checks, 131 lines checkedaead51650cbe drm/i915/dp: Validate modes using max Output BPP and slice count when DSC supported 518d81d5eff2 drm/dp: Define payload size for DP SDP PPS packet4e91c7ad5834 drm/dsc: Define Display Stream Compression PPS infoframe
-:21: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #21:
new file mode 100644
-:26: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #26: FILE: include/drm/drm_dsc.h:1:
+/*
total: 0 errors, 2 warnings, 0 checks, 365 lines checkeddfce08e3cd4a drm/dsc: Define VESA Display Stream Compression Capabilitiesd93be48c680f drm/dsc: Define Rate Control values that do not change over configurations 411f986ec2b2 drm/dsc: Add helpers for DSC picture parameter set infoframes
-:19: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #19:
* Add reference to added kernel-docs in Documentation/gpu/drm-kms-helpers.rst
-:69: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #69:
new file mode 100644
-:74: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #74: FILE: drivers/gpu/drm/drm_dsc.c:1:
+/*
-:210: WARNING:LONG_LINE: line over 100 characters #210: FILE: drivers/gpu/drm/drm_dsc.c:137:
+ pps_sdp->pps_payload.scale_increment_interval = cpu_to_be16(dsc_cfg->scale_increment_interval);
-:213: WARNING:LONG_LINE: line over 100 characters #213: FILE: drivers/gpu/drm/drm_dsc.c:140:
+ pps_sdp->pps_payload.scale_decrement_interval_high = (u8)((dsc_cfg->scale_decrement_interval &
-:214: WARNING:LONG_LINE: line over 100 characters #214: FILE: drivers/gpu/drm/drm_dsc.c:141:
+ DSC_PPS_SCALE_DEC_INT_HIGH_MASK) >>
-:276: WARNING:LONG_LINE: line over 100 characters #276: FILE: drivers/gpu/drm/drm_dsc.c:203:
+ pps_sdp->pps_payload.rc_range_parameters[i] = cpu_to_be16(pps_sdp->pps_payload.rc_range_parameters[i]);
total: 0 errors, 7 warnings, 0 checks, 285 lines checked aa96679ec57e drm/i915/dp: Add DSC params and DSC config to intel_crtc_state 797cfde71a78 drm/i915/dp: Compute DSC pipe config in atomic check -:122: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #122: FILE: drivers/gpu/drm/i915/intel_dp.c:1909:
+ bpp = 3*bpc;
^
-:183: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #183: FILE: drivers/gpu/drm/i915/intel_dp.c:2016:
+ } else {
+
-:205: CHECK:BRACES: braces {} should be used on all arms of this statement #205: FILE: drivers/gpu/drm/i915/intel_dp.c:2038:
+ if (pipe_config->dsc_params.slice_count > 1)
[...]
+ else {
[...]
-:207: CHECK:BRACES: Unbalanced braces around else statement #207: FILE: drivers/gpu/drm/i915/intel_dp.c:2040:
+ else {
total: 0 errors, 0 warnings, 4 checks, 256 lines checked ea64a4506689 drm/i915/dp: Do not enable PSR2 if DSC is enabled 296fd9b47516 drm/dsc: Define the DSC 1.1 and 1.2 Line Buffer depth constants e1de0bb838ae drm/i915/dsc: Define & Compute VESA DSC params -:82: WARNING:MISSING_SPACE: break quoted strings at a space character #82: FILE: drivers/gpu/drm/i915/intel_dp.c:2047:
+ DRM_ERROR("Cannot compute valid DSC parameters for Input Bpp = %d"
+ "Compressed BPP = %d\n",
-:100: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #100: FILE: drivers/gpu/drm/i915/intel_drv.h:1756:
+int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
+ struct intel_crtc_state *pipe_config);
-:106: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #106:
new file mode 100644
-:111: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #111: FILE: drivers/gpu/drm/i915/intel_vdsc.c:1:
+/*
-:410: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #410: FILE: drivers/gpu/drm/i915/intel_vdsc.c:300:
+}
+};
-:449: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #449: FILE: drivers/gpu/drm/i915/intel_vdsc.c:339:
+int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
+ struct intel_crtc_state *pipe_config)
-:460: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #460: FILE: drivers/gpu/drm/i915/intel_vdsc.c:350:
+ vdsc_cfg->slice_width = DIV_ROUND_UP(
-:476: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #476: FILE: drivers/gpu/drm/i915/intel_vdsc.c:366:
+ vdsc_cfg->dsc_version_major = (
-:480: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #480: FILE: drivers/gpu/drm/i915/intel_vdsc.c:370:
+ vdsc_cfg->dsc_version_minor = min(DSC_SUPPORTED_VERSION_MIN,
+ (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
-:483: CHECK:OPEN_ENDED_LINE: Lines should not end with a '[' #483: FILE: drivers/gpu/drm/i915/intel_vdsc.c:373:
+ vdsc_cfg->convert_rgb = intel_dp->dsc_dpcd[
-:500: CHECK:OPEN_ENDED_LINE: Lines should not end with a '[' #500: FILE: drivers/gpu/drm/i915/intel_vdsc.c:390:
+ intel_dp->dsc_dpcd[
-:559: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #559: FILE: drivers/gpu/drm/i915/intel_vdsc.c:449:
+ if (vdsc_cfg->bits_per_component == 8 ||
+ vdsc_cfg->bits_per_component == 10)
total: 0 errors, 3 warnings, 9 checks, 508 lines checked 019eec0259af drm/i915/dsc: Compute Rate Control parameters for DSC -:55: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #55: FILE: drivers/gpu/drm/i915/intel_vdsc.c:352:
+ groups_per_line = DIV_ROUND_UP(vdsc_cfg->slice_width,
+ DP_DSC_RC_PIXELS_PER_GROUP);
-:73: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #73: FILE: drivers/gpu/drm/i915/intel_vdsc.c:370:
+ while ((num_extra_mux_bits > 0) &&
+ ((slice_bits - num_extra_mux_bits) % vdsc_cfg->mux_word_size))
-:104: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #104: FILE: drivers/gpu/drm/i915/intel_vdsc.c:401:
+ vdsc_cfg->nfl_bpg_offset = DIV_ROUND_UP(
-:120: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #120: FILE: drivers/gpu/drm/i915/intel_vdsc.c:417:
+ vdsc_cfg->slice_bpg_offset = DIV_ROUND_UP(
-:134: CHECK:SPACING: space preferred before that '*' (ctx:VxE) #134: FILE: drivers/gpu/drm/i915/intel_vdsc.c:431:
+ vdsc_cfg->slice_bpg_offset)*
^
-:166: CHECK:LINE_SPACING: Please don't use multiple blank lines #166: FILE: drivers/gpu/drm/i915/intel_vdsc.c:463:
+
+
total: 0 errors, 0 warnings, 6 checks, 140 lines checkedaa794586ed2a drm/i915/dp: Enable/Disable DSC in DP Sink363456f7ee95 drm/i915/dp: Configure i915 Picture parameter Set registers during DSC enabling -:27: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files #27: FILE: drivers/gpu/drm/i915/i915_drv.h:3436:
+extern void intel_dsc_enable(struct intel_encoder *encoder,
-:315: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #315: FILE: drivers/gpu/drm/i915/intel_vdsc.c:847:
+ rc_buf_thresh_dword[i/4] |= (u32)(vdsc_cfg->rc_buf_thresh[i] <<
^
-:316: CHECK:SPACING: spaces preferred around that '%' (ctx:VxV) #316: FILE: drivers/gpu/drm/i915/intel_vdsc.c:848:
+ BITS_PER_BYTE * (i%4));
^
-:318: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #318: FILE: drivers/gpu/drm/i915/intel_vdsc.c:850:
+ rc_buf_thresh_dword[i/4]);
^
-:359: WARNING:LONG_LINE: line over 100 characters #359: FILE: drivers/gpu/drm/i915/intel_vdsc.c:891:
+ rc_range_params_dword[i/2] |= (u32)(((vdsc_cfg->rc_range_params[i].range_bpg_offset <<
-:359: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #359: FILE: drivers/gpu/drm/i915/intel_vdsc.c:891:
+ rc_range_params_dword[i/2] |= (u32)(((vdsc_cfg->rc_range_params[i].range_bpg_offset <<
^
-:364: CHECK:SPACING: spaces preferred around that '%' (ctx:VxV)
#364: FILE: drivers/gpu/drm/i915/intel_vdsc.c:896:
+ RC_MIN_QP_SHIFT)) << 16 * (i%2));
^
-:366: CHECK:SPACING: spaces preferred around that '/' (ctx:VxV) #366: FILE: drivers/gpu/drm/i915/intel_vdsc.c:898:
+ rc_range_params_dword[i/2]);
^
-:466: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #466: FILE: drivers/gpu/drm/i915/intel_vdsc.c:998:
+{
+
-:473: WARNING:RETURN_VOID: void function return statements are not generally useful #473: FILE: drivers/gpu/drm/i915/intel_vdsc.c:1005:
+ return;
+}
total: 0 errors, 2 warnings, 8 checks, 440 lines checked2fb6aeab6aeb drm/i915/dp: Use the existing write_infoframe() for DSC PPS SDPs 3e5086ab7ce0 drm/i915/dp: Populate DSC PPS SDP and send PPS infoframes 74c50a243b19 drm/i915/icl: Add Display Stream Splitter control registers 93dd5a51c49a drm/i915/dp: Configure Display stream splitter registers during DSC enable c518575b081f drm/i915/dp: Disable DSC in source by disabling DSS CTL bits
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Enable Display Stream Compression on eDP/DP (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Enable Display Stream Compression on eDP/DP (rev2)
URL : https://patchwork.freedesktop.org/series/47461/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFT Okay!
Commit: drm/i915/dp: Cache the DP/eDP DSC DPCD register set on Hotplug/eDP Init Okay!
Commit: drm/dp: DRM DP helper/macros to get DP sink DSC parameters Okay!
Commit: drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC +drivers/gpu/drm/i915/intel_dp.c:4133:26: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:4133:26: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:4175:27: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_dp.c:4175:27: warning: expression using sizeof(void)
Commit: drm/i915/dp: Validate modes using max Output BPP and slice count when DSC supported Okay!
Commit: drm/dp: Define payload size for DP SDP PPS packet Okay!
Commit: drm/dsc: Define Display Stream Compression PPS infoframe Okay!
Commit: drm/dsc: Define VESA Display Stream Compression Capabilities Okay!
Commit: drm/dsc: Define Rate Control values that do not change over configurations Okay!
Commit: drm/dsc: Add helpers for DSC picture parameter set infoframes
-+drivers/gpu/drm/drm_dsc.c:197:61: expected restricted __be16 <noident>+drivers/gpu/drm/drm_dsc.c:197:61: got unsigned short [unsigned] [usertype] <noident>+drivers/gpu/drm/drm_dsc.c:197:61: warning: incorrect type in assignment (different base types)+drivers/gpu/drm/drm_dsc.c:203:63: expected unsigned short [unsigned] [usertype] val+drivers/gpu/drm/drm_dsc.c:203:63: got restricted __be16 <noident>+drivers/gpu/drm/drm_dsc.c:203:63: warning: cast from restricted __be16 +drivers/gpu/drm/drm_dsc.c:203:63: warning: cast from restricted __be16 +drivers/gpu/drm/drm_dsc.c:203:63: warning: cast from restricted __be16 +drivers/gpu/drm/drm_dsc.c:203:63: warning: incorrect type in argument 1 (different base types)
Commit: drm/i915/dp: Add DSC params and DSC config to intel_crtc_state -drivers/gpu/drm/i915/selftests/../i915_drv.h:3653:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3654:16: warning: expression using sizeof(void)
Commit: drm/i915/dp: Compute DSC pipe config in atomic check +drivers/gpu/drm/i915/intel_dp.c:1905:23: warning: expression using sizeof(void)
Commit: drm/i915/dp: Do not enable PSR2 if DSC is enabled Okay!
Commit: drm/dsc: Define the DSC 1.1 and 1.2 Line Buffer depth constants Okay!
Commit: drm/i915/dsc: Define & Compute VESA DSC params +drivers/gpu/drm/i915/intel_vdsc.c:369:39: warning: expression using sizeof(void)
Commit: drm/i915/dsc: Compute Rate Control parameters for DSC Okay!
Commit: drm/i915/dp: Enable/Disable DSC in DP Sink Okay!
Commit: drm/i915/dp: Configure i915 Picture parameter Set registers during DSC enabling -drivers/gpu/drm/i915/selftests/../i915_drv.h:3654:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3656:16: warning: expression using sizeof(void)
Commit: drm/i915/dp: Use the existing write_infoframe() for DSC PPS SDPs Okay!
Commit: drm/i915/dp: Populate DSC PPS SDP and send PPS infoframes Okay!
Commit: drm/i915/icl: Add Display Stream Splitter control registers Okay!
Commit: drm/i915/dp: Configure Display stream splitter registers during DSC enable Okay!
Commit: drm/i915/dp: Disable DSC in source by disabling DSS CTL bits +drivers/gpu/drm/i915/intel_vdsc.c:1050:6: warning: symbol 'intel_dsc_disable' was not declared. Should it be static?
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Enable Display Stream Compression on eDP/DP (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Enable Display Stream Compression on eDP/DP (rev2)
URL : https://patchwork.freedesktop.org/series/47461/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4599 -> Patchwork_9820 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47461/revisions/2/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9820:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_coherency:
{fi-icl-u}: PASS -> DMESG-FAIL== Known issues ==
Here are the changes found in Patchwork_9820 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload-inject:
fi-hsw-4770r: PASS -> DMESG-WARN (fdo#107425)
igt@gem_exec_suspend@basic-s4-devices:
fi-kbl-7500u: PASS -> DMESG-WARN (fdo#107139, fdo#105128)
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)
==== Possible fixes ====
igt@drv_selftest@live_workarounds:
{fi-cfl-8109u}: DMESG-FAIL (fdo#107292) -> PASS
igt@kms_flip@basic-flip-vs-modeset:
fi-skl-6700hq: DMESG-WARN (fdo#105998) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
==== Warnings ====
{igt@kms_psr@primary_page_flip}:
fi-cnl-psr: DMESG-WARN (fdo#107372) -> DMESG-FAIL (fdo#107372) {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#107139 https://bugs.freedesktop.org/show_bug.cgi?id=107139
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
fdo#107425 https://bugs.freedesktop.org/show_bug.cgi?id=107425
== Participating hosts (50 -> 46) ==
Additional (1): fi-gdg-551
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-byt-clapper fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4599 -> Patchwork_9820
CI_DRM_4599: 64f0c5b2bf42d83cab790c4607d08d06a9e50e82 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4581: f1c868dae24056ebc27e4f3c197724ce9b956a8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9820: c518575b081fdc62af71f4a8dd8f51d6e74b0527 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c518575b081f drm/i915/dp: Disable DSC in source by disabling DSS CTL bits 93dd5a51c49a drm/i915/dp: Configure Display stream splitter registers during DSC enable 74c50a243b19 drm/i915/icl: Add Display Stream Splitter control registers 3e5086ab7ce0 drm/i915/dp: Populate DSC PPS SDP and send PPS infoframes 2fb6aeab6aeb drm/i915/dp: Use the existing write_infoframe() for DSC PPS SDPs 363456f7ee95 drm/i915/dp: Configure i915 Picture parameter Set registers during DSC enabling aa794586ed2a drm/i915/dp: Enable/Disable DSC in DP Sink019eec0259af drm/i915/dsc: Compute Rate Control parameters for DSCe1de0bb838ae drm/i915/dsc: Define & Compute VESA DSC params296fd9b47516 drm/dsc: Define the DSC 1.1 and 1.2 Line Buffer depth constants ea64a4506689 drm/i915/dp: Do not enable PSR2 if DSC is enabled797cfde71a78 drm/i915/dp: Compute DSC pipe config in atomic checkaa96679ec57e drm/i915/dp: Add DSC params and DSC config to intel_crtc_state 411f986ec2b2 drm/dsc: Add helpers for DSC picture parameter set infoframes d93be48c680f drm/dsc: Define Rate Control values that do not change over configurations dfce08e3cd4a drm/dsc: Define VESA Display Stream Compression Capabilities 4e91c7ad5834 drm/dsc: Define Display Stream Compression PPS infoframe 518d81d5eff2 drm/dp: Define payload size for DP SDP PPS packetaead51650cbe drm/i915/dp: Validate modes using max Output BPP and slice count when DSC supported 08e091309edb drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC 0081fe19d05d drm/dp: DRM DP helper/macros to get DP sink DSC parameters 5c8ad85804c4 drm/i915/dp: Cache the DP/eDP DSC DPCD register set on Hotplug/eDP Init 27c39427ec85 drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFT
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9820/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Enable Display Stream Compression on eDP/DP (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: Enable Display Stream Compression on eDP/DP (rev2)
URL : https://patchwork.freedesktop.org/series/47461/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4599_full -> Patchwork_9820_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9820_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9820_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9820_full:
=== IGT changes ===
==== Warnings ====
igt@kms_cursor_crc@cursor-128x128-onscreen:
shard-snb: SKIP -> PASS +2== Known issues ==
Here are the changes found in Patchwork_9820_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ctx_isolation@vcs0-s3:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_flip@wf_vblank-ts-check-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
==== Possible fixes ====
igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
shard-hsw: FAIL (fdo#105767) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
shard-glk: FAIL (fdo#103928) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-kbl: FAIL (fdo#102887, fdo#105363) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4599 -> Patchwork_9820
CI_DRM_4599: 64f0c5b2bf42d83cab790c4607d08d06a9e50e82 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4581: f1c868dae24056ebc27e4f3c197724ce9b956a8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9820: c518575b081fdc62af71f4a8dd8f51d6e74b0527 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9820/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx