HDMI 2.0: Scrambling in DRM layer
Subsystems (4)
v3 cover HDMI 2.0: Scrambling in DRM layer
HDMI 2.0 spec defines a method to reduce the RF footprint while operating at higher pixel clocks, which is called Scrambling. Scrambling can be controlled over a new set of I2C registers which are accessible over existing DDC I2C lines, called SCDC register set.
This patch series contains 6 patches:
- First two patches add generic drm helper functions to read and write into SCDC registers. These patches are written by Thierry, in a patch series published here:
https://patchwork.kernel.org/patch/9459051/
Minor changes were done to map the patches into this series.
- Next two patches add functions for scrambling detection and scrambling control.
- Next two patches use this infrastructure in DRM layer from I915 driver, to enable scrambling on a GLK deivce which sports a native HDMI 2.0 controller.
V2:
- addressed review comments from Thierry, Ville and Dhinakaran
- added signed-off-by:self in first two patches(Jani N)
V3:
- addressed review comments from Jose and Jani
Shashank Sharma (4):
drm/edid: detect SCDC support in HF-VSDB
drm: scrambling support in drm layer
drm/i915: enable scrambling
drm/i915: allow HDMI 2.0 clock rates
Thierry Reding (2):
drm: Add SCDC helpers
drm/edid: check for HF-VSDB block
Documentation/gpu/drm-kms-helpers.rst | 12 ++ drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_edid.c | 60 ++++++++ drivers/gpu/drm/drm_scdc_helper.c | 275 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_ddi.c | 28 ++++ drivers/gpu/drm/i915/intel_drv.h | 14 ++ drivers/gpu/drm/i915/intel_hdmi.c | 107 +++++++++++++ include/drm/drm_connector.h | 52 +++++++ include/drm/drm_edid.h | 6 +- include/drm/drm_scdc_helper.h | 173 +++++++++++++++++++++ include/linux/hdmi.h | 1 + 12 files changed, 733 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/drm_scdc_helper.c create mode 100644 include/drm/drm_scdc_helper.h
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/6 drm: Add SCDC helpers
From: Thierry Reding <[email protected]>
SCDC is a mechanism defined in the HDMI 2.0 specification that allows the source and sink devices to communicate.
This commit introduces helpers to access the SCDC and provides the symbolic names for the various registers defined in the specification.
V2: Rebase.
V3: Added R-B from Jose.
--- Documentation/gpu/drm-kms-helpers.rst | 12 ++++ drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_scdc_helper.c | 111 ++++++++++++++++++++++++++++ include/drm/drm_scdc_helper.h | 132 ++++++++++++++++++++++++++++++++++ 4 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/drm_scdc_helper.c create mode 100644 include/drm/drm_scdc_helper.h
Documentation/gpu/drm-kms-helpers.rst +12 -0
@@ -217,6 +217,18 @@ EDID Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_edid.c :export: +SCDC Helper Functions Reference +=============================== + +.. kernel-doc:: drivers/gpu/drm/drm_scdc_helper.c + :doc: scdc helpers + +.. kernel-doc:: include/drm/drm_scdc_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_scdc_helper.c + :export: + Rectangle Utilities Reference =============================
drivers/gpu/drm/Makefile +2 -1
@@ -31,7 +31,8 @@ drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.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 + drm_simple_kms_helper.o drm_modeset_helper.o \ + drm_scdc_helper.o drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
drivers/gpu/drm/drm_scdc_helper.c new file +111 -0
111 lines not on this page · raw message
include/drm/drm_scdc_helper.h new file +132 -0
132 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/6 drm/edid: check for HF-VSDB block
In reply to Shashank SharmaFrom: Thierry Reding <[email protected]>
This patch implements a small function that finds if a given CEA db is hdmi-forum vendor specific data block or not.
V2: Rebase.
V3: Added R-B from Jose.
--- drivers/gpu/drm/drm_edid.c | 15 +++++++++++++++ include/linux/hdmi.h | 1 + 2 files changed, 16 insertions(+)
drivers/gpu/drm/drm_edid.c +15 -0
@@ -3244,6 +3244,21 @@ static bool cea_db_is_hdmi_vsdb(const u8 *db)return hdmi_id ==HDMI_IEEE_OUI ; } +static bool cea_db_is_hdmi_forum_vsdb (const u8 *db) +{ +unsigned int oui; + +if (cea_db_tag (db) !=VENDOR_BLOCK ) +return false; + +if (cea_db_payload_len (db) <7 ) +return false; + + oui = db[3 ] <<16 | db[2 ] <<8 | db[1 ]; + +return oui ==HDMI_FORUM_IEEE_OUI ; +} +#define for_each_cea_db (cea, i, start, end) \ for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1)
include/linux/hdmi.h +1 -0
@@ -35,6 +35,7 @@ enum hdmi_infoframe_type { };#define HDMI_IEEE_OUI 0x000c03 +#define HDMI_FORUM_IEEE_OUI 0xc45dd8#define HDMI_INFOFRAME_HEADER_SIZE 4#define HDMI_AVI_INFOFRAME_SIZE 13#define HDMI_SPD_INFOFRAME_SIZE 25
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/6 drm/edid: detect SCDC support in HF-VSDB
In reply to Shashank SharmaThis patch does following:
- Adds a new structure (drm_hdmi_info) in drm_display_info. This structure will be used to save and indicate if sink supports advanced HDMI 2.0 features
- Adds another structure drm_scdc within drm_hdmi_info, to reflect scdc support and capabilities in connected HDMI 2.0 sink.
- Checks the HF-VSDB block for presence of SCDC, and marks it in scdc structure
- If SCDC is present, checks if sink is capable of generating SCDC read request, and marks it in scdc structure.
V2: Addressed review comments
Thierry:
- Fix typos in commit message and make abbreviation consistent across the commit message.
- Change structure object name from hdmi_info -> hdmi
- Fix typos and abbreviations in description of structure drm_hdmi_info end the description with a full stop.
- Create a structure drm_scdc, and keep all information related to SCDC register set (supported, read request supported) etc in it.
Ville:
- Change rr -> read_request
- Call drm_detect_scrambling function drm_parse_hf_vsdb so that all of HF-VSDB parsing can be kept in same function, in incremental patches.
V3: Rebase.
--- drivers/gpu/drm/drm_edid.c | 14 ++++++++++++++ include/drm/drm_connector.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+)
drivers/gpu/drm/drm_edid.c +14 -0
@@ -3807,6 +3807,18 @@ enum hdmi_quantization_range }EXPORT_SYMBOL (drm_default_rgb_quant_range); +static void drm_parse_hdmi_forum_vsdb (struct drm_connector *connector, +const u8 *hf_vsdb) +{ +struct drm_hdmi_info *hdmi = &connector->display_info.hdmi; + +if (hf_vsdb[6 ] &0x80 ) { + hdmi->scdc.supported = true; +if (hf_vsdb[6 ] &0x40 ) + hdmi->scdc.read_request = true; + } +} +static void drm_parse_hdmi_deep_color_info (struct drm_connector *connector,const u8 *hdmi) {
@@ -3921,6 +3933,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,if (cea_db_is_hdmi_vsdb (db))drm_parse_hdmi_vsdb_video (connector, db); +if (cea_db_is_hdmi_forum_vsdb (db)) +drm_parse_hdmi_forum_vsdb (connector, db); } }
include/drm/drm_connector.h +33 -0
@@ -87,6 +87,34 @@ enum subpixel_order { SubPixelVerticalRGB, SubPixelVerticalBGR, SubPixelNone, + +}; + +/* +* struct drm_scdc - Information about scdc capabilities of a HDMI 2.0 sink +* +* Provides SCDC register support and capabilities related information on a +* HDMI 2.0 sink. In case of a HDMI 1.4 sink, all parameter must be 0. +*/ +struct drm_scdc { +/** +* @supported: status control & data channel present. +*/ +bool supported; +/** +* @read_request: sink is capable of generating scdc read request. +*/ +bool read_request; +}; + +/** +* struct drm_hdmi_info - runtime information about the connected HDMI sink +* +* Describes if a given display supports advanced HDMI 2.0 features. +* This information is available in CEA-861-F extension blocks (like HF-VSDB). +*/ +struct drm_hdmi_info { +struct drm_scdc scdc; };/**
@@ -188,6 +216,11 @@ struct drm_display_info {* @cea_rev: CEA revision of the HDMI sink. */ u8 cea_rev; + +/** +* @hdmi: advance features of a HDMI sink. +*/ +struct drm_hdmi_info hdmi; }; int drm_display_info_set_bus_formats(struct drm_display_info *info,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/6 drm: scrambling support in drm layer
In reply to Shashank SharmaHDMI 2.0 spec mandates scrambling for modes with pixel clock higher than 340 MHz. This patch adds few new functions in drm layer for core drivers to enable/disable scrambling.
This patch adds:
- A function to detect scrambling support parsing HF-VSDB
- A function to check scrambling status runtime using SCDC read.
- Two functions to enable/disable scrambling using SCDC read/write.
- Few new bools to reflect scrambling support and status.
V2: Addressed review comments from Thierry, Ville and Dhinakaran Thierry:
- Mhz -> MHz in comments and commit message.
- i2c -> I2C in comments.
- Fix the function documentations, keep in sync with drm_scdc_helper.c
- drm_connector -> DRM connector.
- Create structure for SCDC, and save scrambling status inside that, in a sub-structure.
- Call this sub-structure scrambling instead of scr_info.
- low_rates -> low_clocks in scrambling status structure.
- Store the return value of I2C read/write and print the error code in case of failure.
Thierry and Ville:
- Move the scrambling enable/disable/query functions in drm_scdc_helper.c file.
- Add drm_SCDC prefix for the functions.
- Optimize the return statement from function drm_SCDC_check_scrambling_status.
Ville:
- Dont overwrite saved max TMDS clock value in display_info, if max tmds clock from HF-VSDB is not > 340 MHz.
- drm_detect_hdmi_scrambling -> drm_parse_hdmi_forum_vsdb.
- Remove dynamic tracking of SCDC status from DRM layer, force bool.
- Program clock ratio bit also, while enabling scrambling.
Dhinakaran:
- Add a comment about *5000 while extracting max clock supported.
V3: Addressed review comments from Jose.
- Create separate functions to enable scrambling and to set TMDS clock/character rate ratio.
--- drivers/gpu/drm/drm_edid.c | 33 +++++++- drivers/gpu/drm/drm_scdc_helper.c | 164 ++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 19 +++++ include/drm/drm_edid.h | 6 +- include/drm/drm_scdc_helper.h | 41 ++++++++++ 5 files changed, 261 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_edid.c +32 -1
@@ -37,6 +37,7 @@#include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_displayid.h> +#include <drm/drm_scdc_helper.h> #include "drm_crtc_internal.h"
@@ -3810,13 +3811,43 @@ enum hdmi_quantization_rangestatic void drm_parse_hdmi_forum_vsdb (struct drm_connector *connector,const u8 *hf_vsdb) { -struct drm_hdmi_info *hdmi = &connector->display_info.hdmi; +struct drm_display_info *display = &connector->display_info; +struct drm_hdmi_info *hdmi = &display->hdmi;if (hf_vsdb[6 ] &0x80 ) { hdmi->scdc.supported = true;if (hf_vsdb[6 ] &0x40 ) hdmi->scdc.read_request = true; } + +/* +* All HDMI 2.0 monitors must support scrambling at rates > 340 MHz. +* And as per the spec, three factors confirm this: +* * Availability of a HF-VSDB block in EDID (check) +* * Non zero Max_TMDS_Char_Rate filed in HF-VSDB (let's check) +* * SCDC support available (let's check) +* Lets check it out. +*/ + +if (hf_vsdb[5 ]) { +/* max clock is 5000 KHz times block value */ +u32 max_tmds_clock = hf_vsdb[5 ] *5000 ; +struct drm_scdc *scdc = &hdmi->scdc; + +if (max_tmds_clock >340000 ) { + display->max_tmds_clock = max_tmds_clock; +DRM_DEBUG_KMS ("HF-VSDB: max TMDS clock %d kHz\n" , + display->max_tmds_clock); + } + +if (scdc->supported) { + scdc->scrambling.supported = true; + +/* Few sinks support scrambling for cloks < 340M */ +if ((hf_vsdb[6 ] &0x8 )) + scdc->scrambling.low_rates = true; + } + } } static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector,
drivers/gpu/drm/drm_scdc_helper.c +164 -0
175 lines not on this page · raw message
include/drm/drm_connector.h +19 -0
@@ -90,6 +90,20 @@ enum subpixel_order { }; +/** +* struct drm_scrambling: sink's scrambling support. +*/ +struct drm_scrambling { +/** +* @supported: scrambling supported for rates > 340 Mhz. +*/ +bool supported; +/** +* @low_rates: scrambling supported for rates <= 340 Mhz. +*/ +bool low_rates; +}; +/* * struct drm_scdc - Information about scdc capabilities of a HDMI 2.0 sink *
@@ -105,8 +119,13 @@ struct drm_scdc {* @read_request: sink is capable of generating scdc read request. */ bool read_request; +/** +* @scrambling: sink's scrambling capabilities +*/ +struct drm_scrambling scrambling; }; +/** * struct drm_hdmi_info - runtime information about the connected HDMI sink *
include/drm/drm_edid.h +5 -1
@@ -462,5 +462,9 @@ void drm_edid_get_monitor_name(struct edid *edid, char *name,struct drm_display_mode *drm_mode_find_dmt (struct drm_device *dev,int hsize,int vsize,int fresh,bool rb); - +bool drm_enable_scrambling (struct drm_connector *connector, +struct i2c_adapter *adapter,bool force); +bool drm_disable_scrambling (struct drm_connector *connector, +struct i2c_adapter *adapter,bool force); +bool drm_check_scrambling_status (struct i2c_adapter *adapter);#endif /* __DRM_EDID_H__ */
include/drm/drm_scdc_helper.h +41 -0
45 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 5/6 drm/i915: enable scrambling
In reply to Shashank SharmaGeminilake platform sports a native HDMI 2.0 controller, and is capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required, enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor", so that the implementation could be close to the language of HDMI spec.
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_ddi.c | 28 ++++++++++ drivers/gpu/drm/i915/intel_drv.h | 14 +++++ drivers/gpu/drm/i915/intel_hdmi.c | 106 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -7819,7 +7819,11 @@ enum {#define TRANS_DDI_EDP_INPUT_B_ONOFF (5<<12)#define TRANS_DDI_EDP_INPUT_C_ONOFF (6<<12)#define TRANS_DDI_DP_VC_PAYLOAD_ALLOC (1<<8) +#define TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE (1<<7) +#define TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ (1<<6)#define TRANS_DDI_BFI_ENABLE (1<<4) +#define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1<<4) +#define TRANS_DDI_HDMI_SCRAMBLING (1<<0)/* DisplayPort Transport Control */ #define _DP_TP_CTL_A 0x64040
drivers/gpu/drm/i915/intel_ddi.c +28 -0
@@ -1278,6 +1278,11 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) temp |=TRANS_DDI_MODE_SELECT_HDMI ; else temp |= TRANS_DDI_MODE_SELECT_DVI; + +if (IS_GEMINILAKE (dev_priv)) + temp =intel_hdmi_handle_source_scrambling ( + intel_encoder, + &intel_crtc->config->base.adjusted_mode, temp); }else if (type ==INTEL_OUTPUT_ANALOG ) { temp |=TRANS_DDI_MODE_SELECT_FDI ; temp |= (intel_crtc->config->fdi_lanes -1 ) <<1 ;
@@ -1843,6 +1848,21 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); +if (IS_GEMINILAKE (dev_priv)) { +struct intel_crtc *crtc =to_intel_crtc (encoder->crtc); +/* +* GLK sports a native HDMI 2.0 controller. If required +* clock rate is > 340 Mhz && scrambling is supported +* by sink, enable scrambling before enabling the +* HDMI 2.0 port. The sink can choose to disable the +* scrambling if it doesn't detect a scrambled within +* 100 ms. +*/ +intel_hdmi_handle_sink_scrambling (intel_encoder, + conn_state->connector, + crtc->config, true); + } +/* In HDMI/DVI mode, the port width, and swing/emphasis values * are ignored so nothing special needs to be done besides * enabling the port.
@@ -1875,6 +1895,14 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder,if (old_crtc_state->has_audio)intel_audio_codec_disable (intel_encoder); +if (type ==INTEL_OUTPUT_HDMI ) { +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); + +intel_hdmi_handle_sink_scrambling (intel_encoder, + old_conn_state->connector, + intel_crtc->config, false); + } +if (type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
drivers/gpu/drm/i915/intel_drv.h +14 -0
@@ -691,6 +691,12 @@ struct intel_crtc_state {/* Gamma mode programmed on the pipe */ uint32_t gamma_mode; + +/* HDMI scrambling status (sink) */ +bool scrambling; + +/* HDMI High TMDS char rate ratio (sink) */ +bool high_tmds_clock_ratio; };struct vlv_wm_state {
@@ -1609,6 +1615,14 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,bool intel_hdmi_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config,struct drm_connector_state *conn_state); +uint32_t +intel_hdmi_handle_source_scrambling (struct intel_encoder *intel_encoder, +struct drm_display_mode *mode, +uint32_t config); +void intel_hdmi_handle_sink_scrambling (struct intel_encoder *intel_encoder, +struct drm_connector *connector, +struct intel_crtc_state *config, +bool enable);void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable);
drivers/gpu/drm/i915/intel_hdmi.c +106 -0
118 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 5/6] drm/i915: enable scrambling
Hello Ville, Jani
I have addressed all your review comments in this patch set (V3). Can you please have a look if this seems ok ?
Regards
Shashank
-----Original Message-----
From: Sharma, Shashank
Sent: Friday, February 10, 2017 9:59 PM
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; Vetter, Daniel <[email protected]>; Sharma, Shashank <[email protected]>
Subject: [PATCH v3 5/6] drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required, enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor", so that the implementation could be close to the language of HDMI spec.
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_ddi.c | 28 ++++++++++ drivers/gpu/drm/i915/intel_drv.h | 14 +++++ drivers/gpu/drm/i915/intel_hdmi.c | 106 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -7819,7 +7819,11 @@ enum {#define TRANS_DDI_EDP_INPUT_B_ONOFF (5<<12)#define TRANS_DDI_EDP_INPUT_C_ONOFF (6<<12)#define TRANS_DDI_DP_VC_PAYLOAD_ALLOC (1<<8) +#define TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE (1<<7) #define +TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ (1<<6)#define TRANS_DDI_BFI_ENABLE (1<<4) +#define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1<<4) +#define TRANS_DDI_HDMI_SCRAMBLING (1<<0)/* DisplayPort Transport Control */ #define _DP_TP_CTL_A 0x64040
drivers/gpu/drm/i915/intel_ddi.c +5 -0
@@ -1278,6 +1278,11 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) temp |=TRANS_DDI_MODE_SELECT_HDMI ; else temp |= TRANS_DDI_MODE_SELECT_DVI; + +if (IS_GEMINILAKE (dev_priv)) + temp =intel_hdmi_handle_source_scrambling ( + intel_encoder, + &intel_crtc->config->base.adjusted_mode, temp); }else if (type ==INTEL_OUTPUT_ANALOG ) { temp |=TRANS_DDI_MODE_SELECT_FDI ; temp |= (intel_crtc->config->fdi_lanes - 1) << 1; @@ -1843,6 +1848,21 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,
struct intel_digital_port *intel_dig_port =
enc_to_dig_port(encoder);
+ if (IS_GEMINILAKE(dev_priv)) {
+ struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);
+ /*
+ * GLK sports a native HDMI 2.0 controller. If required
+ * clock rate is > 340 Mhz && scrambling is supported
+ * by sink, enable scrambling before enabling the
+ * HDMI 2.0 port. The sink can choose to disable the
+ * scrambling if it doesn't detect a scrambled within
+ * 100 ms.
+ */
+ intel_hdmi_handle_sink_scrambling(intel_encoder,
+ conn_state->connector,
+ crtc->config, true);
+ }
+
/* In HDMI/DVI mode, the port width, and swing/emphasis values
* are ignored so nothing special needs to be done besides
* enabling the port.
@@ -1875,6 +1895,14 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder,
if (old_crtc_state->has_audio)
intel_audio_codec_disable(intel_encoder);
+ if (type == INTEL_OUTPUT_HDMI) {
+ struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
+
+ intel_hdmi_handle_sink_scrambling(intel_encoder,
+ old_conn_state->connector,
+ intel_crtc->config, false);
+ }
+
if (type == INTEL_OUTPUT_EDP) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
drivers/gpu/drm/i915/intel_drv.h +14 -0
@@ -691,6 +691,12 @@ struct intel_crtc_state {/* Gamma mode programmed on the pipe */ uint32_t gamma_mode; + +/* HDMI scrambling status (sink) */ +bool scrambling; + +/* HDMI High TMDS char rate ratio (sink) */ +bool high_tmds_clock_ratio; };struct vlv_wm_state {
@@ -1609,6 +1615,14 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, bool intel_hdmi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state); +uint32_t +intel_hdmi_handle_source_scrambling (struct intel_encoder *intel_encoder, +struct drm_display_mode *mode, +uint32_t config); +void intel_hdmi_handle_sink_scrambling (struct intel_encoder *intel_encoder, +struct drm_connector *connector, +struct intel_crtc_state *config, +bool enable);void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable);
drivers/gpu/drm/i915/intel_hdmi.c +105 -1
117 lines not on this page · raw message
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [Intel-gfx] [PATCH v3 5/6] drm/i915: enable scrambling
In reply to Shashank SharmaOp 10-02-17 om 17:29 schreef Shashank Sharma:
Quoted 100 lines
Geminilake platform sports a native HDMI 2.0 controller, and is capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required, enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in driver like inintel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling inintel_enable_ddi()before enabling the port.V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor", so that the implementation could be close to the language of HDMI spec.Signed-off-by Shashank Sharma <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_ddi.c | 28 ++++++++++ drivers/gpu/drm/i915/intel_drv.h | 14 +++++ drivers/gpu/drm/i915/intel_hdmi.c | 106 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -7819,7 +7819,11 @@ enum {#define TRANS_DDI_EDP_INPUT_B_ONOFF (5<<12)#define TRANS_DDI_EDP_INPUT_C_ONOFF (6<<12)#define TRANS_DDI_DP_VC_PAYLOAD_ALLOC (1<<8) +#define TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE (1<<7) +#define TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ (1<<6)#define TRANS_DDI_BFI_ENABLE (1<<4) +#define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1<<4) +#define TRANS_DDI_HDMI_SCRAMBLING (1<<0)/* DisplayPort Transport Control */ #define _DP_TP_CTL_A 0x64040drivers/gpu/drm/i915/intel_ddi.c +28
-0@@ -1278,6 +1278,11 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) temp |=TRANS_DDI_MODE_SELECT_HDMI ; else temp |= TRANS_DDI_MODE_SELECT_DVI; + +if (IS_GEMINILAKE (dev_priv)) + temp =intel_hdmi_handle_source_scrambling ( + intel_encoder, + &intel_crtc->config->base.adjusted_mode, temp); }else if (type ==INTEL_OUTPUT_ANALOG ) { temp |=TRANS_DDI_MODE_SELECT_FDI ; temp |= (intel_crtc->config->fdi_lanes -1 ) <<1 ;@@ -1843,6 +1848,21 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); +if (IS_GEMINILAKE (dev_priv)) { +struct intel_crtc *crtc =to_intel_crtc (encoder->crtc); +/* +* GLK sports a native HDMI 2.0 controller. If required +* clock rate is > 340 Mhz && scrambling is supported +* by sink, enable scrambling before enabling the +* HDMI 2.0 port. The sink can choose to disable the +* scrambling if it doesn't detect a scrambled within +* 100 ms. +*/ +intel_hdmi_handle_sink_scrambling (intel_encoder, + conn_state->connector, + crtc->config, true); + } +/* In HDMI/DVI mode, the port width, and swing/emphasis values * are ignored so nothing special needs to be done besides * enabling the port. @@ -1875,6 +1895,14 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder,if (old_crtc_state->has_audio)intel_audio_codec_disable (intel_encoder); +if (type ==INTEL_OUTPUT_HDMI ) { +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); + +intel_hdmi_handle_sink_scrambling (intel_encoder, + old_conn_state->connector, + intel_crtc->config, false); + } +if (type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_crtc_state { · line 700
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +6
-0@@ -691,6 +691,12 @@ struct intel_crtc_state {/* Gamma mode programmed on the pipe */ uint32_t gamma_mode; + +/* HDMI scrambling status (sink) */ +bool scrambling; + +/* HDMI High TMDS char rate ratio (sink) */ +bool high_tmds_clock_ratio; };
Since this is for hdmi, maybe add that to the variable name too?
Otherwise looks sane, I wish intel_crtc->config was gone and intel_crtc_state explicitly passed, but that won't happen just yet..
Quoted 130 lines
drivers/gpu/drm/i915/intel_drv.h +8
-0struct vlv_wm_state {@@ -1609,6 +1615,14 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,bool intel_hdmi_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config,struct drm_connector_state *conn_state); +uint32_t +intel_hdmi_handle_source_scrambling (struct intel_encoder *intel_encoder, +struct drm_display_mode *mode, +uint32_t config); +void intel_hdmi_handle_sink_scrambling (struct intel_encoder *intel_encoder, +struct drm_connector *connector, +struct intel_crtc_state *config, +bool enable);void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable);drivers/gpu/drm/i915/intel_hdmi.c +99
-0@@ -34,6 +34,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> +#include <drm/drm_scdc_helper.h> #include "intel_drv.h" #include <drm/i915_drm.h> #include <drm/intel_lpe_audio.h> @@ -1795,6 +1796,111 @@ static void intel_hdmi_destroy(struct drm_connector *connector) intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; } +void intel_hdmi_handle_sink_scrambling (struct intel_encoder *intel_encoder, +struct drm_connector *connector, +struct intel_crtc_state *config, +bool enable) +{ +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&intel_encoder->base); +struct drm_scdc *scdc = &connector->display_info.hdmi.scdc; +struct drm_scrambling *scrambling = &scdc->scrambling; +struct drm_display_mode *mode = &config->base.adjusted_mode; +struct drm_i915_private *dev_priv = connector->dev->dev_private; +struct i2c_adapter *adptr =intel_gmbus_get_adapter (dev_priv, + intel_hdmi->ddc_bus); + +if (!scrambling->supported) +return ; + +DRM_DEBUG_KMS ("Setting sink scrambling for enc:%s connector:%s\n" , + intel_encoder->base.name, connector->name); + +if (enable) { + +if (mode->clock >340000 ) { +/* Set TMDS bit clock ratio to 1/40 */ + config->high_tmds_clock_ratio = +drm_scdc_set_high_tmds_clock_ratio (adptr); +if (!config->high_tmds_clock_ratio) { +DRM_ERROR ("Set high TMDS ratio failed\n" ); +return ; + } + +/* Enable sink scrambling */ + config->scrambling =drm_scdc_enable_scrambling (adptr); +if (!config->scrambling) { +DRM_ERROR ("Can't enable sink scrambling\n" ); +return ; + } + } + +/* Few sinks support scrambling at clocks <=340 MHz too */ +if (!config->scrambling && scrambling->low_rates) { + config->scrambling =drm_scdc_enable_scrambling (adptr); +if (!config->scrambling) +DRM_ERROR ("Can't enable sink scrambling\n" ); + } + +return ; + } + +if (config->high_tmds_clock_ratio) { +/* Set TMDS bit clock ratio back to 1/10 */ + config->high_tmds_clock_ratio = + !(drm_scdc_clear_high_tmds_clock_ratio (adptr)); +if (config->high_tmds_clock_ratio) +DRM_ERROR ("Reset high TMDS ratio failed\n" ); + } + +if (config->scrambling) { +/* Disable sink scrambling */ + config->scrambling = !(drm_scdc_disable_scrambling (adptr)); +if (config->scrambling) +DRM_ERROR ("Disable sink scrambling failed\n" ); + } +} + +static inline uint32_t _intel_hdmi_set_source_scrambling (uint32_t hdmi_config) +{ +return hdmi_config |= (TRANS_DDI_HDMI_SCRAMBLING | +TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ | +TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE ); +} + +uint32_t +intel_hdmi_handle_source_scrambling (struct intel_encoder *intel_encoder, +struct drm_display_mode *mode,uint32_t hdmi_config) +{ +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&intel_encoder->base); +struct drm_connector *connector = &intel_hdmi->attached_connector->base; +struct drm_hdmi_info *hdmi_info = &connector->display_info.hdmi; +struct drm_scrambling *scrambling = &hdmi_info->scdc.scrambling; + +DRM_DEBUG_KMS ("Setting scrambling for enc:%s connector:%s\n" , + intel_encoder->base.name, connector->name); + + hdmi_config &= ~(TRANS_DDI_HDMI_SCRAMBLING | +TRANS_DDI_HIGH_TMDS_CHAR_RATE | +TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ | +TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE ); + +if (mode->clock <=340000 ) { +/* Few sinks support scrambling at rate < 340 MHz too */ +if (scrambling->low_rates) + hdmi_config = +_intel_hdmi_set_source_scrambling (hdmi_config); +return hdmi_config; + } + +/* Scrambling or not, if clock > 340 MHz, set high char rate */ + hdmi_config |=TRANS_DDI_HIGH_TMDS_CHAR_RATE ;
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector) · line 1906
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +7
-0+ +if (scrambling->supported) + hdmi_config =_intel_hdmi_set_source_scrambling (hdmi_config); + +return hdmi_config; +} +static u8 intel_hdmi_ddc_pin (struct drm_i915_private *dev_priv,enum port port) {
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 5/6] drm/i915: enable scrambling
Thanks for the review Maarten.
My comments inline.
Regards
Shashank
Quoted 102 lines · Maarten Lankhorst
Op 10-02-17 om 17:29 schreef Shashank Sharma:
Quoted 101 lines
Geminilake platform sports a native HDMI 2.0 controller, and is capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required, enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in driver like inintel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling inintel_enable_ddi()before enabling the port.V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor", so that the implementation could be close to the language of HDMI spec.Signed-off-by Shashank Sharma <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_ddi.c | 28 ++++++++++ drivers/gpu/drm/i915/intel_drv.h | 14 +++++ drivers/gpu/drm/i915/intel_hdmi.c | 106 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -7819,7 +7819,11 @@ enum {#define TRANS_DDI_EDP_INPUT_B_ONOFF (5<<12)#define TRANS_DDI_EDP_INPUT_C_ONOFF (6<<12)#define TRANS_DDI_DP_VC_PAYLOAD_ALLOC (1<<8) +#define TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE (1<<7) +#define TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ (1<<6)#define TRANS_DDI_BFI_ENABLE (1<<4) +#define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1<<4) +#define TRANS_DDI_HDMI_SCRAMBLING (1<<0)/* DisplayPort Transport Control */ #define _DP_TP_CTL_A 0x64040drivers/gpu/drm/i915/intel_ddi.c +28
-0@@ -1278,6 +1278,11 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) temp |=TRANS_DDI_MODE_SELECT_HDMI ; else temp |= TRANS_DDI_MODE_SELECT_DVI; + +if (IS_GEMINILAKE (dev_priv)) + temp =intel_hdmi_handle_source_scrambling ( + intel_encoder, + &intel_crtc->config->base.adjusted_mode, temp); }else if (type ==INTEL_OUTPUT_ANALOG ) { temp |=TRANS_DDI_MODE_SELECT_FDI ; temp |= (intel_crtc->config->fdi_lanes -1 ) <<1 ;@@ -1843,6 +1848,21 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); +if (IS_GEMINILAKE (dev_priv)) { +struct intel_crtc *crtc =to_intel_crtc (encoder->crtc); +/* +* GLK sports a native HDMI 2.0 controller. If required +* clock rate is > 340 Mhz && scrambling is supported +* by sink, enable scrambling before enabling the +* HDMI 2.0 port. The sink can choose to disable the +* scrambling if it doesn't detect a scrambled within +* 100 ms. +*/ +intel_hdmi_handle_sink_scrambling (intel_encoder, + conn_state->connector, + crtc->config, true); + } +/* In HDMI/DVI mode, the port width, and swing/emphasis values * are ignored so nothing special needs to be done besides * enabling the port. @@ -1875,6 +1895,14 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder,if (old_crtc_state->has_audio)intel_audio_codec_disable (intel_encoder); +if (type ==INTEL_OUTPUT_HDMI ) { +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->crtc); + +intel_hdmi_handle_sink_scrambling (intel_encoder, + old_conn_state->connector, + intel_crtc->config, false); + } +if (type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -691,6 +691,12 @@ struct intel_crtc_state {
Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h struct intel_crtc_state { · line 700
Quoted 9 lines
drivers/gpu/drm/i915/intel_drv.h +6
-0/* Gamma mode programmed on the pipe */ uint32_t gamma_mode; + +/* HDMI scrambling status (sink) */ +bool scrambling; + +/* HDMI High TMDS char rate ratio (sink) */ +bool high_tmds_clock_ratio; };Since this is for hdmi, maybe add that to the variable name too?
Yes, we can very well do this. I will address this.
Quoted 1 line
Otherwise looks sane, I wish
intel_crtc->configwas gone andintel_crtc_stateexplicitly passed, but that won't happen just yet..
Yeah, I know, that would be cleaner. But in the current code this is more feasible to do, isn't it ?
- Shashank
Quoted 132 lines
Quoted 132 lines
drivers/gpu/drm/i915/intel_drv.h +8
-0struct vlv_wm_state {@@ -1609,6 +1615,14 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,bool intel_hdmi_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config,struct drm_connector_state *conn_state); +uint32_t +intel_hdmi_handle_source_scrambling (struct intel_encoder *intel_encoder, +struct drm_display_mode *mode, +uint32_t config); +void intel_hdmi_handle_sink_scrambling (struct intel_encoder *intel_encoder, +struct drm_connector *connector, +struct intel_crtc_state *config, +bool enable);void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable);drivers/gpu/drm/i915/intel_hdmi.c +101
-0@@ -34,6 +34,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h> +#include <drm/drm_scdc_helper.h> #include "intel_drv.h" #include <drm/i915_drm.h> #include <drm/intel_lpe_audio.h> @@ -1795,6 +1796,111 @@ static void intel_hdmi_destroy(struct drm_connector *connector) intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; } +void intel_hdmi_handle_sink_scrambling (struct intel_encoder *intel_encoder, +struct drm_connector *connector, +struct intel_crtc_state *config, +bool enable) +{ +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&intel_encoder->base); +struct drm_scdc *scdc = &connector->display_info.hdmi.scdc; +struct drm_scrambling *scrambling = &scdc->scrambling; +struct drm_display_mode *mode = &config->base.adjusted_mode; +struct drm_i915_private *dev_priv = connector->dev->dev_private; +struct i2c_adapter *adptr =intel_gmbus_get_adapter (dev_priv, + intel_hdmi->ddc_bus); + +if (!scrambling->supported) +return ; + +DRM_DEBUG_KMS ("Setting sink scrambling for enc:%s connector:%s\n" , + intel_encoder->base.name, connector->name); + +if (enable) { + +if (mode->clock >340000 ) { +/* Set TMDS bit clock ratio to 1/40 */ + config->high_tmds_clock_ratio = +drm_scdc_set_high_tmds_clock_ratio (adptr); +if (!config->high_tmds_clock_ratio) { +DRM_ERROR ("Set high TMDS ratio failed\n" ); +return ; + } + +/* Enable sink scrambling */ + config->scrambling =drm_scdc_enable_scrambling (adptr); +if (!config->scrambling) { +DRM_ERROR ("Can't enable sink scrambling\n" ); +return ; + } + } + +/* Few sinks support scrambling at clocks <=340 MHz too */ +if (!config->scrambling && scrambling->low_rates) { + config->scrambling =drm_scdc_enable_scrambling (adptr); +if (!config->scrambling) +DRM_ERROR ("Can't enable sink scrambling\n" ); + } + +return ; + } + +if (config->high_tmds_clock_ratio) { +/* Set TMDS bit clock ratio back to 1/10 */ + config->high_tmds_clock_ratio = + !(drm_scdc_clear_high_tmds_clock_ratio (adptr)); +if (config->high_tmds_clock_ratio) +DRM_ERROR ("Reset high TMDS ratio failed\n" ); + } + +if (config->scrambling) { +/* Disable sink scrambling */ + config->scrambling = !(drm_scdc_disable_scrambling (adptr)); +if (config->scrambling) +DRM_ERROR ("Disable sink scrambling failed\n" ); + } +} + +static inline uint32_t _intel_hdmi_set_source_scrambling (uint32_t hdmi_config) +{ +return hdmi_config |= (TRANS_DDI_HDMI_SCRAMBLING | +TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ | +TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE ); +} + +uint32_t +intel_hdmi_handle_source_scrambling (struct intel_encoder *intel_encoder, +struct drm_display_mode *mode,uint32_t hdmi_config) +{ +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&intel_encoder->base); +struct drm_connector *connector = &intel_hdmi->attached_connector->base; +struct drm_hdmi_info *hdmi_info = &connector->display_info.hdmi; +struct drm_scrambling *scrambling = &hdmi_info->scdc.scrambling; + +DRM_DEBUG_KMS ("Setting scrambling for enc:%s connector:%s\n" , + intel_encoder->base.name, connector->name); + + hdmi_config &= ~(TRANS_DDI_HDMI_SCRAMBLING | +TRANS_DDI_HIGH_TMDS_CHAR_RATE | +TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ | +TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE ); + +if (mode->clock <=340000 ) { +/* Few sinks support scrambling at rate < 340 MHz too */ +if (scrambling->low_rates) + hdmi_config = +_intel_hdmi_set_source_scrambling (hdmi_config); +return hdmi_config; + } + +/* Scrambling or not, if clock > 340 MHz, set high char rate */ + hdmi_config |=TRANS_DDI_HIGH_TMDS_CHAR_RATE ; + +if (scrambling->supported)
Quoted 9 lines
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector) · line 1906
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +5
-0+ hdmi_config =_intel_hdmi_set_source_scrambling (hdmi_config); + +return hdmi_config; +} +static u8 intel_hdmi_ddc_pin (struct drm_i915_private *dev_priv,enum port port) {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/6 drm/i915: allow HDMI 2.0 clock rates
In reply to Shashank SharmaGeminilake has a native HDMI 2.0 controller, which is capable of driving clocks upto 594Mhz. This patch updates the max tmds clock limit for the same.
V2: rebase
V3: rebase
--- drivers/gpu/drm/i915/intel_hdmi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
@@ -1210,6 +1210,8 @@ static int intel_hdmi_source_max_tmds_clock(struct drm_i915_private *dev_priv) {if (IS_G4X (dev_priv))return 165000 ; +else if (IS_GEMINILAKE (dev_priv)) +return 594000 ;else if (IS_HASWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=8 )return 300000 ;else
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-gfx] [PATCH v3 6/6] drm/i915: allow HDMI 2.0 clock rates
Quoted 18 lines · Shashank Sharma
Geminilake has a native HDMI 2.0 controller, which is capable of driving clocks upto 594Mhz. This patch updates the max tmds clock limit for the same.
V2: rebase
V3: rebaseCc Ander Conselvan De Oliveira <[email protected]>Signed-off-by Shashank Sharma <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/intel_hdmi.c +0
-0
drivers/gpu/drm/i915/intel_hdmi.c static int intel_hdmi_source_max_tmds_clock(struct drm_i915_private *dev_priv) · line 1217
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +2
-0@@ -1210,6 +1210,8 @@ static int intel_hdmi_source_max_tmds_clock(struct drm_i915_private *dev_priv) {if (IS_G4X (dev_priv))return 165000 ; +else if (IS_GEMINILAKE (dev_priv)) +return 594000 ;else if (IS_HASWELL (dev_priv) ||INTEL_INFO (dev_priv)->gen >=8 )return 300000 ;else
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✓ Fi.CI.BAT: success for HDMI 2.0: Scrambling in DRM layer (rev2)
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: HDMI 2.0: Scrambling in DRM layer (rev2)
URL : https://patchwork.freedesktop.org/series/19161/
State : success
== Summary ==
Series 19161v2 HDMI 2.0: Scrambling in DRM layer
https://patchwork.freedesktop.org/api/1.0/series/19161/revisions/2/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (fi-ilk-650) FDO#99732FDO#99732 https://bugs.freedesktop.org/show_bug.cgi?id=99732
fi-bdw-5557u total:252 pass:241 dwarn:0 dfail:0 fail:0 skip:11 fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19 fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16 fi-hsw-4770r total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16 fi-ilk-650 total:209 pass:165 dwarn:0 dfail:0 fail:0 skip:43 fi-ivb-3520m total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18 fi-ivb-3770 total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18 fi-kbl-7500u total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18 fi-skl-6260u total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10 fi-skl-6700hq total:252 pass:235 dwarn:0 dfail:0 fail:0 skip:17 fi-skl-6700k total:252 pass:230 dwarn:4 dfail:0 fail:0 skip:18 fi-skl-6770hq total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10 fi-snb-2520m total:252 pass:224 dwarn:0 dfail:0 fail:0 skip:28 fi-snb-2600 total:252 pass:223 dwarn:0 dfail:0 fail:0 skip:29
de2ea45a48455f125439790c71bd1a5a7e82a167 drm-tip: 2017y-02m-10d-16h-49m-01s UTC integration manifest bb64cca drm/i915: allow HDMI 2.0 clock rates
eddad8a drm/i915: enable scrambling
ac60344 drm: scrambling support in drm layer
aeaae73 drm/edid: detect SCDC support in HF-VSDB
b542bcc drm/edid: check for HF-VSDB block
b5efee4 drm: Add SCDC helpers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3770/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx