| Message ID | 20210915203834.1439-1-sean@poorly.run (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/hdcp: Pull HDCP auth/exchange/check into helpers | expand |
On Wed, 15 Sep 2021, Patchwork <patchwork@emeril.freedesktop.org> wrote: > == Series Details == > > Series: drm/hdcp: Pull HDCP auth/exchange/check into helpers > URL : https://patchwork.freedesktop.org/series/94712/ > State : failure > > == Summary == > > CALL scripts/checksyscalls.sh > CALL scripts/atomic/check-atomics.sh > DESCEND objtool > CHK include/generated/compile.h > LD [M] drivers/gpu/drm/i915/i915.o > HDRTEST drivers/gpu/drm/i915/display/intel_hdcp.h > In file included from <command-line>: > ./drivers/gpu/drm/i915/display/intel_hdcp.h:30:15: error: ‘struct drm_atomic_state’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] > struct drm_atomic_state *state); > ^~~~~~~~~~~~~~~~ Please use CONFIG_DRM_I915_WERROR=y when developing i915, and fix the fallout. In this case, you'll need to add a forward declaration for struct drm_atomic_state. (Preferred over including headers from headers.) Thanks, Jani. > cc1: all warnings being treated as errors > drivers/gpu/drm/i915/Makefile:324: recipe for target 'drivers/gpu/drm/i915/display/intel_hdcp.hdrtest' failed > make[4]: *** [drivers/gpu/drm/i915/display/intel_hdcp.hdrtest] Error 1 > scripts/Makefile.build:540: recipe for target 'drivers/gpu/drm/i915' failed > make[3]: *** [drivers/gpu/drm/i915] Error 2 > scripts/Makefile.build:540: recipe for target 'drivers/gpu/drm' failed > make[2]: *** [drivers/gpu/drm] Error 2 > scripts/Makefile.build:540: recipe for target 'drivers/gpu' failed > make[1]: *** [drivers/gpu] Error 2 > Makefile:1868: recipe for target 'drivers' failed > make: *** [drivers] Error 2 > >
On Wed, 15 Sep 2021, Sean Paul <sean@poorly.run> wrote: > From: Sean Paul <seanpaul@chromium.org> > > Hello again, > This is the second version of the HDCP helper patchset. See version 1 > here: https://patchwork.freedesktop.org/series/94623/ > > In this second version, I've fixed up the oopsies exposed by 0-day and > yamllint and incorporated early review feedback from the dt/dts reviews. > > Please take a look, I'll try to ping folks to get someone to review the i915 parts, but the general idea of moving common HDCP code from i915 to drm is, I hope obviously, Acked-by: Jani Nikula <jani.nikula@intel.com> > > Sean > > Sean Paul (13): > drm/hdcp: Add drm_hdcp_atomic_check() > drm/hdcp: Avoid changing crtc state in hdcp atomic check > drm/hdcp: Update property value on content type and user changes > drm/hdcp: Expand HDCP helper library for enable/disable/check > drm/i915/hdcp: Consolidate HDCP setup/state cache > drm/i915/hdcp: Retain hdcp_capable return codes > drm/i915/hdcp: Use HDCP helpers for i915 > drm/msm/dpu_kms: Re-order dpu includes > drm/msm/dpu: Remove useless checks in dpu_encoder > drm/msm/dpu: Remove encoder->enable() hack > drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules > dt-bindings: msm/dp: Add bindings for HDCP registers > drm/msm: Implement HDCP 1.x using the new drm HDCP helpers > > .../bindings/display/msm/dp-controller.yaml | 7 +- > arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- > drivers/gpu/drm/drm_hdcp.c | 1197 ++++++++++++++++- > drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- > .../drm/i915/display/intel_display_debugfs.c | 11 +- > .../drm/i915/display/intel_display_types.h | 58 +- > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 ++--- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- > drivers/gpu/drm/i915/display/intel_hdcp.c | 1011 +++----------- > drivers/gpu/drm/i915/display/intel_hdcp.h | 35 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- > drivers/gpu/drm/msm/Makefile | 1 + > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 17 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 30 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - > drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - > drivers/gpu/drm/msm/dp/dp_debug.c | 49 +- > drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- > drivers/gpu/drm/msm/dp/dp_display.c | 47 +- > drivers/gpu/drm/msm/dp/dp_display.h | 5 + > drivers/gpu/drm/msm/dp/dp_drm.c | 68 +- > drivers/gpu/drm/msm/dp/dp_drm.h | 5 + > drivers/gpu/drm/msm/dp/dp_hdcp.c | 433 ++++++ > drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + > drivers/gpu/drm/msm/dp/dp_parser.c | 22 +- > drivers/gpu/drm/msm/dp/dp_parser.h | 4 + > drivers/gpu/drm/msm/dp/dp_reg.h | 44 +- > drivers/gpu/drm/msm/msm_atomic.c | 15 + > include/drm/drm_hdcp.h | 194 +++ > 30 files changed, 2561 insertions(+), 1389 deletions(-) > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
Hi Sean On 2021-09-15 13:38, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > Hello again, > This is the second version of the HDCP helper patchset. See version 1 > here: https://patchwork.freedesktop.org/series/94623/ > > In this second version, I've fixed up the oopsies exposed by 0-day and > yamllint and incorporated early review feedback from the dt/dts > reviews. > > Please take a look, > > Sean One question overall on the series: 1) Regarding validation, did you run any secure video to check the transitions? 2) Is running HDCP 1x compliance also part of the validation efforts? Thanks Abhinav > > Sean Paul (13): > drm/hdcp: Add drm_hdcp_atomic_check() > drm/hdcp: Avoid changing crtc state in hdcp atomic check > drm/hdcp: Update property value on content type and user changes > drm/hdcp: Expand HDCP helper library for enable/disable/check > drm/i915/hdcp: Consolidate HDCP setup/state cache > drm/i915/hdcp: Retain hdcp_capable return codes > drm/i915/hdcp: Use HDCP helpers for i915 > drm/msm/dpu_kms: Re-order dpu includes > drm/msm/dpu: Remove useless checks in dpu_encoder > drm/msm/dpu: Remove encoder->enable() hack > drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules > dt-bindings: msm/dp: Add bindings for HDCP registers > drm/msm: Implement HDCP 1.x using the new drm HDCP helpers > > .../bindings/display/msm/dp-controller.yaml | 7 +- > arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- > drivers/gpu/drm/drm_hdcp.c | 1197 ++++++++++++++++- > drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- > .../drm/i915/display/intel_display_debugfs.c | 11 +- > .../drm/i915/display/intel_display_types.h | 58 +- > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 ++--- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- > drivers/gpu/drm/i915/display/intel_hdcp.c | 1011 +++----------- > drivers/gpu/drm/i915/display/intel_hdcp.h | 35 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- > drivers/gpu/drm/msm/Makefile | 1 + > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 17 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 30 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - > drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - > drivers/gpu/drm/msm/dp/dp_debug.c | 49 +- > drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- > drivers/gpu/drm/msm/dp/dp_display.c | 47 +- > drivers/gpu/drm/msm/dp/dp_display.h | 5 + > drivers/gpu/drm/msm/dp/dp_drm.c | 68 +- > drivers/gpu/drm/msm/dp/dp_drm.h | 5 + > drivers/gpu/drm/msm/dp/dp_hdcp.c | 433 ++++++ > drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + > drivers/gpu/drm/msm/dp/dp_parser.c | 22 +- > drivers/gpu/drm/msm/dp/dp_parser.h | 4 + > drivers/gpu/drm/msm/dp/dp_reg.h | 44 +- > drivers/gpu/drm/msm/msm_atomic.c | 15 + > include/drm/drm_hdcp.h | 194 +++ > 30 files changed, 2561 insertions(+), 1389 deletions(-) > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
On Tue, Sep 21, 2021 at 07:30:29PM -0700, abhinavk@codeaurora.org wrote: > Hi Sean > > On 2021-09-15 13:38, Sean Paul wrote: > > From: Sean Paul <seanpaul@chromium.org> > > > > Hello again, > > This is the second version of the HDCP helper patchset. See version 1 > > here: https://patchwork.freedesktop.org/series/94623/ > > > > In this second version, I've fixed up the oopsies exposed by 0-day and > > yamllint and incorporated early review feedback from the dt/dts reviews. > > > > Please take a look, > > > > Sean > > One question overall on the series: > > 1) Regarding validation, did you run any secure video to check the > transitions? Yep, the transitions look good, no visual artifacts. Unplug/replug/suspend/resume all seem to be behaving as expected. > 2) Is running HDCP 1x compliance also part of the validation efforts? If Qualcomm has the ability to run validation, I'd be very keen to get some help in that regard. Sean > > Thanks > > Abhinav > > > > > Sean Paul (13): > > drm/hdcp: Add drm_hdcp_atomic_check() > > drm/hdcp: Avoid changing crtc state in hdcp atomic check > > drm/hdcp: Update property value on content type and user changes > > drm/hdcp: Expand HDCP helper library for enable/disable/check > > drm/i915/hdcp: Consolidate HDCP setup/state cache > > drm/i915/hdcp: Retain hdcp_capable return codes > > drm/i915/hdcp: Use HDCP helpers for i915 > > drm/msm/dpu_kms: Re-order dpu includes > > drm/msm/dpu: Remove useless checks in dpu_encoder > > drm/msm/dpu: Remove encoder->enable() hack > > drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules > > dt-bindings: msm/dp: Add bindings for HDCP registers > > drm/msm: Implement HDCP 1.x using the new drm HDCP helpers > > > > .../bindings/display/msm/dp-controller.yaml | 7 +- > > arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- > > drivers/gpu/drm/drm_hdcp.c | 1197 ++++++++++++++++- > > drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- > > drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- > > .../drm/i915/display/intel_display_debugfs.c | 11 +- > > .../drm/i915/display/intel_display_types.h | 58 +- > > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 ++--- > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- > > drivers/gpu/drm/i915/display/intel_hdcp.c | 1011 +++----------- > > drivers/gpu/drm/i915/display/intel_hdcp.h | 35 +- > > drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- > > drivers/gpu/drm/msm/Makefile | 1 + > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 17 +- > > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 30 +- > > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - > > drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - > > drivers/gpu/drm/msm/dp/dp_debug.c | 49 +- > > drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- > > drivers/gpu/drm/msm/dp/dp_display.c | 47 +- > > drivers/gpu/drm/msm/dp/dp_display.h | 5 + > > drivers/gpu/drm/msm/dp/dp_drm.c | 68 +- > > drivers/gpu/drm/msm/dp/dp_drm.h | 5 + > > drivers/gpu/drm/msm/dp/dp_hdcp.c | 433 ++++++ > > drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + > > drivers/gpu/drm/msm/dp/dp_parser.c | 22 +- > > drivers/gpu/drm/msm/dp/dp_parser.h | 4 + > > drivers/gpu/drm/msm/dp/dp_reg.h | 44 +- > > drivers/gpu/drm/msm/msm_atomic.c | 15 + > > include/drm/drm_hdcp.h | 194 +++ > > 30 files changed, 2561 insertions(+), 1389 deletions(-) > > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c > > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
On 2021-09-28 11:06, Sean Paul wrote: > On Tue, Sep 21, 2021 at 07:30:29PM -0700, abhinavk@codeaurora.org > wrote: >> Hi Sean >> >> On 2021-09-15 13:38, Sean Paul wrote: >> > From: Sean Paul <seanpaul@chromium.org> >> > >> > Hello again, >> > This is the second version of the HDCP helper patchset. See version 1 >> > here: https://patchwork.freedesktop.org/series/94623/ >> > >> > In this second version, I've fixed up the oopsies exposed by 0-day and >> > yamllint and incorporated early review feedback from the dt/dts reviews. >> > >> > Please take a look, >> > >> > Sean >> >> One question overall on the series: >> >> 1) Regarding validation, did you run any secure video to check the >> transitions? > > Yep, the transitions look good, no visual artifacts. > Unplug/replug/suspend/resume all seem to be behaving as expected. > >> 2) Is running HDCP 1x compliance also part of the validation efforts? > > If Qualcomm has the ability to run validation, I'd be very keen to get > some > help in that regard. Thanks for letting us know. To assist with (2) we will have to work with you on some logistics. Will sync up on IRC further on how to go about this. > > Sean > >> >> Thanks >> >> Abhinav >> >> > >> > Sean Paul (13): >> > drm/hdcp: Add drm_hdcp_atomic_check() >> > drm/hdcp: Avoid changing crtc state in hdcp atomic check >> > drm/hdcp: Update property value on content type and user changes >> > drm/hdcp: Expand HDCP helper library for enable/disable/check >> > drm/i915/hdcp: Consolidate HDCP setup/state cache >> > drm/i915/hdcp: Retain hdcp_capable return codes >> > drm/i915/hdcp: Use HDCP helpers for i915 >> > drm/msm/dpu_kms: Re-order dpu includes >> > drm/msm/dpu: Remove useless checks in dpu_encoder >> > drm/msm/dpu: Remove encoder->enable() hack >> > drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules >> > dt-bindings: msm/dp: Add bindings for HDCP registers >> > drm/msm: Implement HDCP 1.x using the new drm HDCP helpers >> > >> > .../bindings/display/msm/dp-controller.yaml | 7 +- >> > arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- >> > drivers/gpu/drm/drm_hdcp.c | 1197 ++++++++++++++++- >> > drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- >> > drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- >> > .../drm/i915/display/intel_display_debugfs.c | 11 +- >> > .../drm/i915/display/intel_display_types.h | 58 +- >> > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 ++--- >> > drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- >> > drivers/gpu/drm/i915/display/intel_hdcp.c | 1011 +++----------- >> > drivers/gpu/drm/i915/display/intel_hdcp.h | 35 +- >> > drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- >> > drivers/gpu/drm/msm/Makefile | 1 + >> > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 17 +- >> > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 30 +- >> > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - >> > drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - >> > drivers/gpu/drm/msm/dp/dp_debug.c | 49 +- >> > drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- >> > drivers/gpu/drm/msm/dp/dp_display.c | 47 +- >> > drivers/gpu/drm/msm/dp/dp_display.h | 5 + >> > drivers/gpu/drm/msm/dp/dp_drm.c | 68 +- >> > drivers/gpu/drm/msm/dp/dp_drm.h | 5 + >> > drivers/gpu/drm/msm/dp/dp_hdcp.c | 433 ++++++ >> > drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + >> > drivers/gpu/drm/msm/dp/dp_parser.c | 22 +- >> > drivers/gpu/drm/msm/dp/dp_parser.h | 4 + >> > drivers/gpu/drm/msm/dp/dp_reg.h | 44 +- >> > drivers/gpu/drm/msm/msm_atomic.c | 15 + >> > include/drm/drm_hdcp.h | 194 +++ >> > 30 files changed, 2561 insertions(+), 1389 deletions(-) >> > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c >> > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
From: Sean Paul <seanpaul@chromium.org> Hello again, This is the second version of the HDCP helper patchset. See version 1 here: https://patchwork.freedesktop.org/series/94623/ In this second version, I've fixed up the oopsies exposed by 0-day and yamllint and incorporated early review feedback from the dt/dts reviews. Please take a look, Sean Sean Paul (13): drm/hdcp: Add drm_hdcp_atomic_check() drm/hdcp: Avoid changing crtc state in hdcp atomic check drm/hdcp: Update property value on content type and user changes drm/hdcp: Expand HDCP helper library for enable/disable/check drm/i915/hdcp: Consolidate HDCP setup/state cache drm/i915/hdcp: Retain hdcp_capable return codes drm/i915/hdcp: Use HDCP helpers for i915 drm/msm/dpu_kms: Re-order dpu includes drm/msm/dpu: Remove useless checks in dpu_encoder drm/msm/dpu: Remove encoder->enable() hack drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules dt-bindings: msm/dp: Add bindings for HDCP registers drm/msm: Implement HDCP 1.x using the new drm HDCP helpers .../bindings/display/msm/dp-controller.yaml | 7 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 +- drivers/gpu/drm/drm_hdcp.c | 1197 ++++++++++++++++- drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- .../drm/i915/display/intel_display_debugfs.c | 11 +- .../drm/i915/display/intel_display_types.h | 58 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 ++--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 1011 +++----------- drivers/gpu/drm/i915/display/intel_hdcp.h | 35 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 17 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 30 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - drivers/gpu/drm/msm/dp/dp_debug.c | 49 +- drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- drivers/gpu/drm/msm/dp/dp_display.c | 47 +- drivers/gpu/drm/msm/dp/dp_display.h | 5 + drivers/gpu/drm/msm/dp/dp_drm.c | 68 +- drivers/gpu/drm/msm/dp/dp_drm.h | 5 + drivers/gpu/drm/msm/dp/dp_hdcp.c | 433 ++++++ drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + drivers/gpu/drm/msm/dp/dp_parser.c | 22 +- drivers/gpu/drm/msm/dp/dp_parser.h | 4 + drivers/gpu/drm/msm/dp/dp_reg.h | 44 +- drivers/gpu/drm/msm/msm_atomic.c | 15 + include/drm/drm_hdcp.h | 194 +++ 30 files changed, 2561 insertions(+), 1389 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h