* [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream @ 2018-01-22 17:55 Sean Paul 2018-01-22 18:43 ` ✓ Fi.CI.BAT: success for " Patchwork ` (4 more replies) 0 siblings, 5 replies; 9+ messages in thread From: Sean Paul @ 2018-01-22 17:55 UTC (permalink / raw) To: dri-devel; +Cc: intel-gfx, Rodrigo Vivi The commit below returned earlier than before, but failed to move the info message when authenticating without downstream devices. This patch restores the message on authentication success. Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") Cc: Ramalingam C <ramalingam.c@intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: intel-gfx@lists.freedesktop.org Signed-off-by: Sean Paul <seanpaul@chromium.org> --- drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index db9527173a1e..dd7dffd405d5 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, /* If there are no downstream devices, we're all done. */ num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]); - if (num_downstream == 0) { - DRM_INFO("HDCP is enabled (no downstream devices)\n"); + if (num_downstream == 0) return 0; - } ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); if (!ksv_fifo) @@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, if (repeater_present) return intel_hdcp_auth_downstream(intel_dig_port, shim); + DRM_INFO("HDCP is enabled (no downstream devices)\n"); return 0; } -- 2.16.0.rc1.238.g530d649a79-goog _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 9+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Restore HDCP DRM_INFO when with no downstream 2018-01-22 17:55 [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream Sean Paul @ 2018-01-22 18:43 ` Patchwork 2018-01-23 4:21 ` ✗ Fi.CI.IGT: warning " Patchwork ` (3 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Patchwork @ 2018-01-22 18:43 UTC (permalink / raw) To: Sean Paul; +Cc: intel-gfx == Series Details == Series: drm/i915: Restore HDCP DRM_INFO when with no downstream URL : https://patchwork.freedesktop.org/series/36921/ State : success == Summary == Series 36921v1 drm/i915: Restore HDCP DRM_INFO when with no downstream https://patchwork.freedesktop.org/api/1.0/series/36921/revisions/1/mbox/ Test kms_pipe_crc_basic: Subgroup suspend-read-crc-pipe-b: incomplete -> PASS (fi-snb-2520m) fdo#103713 fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713 fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:426s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:373s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:484s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:281s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:482s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:465s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:455s fi-elk-e7500 total:224 pass:168 dwarn:9 dfail:1 fail:0 skip:45 fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:277s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:508s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:394s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:399s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:409s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:459s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:412s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:458s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:497s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:460s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:504s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:586s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:434s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:507s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:527s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:485s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:483s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:419s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:432s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:525s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:394s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:572s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:470s 06c8efda323ac918fad0e26d81e8884574ec8b84 drm-tip: 2018y-01m-22d-17h-43m-26s UTC integration manifest 6b99b286739e drm/i915: Restore HDCP DRM_INFO when with no downstream == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7742/issues.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ Fi.CI.IGT: warning for drm/i915: Restore HDCP DRM_INFO when with no downstream 2018-01-22 17:55 [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream Sean Paul 2018-01-22 18:43 ` ✓ Fi.CI.BAT: success for " Patchwork @ 2018-01-23 4:21 ` Patchwork 2018-01-30 8:35 ` [PATCH] " Daniel Vetter ` (2 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Patchwork @ 2018-01-23 4:21 UTC (permalink / raw) To: Sean Paul; +Cc: intel-gfx == Series Details == Series: drm/i915: Restore HDCP DRM_INFO when with no downstream URL : https://patchwork.freedesktop.org/series/36921/ State : warning == Summary == Test kms_frontbuffer_tracking: Subgroup fbc-tilingchange: fail -> PASS (shard-apl) Subgroup fbc-1p-primscrn-cur-indfb-move: pass -> FAIL (shard-apl) fdo#101623 +1 Test gem_eio: Subgroup in-flight-external: fail -> PASS (shard-hsw) fdo#104676 +1 Test kms_cursor_legacy: Subgroup cursora-vs-flipa-atomic-transitions-varying-size: pass -> SKIP (shard-snb) Subgroup cursor-vs-flip-legacy: fail -> PASS (shard-apl) fdo#103355 Test perf: Subgroup oa-exponents: fail -> PASS (shard-apl) fdo#102254 Test kms_flip: Subgroup vblank-vs-suspend: pass -> DMESG-WARN (shard-snb) fdo#102365 pass -> INCOMPLETE (shard-hsw) fdo#100368 Subgroup vblank-vs-dpms-suspend-interruptible: pass -> INCOMPLETE (shard-hsw) fdo#103540 +1 Subgroup flip-vs-panning-vs-hang-interruptible: dmesg-warn -> PASS (shard-snb) fdo#103821 Test drv_suspend: Subgroup debugfs-reader: pass -> SKIP (shard-snb) Subgroup fence-restore-tiled2untiled-hibernate: fail -> SKIP (shard-hsw) fdo#103375 fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623 fdo#104676 https://bugs.freedesktop.org/show_bug.cgi?id=104676 fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355 fdo#102254 https://bugs.freedesktop.org/show_bug.cgi?id=102254 fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365 fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368 fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540 fdo#103821 https://bugs.freedesktop.org/show_bug.cgi?id=103821 fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375 shard-apl total:2753 pass:1715 dwarn:1 dfail:0 fail:24 skip:1013 time:13948s shard-hsw total:2632 pass:1643 dwarn:1 dfail:0 fail:9 skip:975 time:13556s shard-snb total:2753 pass:1314 dwarn:2 dfail:0 fail:12 skip:1425 time:7825s Blacklisted hosts: shard-kbl total:2735 pass:1820 dwarn:1 dfail:0 fail:24 skip:889 time:10598s == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7742/shards.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream 2018-01-22 17:55 [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream Sean Paul 2018-01-22 18:43 ` ✓ Fi.CI.BAT: success for " Patchwork 2018-01-23 4:21 ` ✗ Fi.CI.IGT: warning " Patchwork @ 2018-01-30 8:35 ` Daniel Vetter 2018-01-30 14:23 ` Sean Paul 2018-01-30 9:24 ` Ramalingam C 2018-01-30 18:26 ` ✗ Fi.CI.BAT: failure for drm/i915: Restore HDCP DRM_INFO when with no downstream (rev2) Patchwork 4 siblings, 1 reply; 9+ messages in thread From: Daniel Vetter @ 2018-01-30 8:35 UTC (permalink / raw) To: Sean Paul; +Cc: intel-gfx, dri-devel, Rodrigo Vivi On Mon, Jan 22, 2018 at 12:55:00PM -0500, Sean Paul wrote: > The commit below returned earlier than before, but failed to move the > info message when authenticating without downstream devices. This patch > restores the message on authentication success. > > Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") > Cc: Ramalingam C <ramalingam.c@intel.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Signed-off-by: Sean Paul <seanpaul@chromium.org> DRM_INFO is rather loud (it shows up in dmesg by default), imo better to bikeshed this to DRM_DEBUG_KMS or similar while at it. Of course would need to be done for the entire file. Either way (i.e. if you ignore this, do it in a separate patch, or combined): Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c > index db9527173a1e..dd7dffd405d5 100644 > --- a/drivers/gpu/drm/i915/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/intel_hdcp.c > @@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, > > /* If there are no downstream devices, we're all done. */ > num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]); > - if (num_downstream == 0) { > - DRM_INFO("HDCP is enabled (no downstream devices)\n"); > + if (num_downstream == 0) > return 0; > - } > > ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); > if (!ksv_fifo) > @@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, > if (repeater_present) > return intel_hdcp_auth_downstream(intel_dig_port, shim); > > + DRM_INFO("HDCP is enabled (no downstream devices)\n"); > return 0; > } > > -- > 2.16.0.rc1.238.g530d649a79-goog > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream 2018-01-30 8:35 ` [PATCH] " Daniel Vetter @ 2018-01-30 14:23 ` Sean Paul 0 siblings, 0 replies; 9+ messages in thread From: Sean Paul @ 2018-01-30 14:23 UTC (permalink / raw) To: Daniel Vetter; +Cc: intel-gfx, dri-devel, Rodrigo Vivi On Tue, Jan 30, 2018 at 09:35:34AM +0100, Daniel Vetter wrote: > On Mon, Jan 22, 2018 at 12:55:00PM -0500, Sean Paul wrote: > > The commit below returned earlier than before, but failed to move the > > info message when authenticating without downstream devices. This patch > > restores the message on authentication success. > > > > Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") > > Cc: Ramalingam C <ramalingam.c@intel.com> > > Cc: Sean Paul <seanpaul@chromium.org> > > Cc: Jani Nikula <jani.nikula@linux.intel.com> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Cc: intel-gfx@lists.freedesktop.org > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > > DRM_INFO is rather loud (it shows up in dmesg by default), imo better to > bikeshed this to DRM_DEBUG_KMS or similar while at it. Of course would > need to be done for the entire file. > Yeah, I figured I would get this feedback when I chose INFO :-). So in my defense, HDCP is enabled/disabled quite infrequently and very likely never in most distros. Further, it's really nice to know whether something went sideways while HDCP was enabled, or perhaps corresponding to enable/disable. All said, if this is distruptive upstream, we can carry a s/DEBUG_KMS/INFO/ patch downstream. > Either way (i.e. if you ignore this, do it in a separate patch, or > combined): > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> As always, thank you for your review! Sean > > > > --- > > drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c > > index db9527173a1e..dd7dffd405d5 100644 > > --- a/drivers/gpu/drm/i915/intel_hdcp.c > > +++ b/drivers/gpu/drm/i915/intel_hdcp.c > > @@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, > > > > /* If there are no downstream devices, we're all done. */ > > num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]); > > - if (num_downstream == 0) { > > - DRM_INFO("HDCP is enabled (no downstream devices)\n"); > > + if (num_downstream == 0) > > return 0; > > - } > > > > ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); > > if (!ksv_fifo) > > @@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, > > if (repeater_present) > > return intel_hdcp_auth_downstream(intel_dig_port, shim); > > > > + DRM_INFO("HDCP is enabled (no downstream devices)\n"); > > return 0; > > } > > > > -- > > 2.16.0.rc1.238.g530d649a79-goog > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream 2018-01-22 17:55 [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream Sean Paul ` (2 preceding siblings ...) 2018-01-30 8:35 ` [PATCH] " Daniel Vetter @ 2018-01-30 9:24 ` Ramalingam C 2018-01-30 14:29 ` [PATCH v2] " Sean Paul 2018-01-30 18:26 ` ✗ Fi.CI.BAT: failure for drm/i915: Restore HDCP DRM_INFO when with no downstream (rev2) Patchwork 4 siblings, 1 reply; 9+ messages in thread From: Ramalingam C @ 2018-01-30 9:24 UTC (permalink / raw) To: Sean Paul, dri-devel; +Cc: intel-gfx, Rodrigo Vivi On Monday 22 January 2018 11:25 PM, Sean Paul wrote: > The commit below returned earlier than before, but failed to move the > info message when authenticating without downstream devices. This patch > restores the message on authentication success. > > Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") > Cc: Ramalingam C <ramalingam.c@intel.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Signed-off-by: Sean Paul <seanpaul@chromium.org> > --- > drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c > index db9527173a1e..dd7dffd405d5 100644 > --- a/drivers/gpu/drm/i915/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/intel_hdcp.c > @@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, > > /* If there are no downstream devices, we're all done. */ > num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]); > - if (num_downstream == 0) { > - DRM_INFO("HDCP is enabled (no downstream devices)\n"); > + if (num_downstream == 0) > return 0; > - } > > ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); > if (!ksv_fifo) > @@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, > if (repeater_present) > return intel_hdcp_auth_downstream(intel_dig_port, shim); > > + DRM_INFO("HDCP is enabled (no downstream devices)\n"); Movement of the message make sense. This log is for HDCP enabled on receiver. Even repeater might be with no downstream devices. So msg such as "HDCP enabled on Receiver" would be more informative. --Ram > return 0; > } > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] drm/i915: Restore HDCP DRM_INFO when with no downstream 2018-01-30 9:24 ` Ramalingam C @ 2018-01-30 14:29 ` Sean Paul 2018-01-30 16:01 ` Sean Paul 0 siblings, 1 reply; 9+ messages in thread From: Sean Paul @ 2018-01-30 14:29 UTC (permalink / raw) To: dri-devel; +Cc: intel-gfx, Rodrigo Vivi The commit below returned earlier than before, but failed to move the info message when authenticating without downstream devices. This patch restores the message on authentication success. Changes in v2: - s/no downstream devices/no repeater present/ (Ram) Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") Cc: Ramalingam C <ramalingam.c@intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Sean Paul <seanpaul@chromium.org> --- drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index db9527173a1e..9fc9da030514 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, /* If there are no downstream devices, we're all done. */ num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]); - if (num_downstream == 0) { - DRM_INFO("HDCP is enabled (no downstream devices)\n"); + if (num_downstream == 0) return 0; - } ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); if (!ksv_fifo) @@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, if (repeater_present) return intel_hdcp_auth_downstream(intel_dig_port, shim); + DRM_INFO("HDCP is enabled (no repeater present)\n"); return 0; } -- 2.16.0.rc1.238.g530d649a79-goog _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] drm/i915: Restore HDCP DRM_INFO when with no downstream 2018-01-30 14:29 ` [PATCH v2] " Sean Paul @ 2018-01-30 16:01 ` Sean Paul 0 siblings, 0 replies; 9+ messages in thread From: Sean Paul @ 2018-01-30 16:01 UTC (permalink / raw) To: dri-devel; +Cc: intel-gfx, Rodrigo Vivi On Tue, Jan 30, 2018 at 09:29:34AM -0500, Sean Paul wrote: > The commit below returned earlier than before, but failed to move the > info message when authenticating without downstream devices. This patch > restores the message on authentication success. > > Changes in v2: > - s/no downstream devices/no repeater present/ (Ram) > > Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") > Cc: Ramalingam C <ramalingam.c@intel.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Signed-off-by: Sean Paul <seanpaul@chromium.org> Applied to the topic branch > --- > drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c > index db9527173a1e..9fc9da030514 100644 > --- a/drivers/gpu/drm/i915/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/intel_hdcp.c > @@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, > > /* If there are no downstream devices, we're all done. */ > num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]); > - if (num_downstream == 0) { > - DRM_INFO("HDCP is enabled (no downstream devices)\n"); > + if (num_downstream == 0) > return 0; > - } > > ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); > if (!ksv_fifo) > @@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, > if (repeater_present) > return intel_hdcp_auth_downstream(intel_dig_port, shim); > > + DRM_INFO("HDCP is enabled (no repeater present)\n"); > return 0; > } > > -- > 2.16.0.rc1.238.g530d649a79-goog > -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Restore HDCP DRM_INFO when with no downstream (rev2) 2018-01-22 17:55 [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream Sean Paul ` (3 preceding siblings ...) 2018-01-30 9:24 ` Ramalingam C @ 2018-01-30 18:26 ` Patchwork 4 siblings, 0 replies; 9+ messages in thread From: Patchwork @ 2018-01-30 18:26 UTC (permalink / raw) To: Sean Paul; +Cc: intel-gfx == Series Details == Series: drm/i915: Restore HDCP DRM_INFO when with no downstream (rev2) URL : https://patchwork.freedesktop.org/series/36921/ State : failure == Summary == Applying: drm/i915: Restore HDCP DRM_INFO when with no downstream error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_hdcp.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_hdcp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hdcp.c Patch failed at 0001 drm/i915: Restore HDCP DRM_INFO when with no downstream The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-01-30 18:26 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-01-22 17:55 [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream Sean Paul 2018-01-22 18:43 ` ✓ Fi.CI.BAT: success for " Patchwork 2018-01-23 4:21 ` ✗ Fi.CI.IGT: warning " Patchwork 2018-01-30 8:35 ` [PATCH] " Daniel Vetter 2018-01-30 14:23 ` Sean Paul 2018-01-30 9:24 ` Ramalingam C 2018-01-30 14:29 ` [PATCH v2] " Sean Paul 2018-01-30 16:01 ` Sean Paul 2018-01-30 18:26 ` ✗ Fi.CI.BAT: failure for drm/i915: Restore HDCP DRM_INFO when with no downstream (rev2) Patchwork
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.