* [Intel-gfx] [PATCH v3] drm/i915/hdcp: conversion to struct drm_device based logging macros.
@ 2020-02-12 12:30 Ramalingam C
2020-02-13 0:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ramalingam C @ 2020-02-12 12:30 UTC (permalink / raw)
To: intel-gfx
Converts remaining instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros
manually.
This is continuation of commit 65833c463886 ("drm/i915/hdcp: conversion
to struct drm_device based logging macros.")
v2:
i915_dev_priv is used instead of drm_device for reusability [JaniN]
v3:
Made it independent from the series.
once instance of dev_priv naming is changed to i915 [Jani N]
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 109 ++++++++++++----------
1 file changed, 62 insertions(+), 47 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 30e0a3aa9d57..a5b2163b28a0 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -43,6 +43,7 @@ static
int intel_hdcp_read_valid_bksv(struct intel_digital_port *intel_dig_port,
const struct intel_hdcp_shim *shim, u8 *bksv)
{
+ struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
int ret, i, tries = 2;
/* HDCP spec states that we must retry the bksv if it is invalid */
@@ -54,7 +55,7 @@ int intel_hdcp_read_valid_bksv(struct intel_digital_port *intel_dig_port,
break;
}
if (i == tries) {
- DRM_DEBUG_KMS("Bksv is invalid\n");
+ drm_dbg_kms(&i915->drm, "Bksv is invalid\n");
return -ENODEV;
}
@@ -485,8 +486,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,
return ret;
sha_idx += sizeof(sha_text);
} else {
- DRM_DEBUG_KMS("Invalid number of leftovers %d\n",
- sha_leftovers);
+ drm_dbg_kms(&dev_priv->drm, "Invalid number of leftovers %d\n",
+ sha_leftovers);
return -EINVAL;
}
@@ -514,11 +515,11 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,
rep_ctl | HDCP_SHA1_COMPLETE_HASH);
if (intel_de_wait_for_set(dev_priv, HDCP_REP_CTL,
HDCP_SHA1_COMPLETE, 1)) {
- DRM_ERROR("Timed out waiting for SHA1 complete\n");
+ drm_err(&dev_priv->drm, "Timed out waiting for SHA1 complete\n");
return -ETIMEDOUT;
}
if (!(intel_de_read(dev_priv, HDCP_REP_CTL) & HDCP_SHA1_V_MATCH)) {
- DRM_DEBUG_KMS("SHA-1 mismatch, HDCP failed\n");
+ drm_dbg_kms(&dev_priv->drm, "SHA-1 mismatch, HDCP failed\n");
return -ENXIO;
}
@@ -537,7 +538,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
ret = intel_hdcp_poll_ksv_fifo(intel_dig_port, shim);
if (ret) {
- DRM_DEBUG_KMS("KSV list failed to become ready (%d)\n", ret);
+ drm_dbg_kms(&dev_priv->drm,
+ "KSV list failed to become ready (%d)\n", ret);
return ret;
}
@@ -547,7 +549,7 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
if (DRM_HDCP_MAX_DEVICE_EXCEEDED(bstatus[0]) ||
DRM_HDCP_MAX_CASCADE_EXCEEDED(bstatus[1])) {
- DRM_DEBUG_KMS("Max Topology Limit Exceeded\n");
+ drm_dbg_kms(&dev_priv->drm, "Max Topology Limit Exceeded\n");
return -EPERM;
}
@@ -560,13 +562,14 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
*/
num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]);
if (num_downstream == 0) {
- DRM_DEBUG_KMS("Repeater with zero downstream devices\n");
+ drm_dbg_kms(&dev_priv->drm,
+ "Repeater with zero downstream devices\n");
return -EINVAL;
}
ksv_fifo = kcalloc(DRM_HDCP_KSV_LEN, num_downstream, GFP_KERNEL);
if (!ksv_fifo) {
- DRM_DEBUG_KMS("Out of mem: ksv_fifo\n");
+ drm_dbg_kms(&dev_priv->drm, "Out of mem: ksv_fifo\n");
return -ENOMEM;
}
@@ -576,7 +579,7 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, ksv_fifo,
num_downstream)) {
- DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");
+ drm_err(&dev_priv->drm, "Revoked Ksv(s) in ksv_fifo\n");
ret = -EPERM;
goto err;
}
@@ -594,12 +597,13 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
}
if (i == tries) {
- DRM_DEBUG_KMS("V Prime validation failed.(%d)\n", ret);
+ drm_dbg_kms(&dev_priv->drm,
+ "V Prime validation failed.(%d)\n", ret);
goto err;
}
- DRM_DEBUG_KMS("HDCP is enabled (%d downstream devices)\n",
- num_downstream);
+ drm_dbg_kms(&dev_priv->drm, "HDCP is enabled (%d downstream devices)\n",
+ num_downstream);
ret = 0;
err:
kfree(ksv_fifo);
@@ -642,7 +646,8 @@ static int intel_hdcp_auth(struct intel_connector *connector)
if (ret)
return ret;
if (!hdcp_capable) {
- DRM_DEBUG_KMS("Panel is not HDCP capable\n");
+ drm_dbg_kms(&dev_priv->drm,
+ "Panel is not HDCP capable\n");
return -EINVAL;
}
}
@@ -659,7 +664,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
if (intel_de_wait_for_set(dev_priv,
HDCP_STATUS(dev_priv, cpu_transcoder, port),
HDCP_STATUS_AN_READY, 1)) {
- DRM_ERROR("Timed out waiting for An\n");
+ drm_err(&dev_priv->drm, "Timed out waiting for An\n");
return -ETIMEDOUT;
}
@@ -680,7 +685,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
return ret;
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, bksv.shim, 1)) {
- DRM_ERROR("BKSV is revoked\n");
+ drm_err(&dev_priv->drm, "BKSV is revoked\n");
return -EPERM;
}
@@ -706,7 +711,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
/* Wait for R0 ready */
if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
(HDCP_STATUS_R0_READY | HDCP_STATUS_ENC), 1)) {
- DRM_ERROR("Timed out waiting for R0 ready\n");
+ drm_err(&dev_priv->drm, "Timed out waiting for R0 ready\n");
return -ETIMEDOUT;
}
@@ -743,8 +748,10 @@ static int intel_hdcp_auth(struct intel_connector *connector)
}
if (i == tries) {
- DRM_DEBUG_KMS("Timed out waiting for Ri prime match (%x)\n",
- intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)));
+ drm_dbg_kms(&dev_priv->drm,
+ "Timed out waiting for Ri prime match (%x)\n",
+ intel_de_read(dev_priv, HDCP_STATUS(dev_priv,
+ cpu_transcoder, port)));
return -ETIMEDOUT;
}
@@ -753,7 +760,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
HDCP_STATUS(dev_priv, cpu_transcoder, port),
HDCP_STATUS_ENC,
ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
- DRM_ERROR("Timed out waiting for encryption\n");
+ drm_err(&dev_priv->drm, "Timed out waiting for encryption\n");
return -ETIMEDOUT;
}
@@ -765,7 +772,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
if (repeater_present)
return intel_hdcp_auth_downstream(connector);
- DRM_DEBUG_KMS("HDCP is enabled (no repeater present)\n");
+ drm_dbg_kms(&dev_priv->drm, "HDCP is enabled (no repeater present)\n");
return 0;
}
@@ -1270,7 +1277,7 @@ static int hdcp2_authentication_key_exchange(struct intel_connector *connector)
return ret;
if (msgs.send_cert.rx_caps[0] != HDCP_2_2_RX_CAPS_VERSION_VAL) {
- DRM_DEBUG_KMS("cert.rx_caps dont claim HDCP2.2\n");
+ drm_dbg_kms(&dev_priv->drm, "cert.rx_caps dont claim HDCP2.2\n");
return -EINVAL;
}
@@ -1279,7 +1286,7 @@ static int hdcp2_authentication_key_exchange(struct intel_connector *connector)
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
msgs.send_cert.cert_rx.receiver_id,
1)) {
- DRM_ERROR("Receiver ID is revoked\n");
+ drm_err(&dev_priv->drm, "Receiver ID is revoked\n");
return -EPERM;
}
@@ -1454,7 +1461,7 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
if (HDCP_2_2_MAX_CASCADE_EXCEEDED(rx_info[1]) ||
HDCP_2_2_MAX_DEVS_EXCEEDED(rx_info[1])) {
- DRM_DEBUG_KMS("Topology Max Size Exceeded\n");
+ drm_dbg_kms(&dev_priv->drm, "Topology Max Size Exceeded\n");
return -EINVAL;
}
@@ -1464,7 +1471,7 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
if (seq_num_v < hdcp->seq_num_v) {
/* Roll over of the seq_num_v from repeater. Reauthenticate. */
- DRM_DEBUG_KMS("Seq_num_v roll over.\n");
+ drm_dbg_kms(&dev_priv->drm, "Seq_num_v roll over.\n");
return -EINVAL;
}
@@ -1473,7 +1480,7 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
msgs.recvid_list.receiver_ids,
device_cnt)) {
- DRM_ERROR("Revoked receiver ID(s) is in list\n");
+ drm_err(&dev_priv->drm, "Revoked receiver ID(s) is in list\n");
return -EPERM;
}
@@ -1506,25 +1513,27 @@ static int hdcp2_authenticate_repeater(struct intel_connector *connector)
static int hdcp2_authenticate_sink(struct intel_connector *connector)
{
struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
+ struct drm_i915_private *i915 = to_i915(connector->base.dev);
struct intel_hdcp *hdcp = &connector->hdcp;
const struct intel_hdcp_shim *shim = hdcp->shim;
int ret;
ret = hdcp2_authentication_key_exchange(connector);
if (ret < 0) {
- DRM_DEBUG_KMS("AKE Failed. Err : %d\n", ret);
+ drm_dbg_kms(&i915->drm, "AKE Failed. Err : %d\n", ret);
return ret;
}
ret = hdcp2_locality_check(connector);
if (ret < 0) {
- DRM_DEBUG_KMS("Locality Check failed. Err : %d\n", ret);
+ drm_dbg_kms(&i915->drm,
+ "Locality Check failed. Err : %d\n", ret);
return ret;
}
ret = hdcp2_session_key_exchange(connector);
if (ret < 0) {
- DRM_DEBUG_KMS("SKE Failed. Err : %d\n", ret);
+ drm_dbg_kms(&i915->drm, "SKE Failed. Err : %d\n", ret);
return ret;
}
@@ -1539,7 +1548,8 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector)
if (hdcp->is_repeater) {
ret = hdcp2_authenticate_repeater(connector);
if (ret < 0) {
- DRM_DEBUG_KMS("Repeater Auth Failed. Err: %d\n", ret);
+ drm_dbg_kms(&i915->drm,
+ "Repeater Auth Failed. Err: %d\n", ret);
return ret;
}
}
@@ -1628,6 +1638,7 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)
static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
{
+ struct drm_i915_private *i915 = to_i915(connector->base.dev);
int ret, i, tries = 3;
for (i = 0; i < tries; i++) {
@@ -1636,10 +1647,10 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
break;
/* Clearing the mei hdcp session */
- DRM_DEBUG_KMS("HDCP2.2 Auth %d of %d Failed.(%d)\n",
- i + 1, tries, ret);
+ drm_dbg_kms(&i915->drm, "HDCP2.2 Auth %d of %d Failed.(%d)\n",
+ i + 1, tries, ret);
if (hdcp2_deauthenticate_port(connector) < 0)
- DRM_DEBUG_KMS("Port deauth failed.\n");
+ drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
}
if (i != tries) {
@@ -1650,9 +1661,10 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
msleep(HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN);
ret = hdcp2_enable_encryption(connector);
if (ret < 0) {
- DRM_DEBUG_KMS("Encryption Enable Failed.(%d)\n", ret);
+ drm_dbg_kms(&i915->drm,
+ "Encryption Enable Failed.(%d)\n", ret);
if (hdcp2_deauthenticate_port(connector) < 0)
- DRM_DEBUG_KMS("Port deauth failed.\n");
+ drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
}
}
@@ -1661,23 +1673,24 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
static int _intel_hdcp2_enable(struct intel_connector *connector)
{
+ struct drm_i915_private *i915 = to_i915(connector->base.dev);
struct intel_hdcp *hdcp = &connector->hdcp;
int ret;
- DRM_DEBUG_KMS("[%s:%d] HDCP2.2 is being enabled. Type: %d\n",
- connector->base.name, connector->base.base.id,
- hdcp->content_type);
+ drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being enabled. Type: %d\n",
+ connector->base.name, connector->base.base.id,
+ hdcp->content_type);
ret = hdcp2_authenticate_and_encrypt(connector);
if (ret) {
- DRM_DEBUG_KMS("HDCP2 Type%d Enabling Failed. (%d)\n",
- hdcp->content_type, ret);
+ drm_dbg_kms(&i915->drm, "HDCP2 Type%d Enabling Failed. (%d)\n",
+ hdcp->content_type, ret);
return ret;
}
- DRM_DEBUG_KMS("[%s:%d] HDCP2.2 is enabled. Type %d\n",
- connector->base.name, connector->base.base.id,
- hdcp->content_type);
+ drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is enabled. Type %d\n",
+ connector->base.name, connector->base.base.id,
+ hdcp->content_type);
hdcp->hdcp2_encrypted = true;
return 0;
@@ -1685,15 +1698,16 @@ static int _intel_hdcp2_enable(struct intel_connector *connector)
static int _intel_hdcp2_disable(struct intel_connector *connector)
{
+ struct drm_i915_private *i915 = to_i915(connector->base.dev);
int ret;
- DRM_DEBUG_KMS("[%s:%d] HDCP2.2 is being Disabled\n",
- connector->base.name, connector->base.base.id);
+ drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being Disabled\n",
+ connector->base.name, connector->base.base.id);
ret = hdcp2_disable_encryption(connector);
if (hdcp2_deauthenticate_port(connector) < 0)
- DRM_DEBUG_KMS("Port deauth failed.\n");
+ drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
connector->hdcp.hdcp2_encrypted = false;
@@ -1935,12 +1949,13 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv)
static void intel_hdcp2_init(struct intel_connector *connector,
const struct intel_hdcp_shim *shim)
{
+ struct drm_i915_private *i915 = to_i915(connector->base.dev);
struct intel_hdcp *hdcp = &connector->hdcp;
int ret;
ret = initialize_hdcp_port_data(connector, shim);
if (ret) {
- DRM_DEBUG_KMS("Mei hdcp data init failed\n");
+ drm_dbg_kms(&i915->drm, "Mei hdcp data init failed\n");
return;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/hdcp: conversion to struct drm_device based logging macros.
2020-02-12 12:30 [Intel-gfx] [PATCH v3] drm/i915/hdcp: conversion to struct drm_device based logging macros Ramalingam C
@ 2020-02-13 0:57 ` Patchwork
2020-02-13 1:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-02-13 0:57 UTC (permalink / raw)
To: Ramalingam C; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/hdcp: conversion to struct drm_device based logging macros.
URL : https://patchwork.freedesktop.org/series/73354/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
7a0324dd9a39 drm/i915/hdcp: conversion to struct drm_device based logging macros.
-:177: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#177: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:754:
+ intel_de_read(dev_priv, HDCP_STATUS(dev_priv,
+ cpu_transcoder, port)));
total: 0 errors, 0 warnings, 1 checks, 332 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/hdcp: conversion to struct drm_device based logging macros.
2020-02-12 12:30 [Intel-gfx] [PATCH v3] drm/i915/hdcp: conversion to struct drm_device based logging macros Ramalingam C
2020-02-13 0:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2020-02-13 1:40 ` Patchwork
2020-02-16 1:18 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-03-04 0:56 ` [Intel-gfx] [PATCH v3] " Ramalingam C
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-02-13 1:40 UTC (permalink / raw)
To: Ramalingam C; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/hdcp: conversion to struct drm_device based logging macros.
URL : https://patchwork.freedesktop.org/series/73354/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7926 -> Patchwork_16540
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/index.html
Known issues
------------
Here are the changes found in Patchwork_16540 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_gem_contexts:
- fi-cml-s: [PASS][1] -> [DMESG-FAIL][2] ([i915#877])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/fi-cml-s/igt@i915_selftest@live_gem_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/fi-cml-s/igt@i915_selftest@live_gem_contexts.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][3] -> [FAIL][4] ([fdo#111407])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[i915#877]: https://gitlab.freedesktop.org/drm/intel/issues/877
[i915#937]: https://gitlab.freedesktop.org/drm/intel/issues/937
Participating hosts (45 -> 43)
------------------------------
Additional (7): fi-hsw-peppy fi-skl-6770hq fi-bdw-gvtdvm fi-glk-dsi fi-gdg-551 fi-bsw-kefka fi-kbl-r
Missing (9): fi-ilk-m540 fi-bdw-5557u fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-kbl-guc fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7926 -> Patchwork_16540
CI-20190529: 20190529
CI_DRM_7926: 6b2fe829d300abf285e9db8b252ffacd216df3ed @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5437: ae42fedfd0c536c560e8e17b06d9c7b94a4e8f0c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16540: 7a0324dd9a391e02aec32c0afcec6cf12740e324 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7a0324dd9a39 drm/i915/hdcp: conversion to struct drm_device based logging macros.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/hdcp: conversion to struct drm_device based logging macros.
2020-02-12 12:30 [Intel-gfx] [PATCH v3] drm/i915/hdcp: conversion to struct drm_device based logging macros Ramalingam C
2020-02-13 0:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-02-13 1:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2020-02-16 1:18 ` Patchwork
2020-03-04 0:56 ` [Intel-gfx] [PATCH v3] " Ramalingam C
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-02-16 1:18 UTC (permalink / raw)
To: Ramalingam C; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/hdcp: conversion to struct drm_device based logging macros.
URL : https://patchwork.freedesktop.org/series/73354/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7926_full -> Patchwork_16540_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_16540_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@busy-vcs1:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +12 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb4/igt@gem_busy@busy-vcs1.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb3/igt@gem_busy@busy-vcs1.html
* igt@gem_busy@close-race:
- shard-tglb: [PASS][3] -> [INCOMPLETE][4] ([i915#977])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-tglb3/igt@gem_busy@close-race.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-tglb3/igt@gem_busy@close-race.html
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [PASS][5] -> [DMESG-WARN][6] ([i915#180]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-kbl4/igt@gem_ctx_isolation@rcs0-s3.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-kbl7/igt@gem_ctx_isolation@rcs0-s3.html
* igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([i915#677]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb7/igt@gem_exec_schedule@pi-common-bsd.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb2/igt@gem_exec_schedule@pi-common-bsd.html
* igt@gem_exec_schedule@preempt-contexts-bsd2:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109276]) +17 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb1/igt@gem_exec_schedule@preempt-contexts-bsd2.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb8/igt@gem_exec_schedule@preempt-contexts-bsd2.html
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#112146]) +6 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb7/igt@gem_exec_schedule@reorder-wide-bsd.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb4/igt@gem_exec_schedule@reorder-wide-bsd.html
* igt@gem_partial_pwrite_pread@writes-after-reads-uncached:
- shard-hsw: [PASS][13] -> [FAIL][14] ([i915#694]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-hsw7/igt@gem_partial_pwrite_pread@writes-after-reads-uncached.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-hsw5/igt@gem_partial_pwrite_pread@writes-after-reads-uncached.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-apl: [PASS][15] -> [FAIL][16] ([i915#644])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-apl2/igt@gem_ppgtt@flink-and-close-vma-leak.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-apl4/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@kms_color@pipe-a-gamma:
- shard-tglb: [PASS][17] -> [FAIL][18] ([i915#1149])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-tglb7/igt@kms_color@pipe-a-gamma.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-tglb7/igt@kms_color@pipe-a-gamma.html
* igt@kms_cursor_crc@pipe-c-cursor-128x128-random:
- shard-skl: [PASS][19] -> [FAIL][20] ([i915#54])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl1/igt@kms_cursor_crc@pipe-c-cursor-128x128-random.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-128x128-random.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][21] -> [FAIL][22] ([IGT#5] / [i915#697])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][23] -> [FAIL][24] ([i915#79])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl7/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
- shard-apl: [PASS][25] -> [FAIL][26] ([i915#79])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-apl4/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-apl3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-hsw: [PASS][27] -> [INCOMPLETE][28] ([i915#61])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-hsw1/igt@kms_flip@flip-vs-suspend-interruptible.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-hsw5/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_frontbuffer_tracking@basic:
- shard-skl: [PASS][29] -> [FAIL][30] ([i915#49])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl2/igt@kms_frontbuffer_tracking@basic.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl1/igt@kms_frontbuffer_tracking@basic.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [PASS][31] -> [DMESG-WARN][32] ([i915#180]) +4 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-apl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-apl8/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][33] -> [FAIL][34] ([fdo#108145] / [i915#265])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl5/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [PASS][35] -> [FAIL][36] ([fdo#108145]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-skl: [PASS][37] -> [DMESG-WARN][38] ([IGT#6])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl4/igt@kms_plane_multiple@atomic-pipe-b-tiling-y.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl9/igt@kms_plane_multiple@atomic-pipe-b-tiling-y.html
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [PASS][39] -> [SKIP][40] ([fdo#109441])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb7/igt@kms_psr@psr2_cursor_plane_move.html
#### Possible fixes ####
* igt@gem_caching@reads:
- shard-hsw: [FAIL][41] ([i915#694]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-hsw6/igt@gem_caching@reads.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-hsw1/igt@gem_caching@reads.html
* igt@gem_exec_schedule@pi-userfault-bsd:
- shard-iclb: [SKIP][43] ([i915#677]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb2/igt@gem_exec_schedule@pi-userfault-bsd.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb7/igt@gem_exec_schedule@pi-userfault-bsd.html
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [SKIP][45] ([fdo#109276]) -> [PASS][46] +14 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb5/igt@gem_exec_schedule@preempt-queue-bsd1.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb2/igt@gem_exec_schedule@preempt-queue-bsd1.html
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][47] ([fdo#112146]) -> [PASS][48] +7 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb1/igt@gem_exec_schedule@preemptive-hang-bsd.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb8/igt@gem_exec_schedule@preemptive-hang-bsd.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-kbl: [FAIL][49] ([i915#644]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-kbl1/igt@gem_ppgtt@flink-and-close-vma-leak.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-kbl6/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gem_wait@await-vcs1:
- shard-iclb: [SKIP][51] ([fdo#112080]) -> [PASS][52] +9 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb7/igt@gem_wait@await-vcs1.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb2/igt@gem_wait@await-vcs1.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [INCOMPLETE][53] ([i915#716]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl9/igt@gen9_exec_parse@allowed-single.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl4/igt@gen9_exec_parse@allowed-single.html
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][55] ([i915#180]) -> [PASS][56] +3 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-kbl7/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
* igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-ytiled:
- shard-glk: [FAIL][57] ([i915#52] / [i915#54]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-glk7/igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-ytiled.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-glk7/igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-ytiled.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [FAIL][59] ([i915#34]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl6/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl3/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-render:
- shard-skl: [FAIL][61] ([i915#49]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl9/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-render.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl5/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-render.html
* {igt@kms_hdr@bpc-switch-dpms}:
- shard-skl: [FAIL][63] ([i915#1188]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl3/igt@kms_hdr@bpc-switch-dpms.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl3/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-skl: [FAIL][65] ([i915#53]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl9/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl5/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-apl: [DMESG-WARN][67] ([i915#180]) -> [PASS][68] +2 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-apl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-apl3/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][69] ([fdo#108145]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-glk: [FAIL][71] ([i915#899]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-glk7/igt@kms_plane_lowres@pipe-a-tiling-x.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-glk7/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][73] ([fdo#109441]) -> [PASS][74] +1 similar issue
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][75] ([i915#31]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-apl7/igt@kms_setmode@basic.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-apl6/igt@kms_setmode@basic.html
#### Warnings ####
* igt@gem_tiled_blits@normal:
- shard-hsw: [FAIL][77] ([i915#818]) -> [FAIL][78] ([i915#694])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7926/shard-hsw5/igt@gem_tiled_blits@normal.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16540/shard-hsw5/igt@gem_tiled_blits@normal.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#5]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/5
[IGT#6]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/6
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#1149]: https://gitlab.freedesktop.org/drm/intel/issues/1149
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#53]: https://gitlab.freedesktop.org/drm/intel/issues/53
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#697]: https://gitlab.freedesktop.org/drm/intel/issues/697
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#818]: https://gitlab.freedesktop.org/drm/intel/issues/818
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[i915#977]: https://gitlab.freedesktop.org/drm/intel/issues/977
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7926 -> Patchwork_16540
CI-20190529: 20190529
CI_DRM_7926: 6b2fe829d300abf285e9db8b252ffacd216df3ed @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5437: ae42fedfd0c536c560e8e17b06d9c7b94a4e8f0c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16540: 7a0324dd9a391e02aec32c0afcec6cf12740e324 @ 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_16540/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH v3] drm/i915/hdcp: conversion to struct drm_device based logging macros.
2020-02-12 12:30 [Intel-gfx] [PATCH v3] drm/i915/hdcp: conversion to struct drm_device based logging macros Ramalingam C
` (2 preceding siblings ...)
2020-02-16 1:18 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2020-03-04 0:56 ` Ramalingam C
3 siblings, 0 replies; 5+ messages in thread
From: Ramalingam C @ 2020-03-04 0:56 UTC (permalink / raw)
To: intel-gfx
On 2020-02-12 at 18:00:07 +0530, Ramalingam C wrote:
> Converts remaining instances of the printk based logging macros in
> i915/display/intel_hdcp.c with the struct drm_device based macros
> manually.
>
> This is continuation of commit 65833c463886 ("drm/i915/hdcp: conversion
> to struct drm_device based logging macros.")
>
> v2:
> i915_dev_priv is used instead of drm_device for reusability [JaniN]
> v3:
> Made it independent from the series.
> once instance of dev_priv naming is changed to i915 [Jani N]
>
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Thanks Jani for the review. Submitted to dinq.
-Ram
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 109 ++++++++++++----------
> 1 file changed, 62 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 30e0a3aa9d57..a5b2163b28a0 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -43,6 +43,7 @@ static
> int intel_hdcp_read_valid_bksv(struct intel_digital_port *intel_dig_port,
> const struct intel_hdcp_shim *shim, u8 *bksv)
> {
> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
> int ret, i, tries = 2;
>
> /* HDCP spec states that we must retry the bksv if it is invalid */
> @@ -54,7 +55,7 @@ int intel_hdcp_read_valid_bksv(struct intel_digital_port *intel_dig_port,
> break;
> }
> if (i == tries) {
> - DRM_DEBUG_KMS("Bksv is invalid\n");
> + drm_dbg_kms(&i915->drm, "Bksv is invalid\n");
> return -ENODEV;
> }
>
> @@ -485,8 +486,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,
> return ret;
> sha_idx += sizeof(sha_text);
> } else {
> - DRM_DEBUG_KMS("Invalid number of leftovers %d\n",
> - sha_leftovers);
> + drm_dbg_kms(&dev_priv->drm, "Invalid number of leftovers %d\n",
> + sha_leftovers);
> return -EINVAL;
> }
>
> @@ -514,11 +515,11 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,
> rep_ctl | HDCP_SHA1_COMPLETE_HASH);
> if (intel_de_wait_for_set(dev_priv, HDCP_REP_CTL,
> HDCP_SHA1_COMPLETE, 1)) {
> - DRM_ERROR("Timed out waiting for SHA1 complete\n");
> + drm_err(&dev_priv->drm, "Timed out waiting for SHA1 complete\n");
> return -ETIMEDOUT;
> }
> if (!(intel_de_read(dev_priv, HDCP_REP_CTL) & HDCP_SHA1_V_MATCH)) {
> - DRM_DEBUG_KMS("SHA-1 mismatch, HDCP failed\n");
> + drm_dbg_kms(&dev_priv->drm, "SHA-1 mismatch, HDCP failed\n");
> return -ENXIO;
> }
>
> @@ -537,7 +538,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>
> ret = intel_hdcp_poll_ksv_fifo(intel_dig_port, shim);
> if (ret) {
> - DRM_DEBUG_KMS("KSV list failed to become ready (%d)\n", ret);
> + drm_dbg_kms(&dev_priv->drm,
> + "KSV list failed to become ready (%d)\n", ret);
> return ret;
> }
>
> @@ -547,7 +549,7 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>
> if (DRM_HDCP_MAX_DEVICE_EXCEEDED(bstatus[0]) ||
> DRM_HDCP_MAX_CASCADE_EXCEEDED(bstatus[1])) {
> - DRM_DEBUG_KMS("Max Topology Limit Exceeded\n");
> + drm_dbg_kms(&dev_priv->drm, "Max Topology Limit Exceeded\n");
> return -EPERM;
> }
>
> @@ -560,13 +562,14 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
> */
> num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]);
> if (num_downstream == 0) {
> - DRM_DEBUG_KMS("Repeater with zero downstream devices\n");
> + drm_dbg_kms(&dev_priv->drm,
> + "Repeater with zero downstream devices\n");
> return -EINVAL;
> }
>
> ksv_fifo = kcalloc(DRM_HDCP_KSV_LEN, num_downstream, GFP_KERNEL);
> if (!ksv_fifo) {
> - DRM_DEBUG_KMS("Out of mem: ksv_fifo\n");
> + drm_dbg_kms(&dev_priv->drm, "Out of mem: ksv_fifo\n");
> return -ENOMEM;
> }
>
> @@ -576,7 +579,7 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
>
> if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, ksv_fifo,
> num_downstream)) {
> - DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");
> + drm_err(&dev_priv->drm, "Revoked Ksv(s) in ksv_fifo\n");
> ret = -EPERM;
> goto err;
> }
> @@ -594,12 +597,13 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
> }
>
> if (i == tries) {
> - DRM_DEBUG_KMS("V Prime validation failed.(%d)\n", ret);
> + drm_dbg_kms(&dev_priv->drm,
> + "V Prime validation failed.(%d)\n", ret);
> goto err;
> }
>
> - DRM_DEBUG_KMS("HDCP is enabled (%d downstream devices)\n",
> - num_downstream);
> + drm_dbg_kms(&dev_priv->drm, "HDCP is enabled (%d downstream devices)\n",
> + num_downstream);
> ret = 0;
> err:
> kfree(ksv_fifo);
> @@ -642,7 +646,8 @@ static int intel_hdcp_auth(struct intel_connector *connector)
> if (ret)
> return ret;
> if (!hdcp_capable) {
> - DRM_DEBUG_KMS("Panel is not HDCP capable\n");
> + drm_dbg_kms(&dev_priv->drm,
> + "Panel is not HDCP capable\n");
> return -EINVAL;
> }
> }
> @@ -659,7 +664,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
> if (intel_de_wait_for_set(dev_priv,
> HDCP_STATUS(dev_priv, cpu_transcoder, port),
> HDCP_STATUS_AN_READY, 1)) {
> - DRM_ERROR("Timed out waiting for An\n");
> + drm_err(&dev_priv->drm, "Timed out waiting for An\n");
> return -ETIMEDOUT;
> }
>
> @@ -680,7 +685,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
> return ret;
>
> if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, bksv.shim, 1)) {
> - DRM_ERROR("BKSV is revoked\n");
> + drm_err(&dev_priv->drm, "BKSV is revoked\n");
> return -EPERM;
> }
>
> @@ -706,7 +711,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
> /* Wait for R0 ready */
> if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
> (HDCP_STATUS_R0_READY | HDCP_STATUS_ENC), 1)) {
> - DRM_ERROR("Timed out waiting for R0 ready\n");
> + drm_err(&dev_priv->drm, "Timed out waiting for R0 ready\n");
> return -ETIMEDOUT;
> }
>
> @@ -743,8 +748,10 @@ static int intel_hdcp_auth(struct intel_connector *connector)
> }
>
> if (i == tries) {
> - DRM_DEBUG_KMS("Timed out waiting for Ri prime match (%x)\n",
> - intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)));
> + drm_dbg_kms(&dev_priv->drm,
> + "Timed out waiting for Ri prime match (%x)\n",
> + intel_de_read(dev_priv, HDCP_STATUS(dev_priv,
> + cpu_transcoder, port)));
> return -ETIMEDOUT;
> }
>
> @@ -753,7 +760,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
> HDCP_STATUS(dev_priv, cpu_transcoder, port),
> HDCP_STATUS_ENC,
> ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
> - DRM_ERROR("Timed out waiting for encryption\n");
> + drm_err(&dev_priv->drm, "Timed out waiting for encryption\n");
> return -ETIMEDOUT;
> }
>
> @@ -765,7 +772,7 @@ static int intel_hdcp_auth(struct intel_connector *connector)
> if (repeater_present)
> return intel_hdcp_auth_downstream(connector);
>
> - DRM_DEBUG_KMS("HDCP is enabled (no repeater present)\n");
> + drm_dbg_kms(&dev_priv->drm, "HDCP is enabled (no repeater present)\n");
> return 0;
> }
>
> @@ -1270,7 +1277,7 @@ static int hdcp2_authentication_key_exchange(struct intel_connector *connector)
> return ret;
>
> if (msgs.send_cert.rx_caps[0] != HDCP_2_2_RX_CAPS_VERSION_VAL) {
> - DRM_DEBUG_KMS("cert.rx_caps dont claim HDCP2.2\n");
> + drm_dbg_kms(&dev_priv->drm, "cert.rx_caps dont claim HDCP2.2\n");
> return -EINVAL;
> }
>
> @@ -1279,7 +1286,7 @@ static int hdcp2_authentication_key_exchange(struct intel_connector *connector)
> if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
> msgs.send_cert.cert_rx.receiver_id,
> 1)) {
> - DRM_ERROR("Receiver ID is revoked\n");
> + drm_err(&dev_priv->drm, "Receiver ID is revoked\n");
> return -EPERM;
> }
>
> @@ -1454,7 +1461,7 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
>
> if (HDCP_2_2_MAX_CASCADE_EXCEEDED(rx_info[1]) ||
> HDCP_2_2_MAX_DEVS_EXCEEDED(rx_info[1])) {
> - DRM_DEBUG_KMS("Topology Max Size Exceeded\n");
> + drm_dbg_kms(&dev_priv->drm, "Topology Max Size Exceeded\n");
> return -EINVAL;
> }
>
> @@ -1464,7 +1471,7 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
>
> if (seq_num_v < hdcp->seq_num_v) {
> /* Roll over of the seq_num_v from repeater. Reauthenticate. */
> - DRM_DEBUG_KMS("Seq_num_v roll over.\n");
> + drm_dbg_kms(&dev_priv->drm, "Seq_num_v roll over.\n");
> return -EINVAL;
> }
>
> @@ -1473,7 +1480,7 @@ int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
> if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
> msgs.recvid_list.receiver_ids,
> device_cnt)) {
> - DRM_ERROR("Revoked receiver ID(s) is in list\n");
> + drm_err(&dev_priv->drm, "Revoked receiver ID(s) is in list\n");
> return -EPERM;
> }
>
> @@ -1506,25 +1513,27 @@ static int hdcp2_authenticate_repeater(struct intel_connector *connector)
> static int hdcp2_authenticate_sink(struct intel_connector *connector)
> {
> struct intel_digital_port *intel_dig_port = intel_attached_dig_port(connector);
> + struct drm_i915_private *i915 = to_i915(connector->base.dev);
> struct intel_hdcp *hdcp = &connector->hdcp;
> const struct intel_hdcp_shim *shim = hdcp->shim;
> int ret;
>
> ret = hdcp2_authentication_key_exchange(connector);
> if (ret < 0) {
> - DRM_DEBUG_KMS("AKE Failed. Err : %d\n", ret);
> + drm_dbg_kms(&i915->drm, "AKE Failed. Err : %d\n", ret);
> return ret;
> }
>
> ret = hdcp2_locality_check(connector);
> if (ret < 0) {
> - DRM_DEBUG_KMS("Locality Check failed. Err : %d\n", ret);
> + drm_dbg_kms(&i915->drm,
> + "Locality Check failed. Err : %d\n", ret);
> return ret;
> }
>
> ret = hdcp2_session_key_exchange(connector);
> if (ret < 0) {
> - DRM_DEBUG_KMS("SKE Failed. Err : %d\n", ret);
> + drm_dbg_kms(&i915->drm, "SKE Failed. Err : %d\n", ret);
> return ret;
> }
>
> @@ -1539,7 +1548,8 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector)
> if (hdcp->is_repeater) {
> ret = hdcp2_authenticate_repeater(connector);
> if (ret < 0) {
> - DRM_DEBUG_KMS("Repeater Auth Failed. Err: %d\n", ret);
> + drm_dbg_kms(&i915->drm,
> + "Repeater Auth Failed. Err: %d\n", ret);
> return ret;
> }
> }
> @@ -1628,6 +1638,7 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)
>
> static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
> {
> + struct drm_i915_private *i915 = to_i915(connector->base.dev);
> int ret, i, tries = 3;
>
> for (i = 0; i < tries; i++) {
> @@ -1636,10 +1647,10 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
> break;
>
> /* Clearing the mei hdcp session */
> - DRM_DEBUG_KMS("HDCP2.2 Auth %d of %d Failed.(%d)\n",
> - i + 1, tries, ret);
> + drm_dbg_kms(&i915->drm, "HDCP2.2 Auth %d of %d Failed.(%d)\n",
> + i + 1, tries, ret);
> if (hdcp2_deauthenticate_port(connector) < 0)
> - DRM_DEBUG_KMS("Port deauth failed.\n");
> + drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
> }
>
> if (i != tries) {
> @@ -1650,9 +1661,10 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
> msleep(HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN);
> ret = hdcp2_enable_encryption(connector);
> if (ret < 0) {
> - DRM_DEBUG_KMS("Encryption Enable Failed.(%d)\n", ret);
> + drm_dbg_kms(&i915->drm,
> + "Encryption Enable Failed.(%d)\n", ret);
> if (hdcp2_deauthenticate_port(connector) < 0)
> - DRM_DEBUG_KMS("Port deauth failed.\n");
> + drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
> }
> }
>
> @@ -1661,23 +1673,24 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
>
> static int _intel_hdcp2_enable(struct intel_connector *connector)
> {
> + struct drm_i915_private *i915 = to_i915(connector->base.dev);
> struct intel_hdcp *hdcp = &connector->hdcp;
> int ret;
>
> - DRM_DEBUG_KMS("[%s:%d] HDCP2.2 is being enabled. Type: %d\n",
> - connector->base.name, connector->base.base.id,
> - hdcp->content_type);
> + drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being enabled. Type: %d\n",
> + connector->base.name, connector->base.base.id,
> + hdcp->content_type);
>
> ret = hdcp2_authenticate_and_encrypt(connector);
> if (ret) {
> - DRM_DEBUG_KMS("HDCP2 Type%d Enabling Failed. (%d)\n",
> - hdcp->content_type, ret);
> + drm_dbg_kms(&i915->drm, "HDCP2 Type%d Enabling Failed. (%d)\n",
> + hdcp->content_type, ret);
> return ret;
> }
>
> - DRM_DEBUG_KMS("[%s:%d] HDCP2.2 is enabled. Type %d\n",
> - connector->base.name, connector->base.base.id,
> - hdcp->content_type);
> + drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is enabled. Type %d\n",
> + connector->base.name, connector->base.base.id,
> + hdcp->content_type);
>
> hdcp->hdcp2_encrypted = true;
> return 0;
> @@ -1685,15 +1698,16 @@ static int _intel_hdcp2_enable(struct intel_connector *connector)
>
> static int _intel_hdcp2_disable(struct intel_connector *connector)
> {
> + struct drm_i915_private *i915 = to_i915(connector->base.dev);
> int ret;
>
> - DRM_DEBUG_KMS("[%s:%d] HDCP2.2 is being Disabled\n",
> - connector->base.name, connector->base.base.id);
> + drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being Disabled\n",
> + connector->base.name, connector->base.base.id);
>
> ret = hdcp2_disable_encryption(connector);
>
> if (hdcp2_deauthenticate_port(connector) < 0)
> - DRM_DEBUG_KMS("Port deauth failed.\n");
> + drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
>
> connector->hdcp.hdcp2_encrypted = false;
>
> @@ -1935,12 +1949,13 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv)
> static void intel_hdcp2_init(struct intel_connector *connector,
> const struct intel_hdcp_shim *shim)
> {
> + struct drm_i915_private *i915 = to_i915(connector->base.dev);
> struct intel_hdcp *hdcp = &connector->hdcp;
> int ret;
>
> ret = initialize_hdcp_port_data(connector, shim);
> if (ret) {
> - DRM_DEBUG_KMS("Mei hdcp data init failed\n");
> + drm_dbg_kms(&i915->drm, "Mei hdcp data init failed\n");
> return;
> }
>
> --
> 2.20.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-04 0:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-12 12:30 [Intel-gfx] [PATCH v3] drm/i915/hdcp: conversion to struct drm_device based logging macros Ramalingam C
2020-02-13 0:57 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-02-13 1:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-02-16 1:18 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-03-04 0:56 ` [Intel-gfx] [PATCH v3] " Ramalingam C
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.