| Message ID | 20220411204741.1074308-1-sean@poorly.run (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/hdcp: Pull HDCP auth/exchange/check into helpers | expand |
On Mon, Apr 11, 2022 at 08:47:29PM +0000, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > Rebased set from November. Fixed a nit from Stephen in the msm patch and > moved hdcp registers into the trogdor dtsi file to avoid differences > with sc7180-based windows devices. The set is 4 patches lighter since > some of the changes were accepted into msm. > > I'm still waiting for Intel review of the first 7 patches. Rodrigo/Jani, > would you please provide your input so we can move forward with this > set? I'm a bit concerned with patches 4 and 7. It is hard to map the removals and additions and there are some changes that looks like changing behaviors, but end up not being clear in the big patch. Also with big patch it is prune to the rebasing and backport conflicts. Would be possible to split some work in moving individual functions from i915 to drm little by little with smaller patches? But thank you for this great work. It is also good to align our drm drivers. Thanks, Rodrigo. > > Thanks, > > Sean > > Link: https://patchwork.freedesktop.org/series/94623/ #v1 > Link: https://patchwork.freedesktop.org/series/94713/ #v2 > Link: https://patchwork.freedesktop.org/series/94712/ #v3 > Link: https://patchwork.freedesktop.org/series/94712/ #v4 > > Sean Paul (10): > 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 > dt-bindings: msm/dp: Add bindings for HDCP registers > arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller > 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-trogdor.dtsi | 8 + > arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 +- > 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 | 36 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- > drivers/gpu/drm/msm/Makefile | 1 + > drivers/gpu/drm/msm/dp/dp_debug.c | 46 +- > drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- > drivers/gpu/drm/msm/dp/dp_display.c | 46 +- > 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 | 453 +++++++ > drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + > drivers/gpu/drm/msm/dp/dp_parser.c | 20 +- > drivers/gpu/drm/msm/dp/dp_parser.h | 4 + > drivers/gpu/drm/msm/dp/dp_reg.h | 32 +- > drivers/gpu/drm/msm/msm_atomic.c | 15 + > include/drm/drm_hdcp.h | 194 +++ > 27 files changed, 2582 insertions(+), 1328 deletions(-) > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h > > -- > Sean Paul, Software Engineer, Google / Chromium OS >
On Tue, Apr 12, 2022 at 09:41:35AM -0400, Rodrigo Vivi wrote: > On Mon, Apr 11, 2022 at 08:47:29PM +0000, Sean Paul wrote: > > From: Sean Paul <seanpaul@chromium.org> > > > > Rebased set from November. Fixed a nit from Stephen in the msm patch and > > moved hdcp registers into the trogdor dtsi file to avoid differences > > with sc7180-based windows devices. The set is 4 patches lighter since > > some of the changes were accepted into msm. > > > > I'm still waiting for Intel review of the first 7 patches. Rodrigo/Jani, > > would you please provide your input so we can move forward with this > > set? > > I'm a bit concerned with patches 4 and 7. It is hard to map the removals > and additions and there are some changes that looks like changing behaviors, > but end up not being clear in the big patch. Also with big patch it is prune > to the rebasing and backport conflicts. I had the same concerns when I was writing this. I originally had it split up, but it seemed really cluttered with 2 sets of helpers (intel-internal + drm) that worked slightly differently. I'll try again now that some time has passed, perhaps a fresh look will help. Sean > > Would be possible to split some work in moving individual functions from i915 > to drm little by little with smaller patches? > > But thank you for this great work. It is also good to align our drm drivers. > > Thanks, > Rodrigo. > > > > > Thanks, > > > > Sean > > > > Link: https://patchwork.freedesktop.org/series/94623/ #v1 > > Link: https://patchwork.freedesktop.org/series/94713/ #v2 > > Link: https://patchwork.freedesktop.org/series/94712/ #v3 > > Link: https://patchwork.freedesktop.org/series/94712/ #v4 > > > > Sean Paul (10): > > 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 > > dt-bindings: msm/dp: Add bindings for HDCP registers > > arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller > > 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-trogdor.dtsi | 8 + > > arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 +- > > 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 | 36 +- > > drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- > > drivers/gpu/drm/msm/Makefile | 1 + > > drivers/gpu/drm/msm/dp/dp_debug.c | 46 +- > > drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- > > drivers/gpu/drm/msm/dp/dp_display.c | 46 +- > > 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 | 453 +++++++ > > drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + > > drivers/gpu/drm/msm/dp/dp_parser.c | 20 +- > > drivers/gpu/drm/msm/dp/dp_parser.h | 4 + > > drivers/gpu/drm/msm/dp/dp_reg.h | 32 +- > > drivers/gpu/drm/msm/msm_atomic.c | 15 + > > include/drm/drm_hdcp.h | 194 +++ > > 27 files changed, 2582 insertions(+), 1328 deletions(-) > > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c > > create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h > > > > -- > > Sean Paul, Software Engineer, Google / Chromium OS > >
On 11/04/2022 23:47, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > Rebased set from November. Fixed a nit from Stephen in the msm patch and > moved hdcp registers into the trogdor dtsi file to avoid differences > with sc7180-based windows devices. The set is 4 patches lighter since > some of the changes were accepted into msm. > > I'm still waiting for Intel review of the first 7 patches. Rodrigo/Jani, > would you please provide your input so we can move forward with this > set? > > Thanks, > > Sean > > Link: https://patchwork.freedesktop.org/series/94623/ #v1 > Link: https://patchwork.freedesktop.org/series/94713/ #v2 > Link: https://patchwork.freedesktop.org/series/94712/ #v3 > Link: https://patchwork.freedesktop.org/series/94712/ #v4 With most of the patches getting necessary acks and r-b, what would be the plan to merge the series? We can take patches 1-4 (core) + 8, 10 (msm) through the msm tree, leaving i915 for the next cycle. Does that sound good? > > Sean Paul (10): > 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 > dt-bindings: msm/dp: Add bindings for HDCP registers > arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller > 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-trogdor.dtsi | 8 + > arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 +- > 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 | 36 +- > drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- > drivers/gpu/drm/msm/Makefile | 1 + > drivers/gpu/drm/msm/dp/dp_debug.c | 46 +- > drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- > drivers/gpu/drm/msm/dp/dp_display.c | 46 +- > 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 | 453 +++++++ > drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + > drivers/gpu/drm/msm/dp/dp_parser.c | 20 +- > drivers/gpu/drm/msm/dp/dp_parser.h | 4 + > drivers/gpu/drm/msm/dp/dp_reg.h | 32 +- > drivers/gpu/drm/msm/msm_atomic.c | 15 + > include/drm/drm_hdcp.h | 194 +++ > 27 files changed, 2582 insertions(+), 1328 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> Rebased set from November. Fixed a nit from Stephen in the msm patch and moved hdcp registers into the trogdor dtsi file to avoid differences with sc7180-based windows devices. The set is 4 patches lighter since some of the changes were accepted into msm. I'm still waiting for Intel review of the first 7 patches. Rodrigo/Jani, would you please provide your input so we can move forward with this set? Thanks, Sean Link: https://patchwork.freedesktop.org/series/94623/ #v1 Link: https://patchwork.freedesktop.org/series/94713/ #v2 Link: https://patchwork.freedesktop.org/series/94712/ #v3 Link: https://patchwork.freedesktop.org/series/94712/ #v4 Sean Paul (10): 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 dt-bindings: msm/dp: Add bindings for HDCP registers arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller 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-trogdor.dtsi | 8 + arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 +- 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 | 36 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/dp/dp_debug.c | 46 +- drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- drivers/gpu/drm/msm/dp/dp_display.c | 46 +- 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 | 453 +++++++ drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + drivers/gpu/drm/msm/dp/dp_parser.c | 20 +- drivers/gpu/drm/msm/dp/dp_parser.h | 4 + drivers/gpu/drm/msm/dp/dp_reg.h | 32 +- drivers/gpu/drm/msm/msm_atomic.c | 15 + include/drm/drm_hdcp.h | 194 +++ 27 files changed, 2582 insertions(+), 1328 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h