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@xxxxxxxxx> > > Cc: Sean Paul <seanpaul@xxxxxxxxxxxx> > > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > > Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > > Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > > Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx> > > 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@xxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxx > > 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel