Re: [Intel-gfx] [PULL] topic/mei-hdcp for char-misc-next
On Thu, Feb 28, 2019 at 1:00 PM Greg KH wrote: > > On Tue, Feb 26, 2019 at 10:17:10PM +0100, Daniel Vetter wrote: > > Hi Greg > > > > topic/mei-hdcp-2019-02-26: > > mei-hdcp driver > > > > mei driver for the me hdcp client, for use by drm/i915. > > > > Including the following prep work: > > - whitelist hdcp client in mei bus > > - merge to include char-misc-next because of another mei bus prep patch to > > export a helper macro to drivers > > - drm/i915 side of the mei_hdcp/i915 component interface (already pulled > > into drm-intel for 5.2 as a topic branch) > > - component prep work (including one patch touching i915), already > > pulled by you into drivers-base-next for 5.1 > > > > mei-hdcp patches all reviewed and acked by Tomas Winkler. All other bits > > and pieces acked by relevant subsystem people. Took a bit longer than > > planned, but so does the 5.0 release. Up to you whether you still want to > > pull for 5.1 merge window or delay for 5.2, either totally fine for us. > > The drm/i915 of this will only land in 5.2 completely. > > > > Cheers, Daniel > > > > Note: diffstat below generated against Linus' tree. Which is wrong, but > > since this both contains drivers-base-next, char-misc-next and stuff > > queued for drm-i915 (but which isn't in linux-next yet because that's > > aimed for 5.2) it's a bit a mess. Given that shrugged and just went with > > this. I can regenerate some other diffstat if you want something else, > > just didn't know what's really the right thing here. > > That diffstat and shortlog was crazy :( > > Here's the right diffstat: Yup, that one looks reasonable. I guess for the next contrived topic branch I need to figure out how to generate diffstat against the other subsytem tree and put that in our scripting. Usually for topic branches just generating the diffstat against Linus' tree dtrt. But not in this case. > Documentation/driver-api/component.rst | 17 ++ > Documentation/driver-api/device_link.rst | 3 + > Documentation/driver-api/index.rst | 1 + > drivers/base/component.c | 206 - > drivers/gpu/drm/i915/intel_audio.c | 4 +- > drivers/gpu/drm/i915/intel_display.h | 16 +- > drivers/misc/mei/Kconfig | 10 + > drivers/misc/mei/Makefile| 2 + > drivers/misc/mei/bus-fixup.c | 16 ++ > drivers/misc/mei/hdcp/Makefile | 7 + > drivers/misc/mei/hdcp/mei_hdcp.c | 849 > +++ > drivers/misc/mei/hdcp/mei_hdcp.h | 377 > > include/drm/drm_audio_component.h| 1 + > include/drm/drm_hdcp.h | 18 ++ > include/drm/i915_component.h | 5 + > include/drm/i915_drm.h | 15 ++ > include/drm/i915_mei_hdcp_interface.h| 149 + > include/linux/component.h| 76 +++ > include/sound/hda_component.h| 5 +- > sound/hda/hdac_component.c | 4 +- > sound/hda/hdac_i915.c| 6 +- > 21 files changed, 1754 insertions(+), 33 deletions(-) > create mode 100644 Documentation/driver-api/component.rst > create mode 100644 drivers/misc/mei/hdcp/Makefile > create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.c > create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.h > create mode 100644 include/drm/i915_mei_hdcp_interface.h > > Anyway, I've pulled this into my char-misc-testing tree to let 0-day run with > it, and if all is good, will move it to my -next branch for inclusion in > 5.1-rc1. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PULL] topic/mei-hdcp for char-misc-next
On Tue, Feb 26, 2019 at 10:17:10PM +0100, Daniel Vetter wrote: > Hi Greg > > topic/mei-hdcp-2019-02-26: > mei-hdcp driver > > mei driver for the me hdcp client, for use by drm/i915. > > Including the following prep work: > - whitelist hdcp client in mei bus > - merge to include char-misc-next because of another mei bus prep patch to > export a helper macro to drivers > - drm/i915 side of the mei_hdcp/i915 component interface (already pulled > into drm-intel for 5.2 as a topic branch) > - component prep work (including one patch touching i915), already > pulled by you into drivers-base-next for 5.1 > > mei-hdcp patches all reviewed and acked by Tomas Winkler. All other bits > and pieces acked by relevant subsystem people. Took a bit longer than > planned, but so does the 5.0 release. Up to you whether you still want to > pull for 5.1 merge window or delay for 5.2, either totally fine for us. > The drm/i915 of this will only land in 5.2 completely. > > Cheers, Daniel > > Note: diffstat below generated against Linus' tree. Which is wrong, but > since this both contains drivers-base-next, char-misc-next and stuff > queued for drm-i915 (but which isn't in linux-next yet because that's > aimed for 5.2) it's a bit a mess. Given that shrugged and just went with > this. I can regenerate some other diffstat if you want something else, > just didn't know what's really the right thing here. That diffstat and shortlog was crazy :( Here's the right diffstat: Documentation/driver-api/component.rst | 17 ++ Documentation/driver-api/device_link.rst | 3 + Documentation/driver-api/index.rst | 1 + drivers/base/component.c | 206 - drivers/gpu/drm/i915/intel_audio.c | 4 +- drivers/gpu/drm/i915/intel_display.h | 16 +- drivers/misc/mei/Kconfig | 10 + drivers/misc/mei/Makefile| 2 + drivers/misc/mei/bus-fixup.c | 16 ++ drivers/misc/mei/hdcp/Makefile | 7 + drivers/misc/mei/hdcp/mei_hdcp.c | 849 +++ drivers/misc/mei/hdcp/mei_hdcp.h | 377 include/drm/drm_audio_component.h| 1 + include/drm/drm_hdcp.h | 18 ++ include/drm/i915_component.h | 5 + include/drm/i915_drm.h | 15 ++ include/drm/i915_mei_hdcp_interface.h| 149 + include/linux/component.h| 76 +++ include/sound/hda_component.h| 5 +- sound/hda/hdac_component.c | 4 +- sound/hda/hdac_i915.c| 6 +- 21 files changed, 1754 insertions(+), 33 deletions(-) create mode 100644 Documentation/driver-api/component.rst create mode 100644 drivers/misc/mei/hdcp/Makefile create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.c create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.h create mode 100644 include/drm/i915_mei_hdcp_interface.h Anyway, I've pulled this into my char-misc-testing tree to let 0-day run with it, and if all is good, will move it to my -next branch for inclusion in 5.1-rc1. thanks, greg k-h ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PULL] topic/mei-hdcp for char-misc-next
Hi Greg topic/mei-hdcp-2019-02-26: mei-hdcp driver mei driver for the me hdcp client, for use by drm/i915. Including the following prep work: - whitelist hdcp client in mei bus - merge to include char-misc-next because of another mei bus prep patch to export a helper macro to drivers - drm/i915 side of the mei_hdcp/i915 component interface (already pulled into drm-intel for 5.2 as a topic branch) - component prep work (including one patch touching i915), already pulled by you into drivers-base-next for 5.1 mei-hdcp patches all reviewed and acked by Tomas Winkler. All other bits and pieces acked by relevant subsystem people. Took a bit longer than planned, but so does the 5.0 release. Up to you whether you still want to pull for 5.1 merge window or delay for 5.2, either totally fine for us. The drm/i915 of this will only land in 5.2 completely. Cheers, Daniel Note: diffstat below generated against Linus' tree. Which is wrong, but since this both contains drivers-base-next, char-misc-next and stuff queued for drm-i915 (but which isn't in linux-next yet because that's aimed for 5.2) it's a bit a mess. Given that shrugged and just went with this. I can regenerate some other diffstat if you want something else, just didn't know what's really the right thing here. The following changes since commit d13937116f1e82bf508a6325111b322c30c85eb9: Linux 5.0-rc6 (2019-02-10 14:42:20 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/topic/mei-hdcp-2019-02-26 for you to fetch changes up to fa301ad9fa8f6f738b9c22da3ede7824e3286693: misc/mei/hdcp: Component framework for I915 Interface (2019-02-25 17:03:01 +0100) mei-hdcp driver mei driver for the me hdcp client, for use by drm/i915. Including the following prep work: - whitelist hdcp client in mei bus - merge to include char-misc-next - drm/i915 side of the mei_hdcp/i915 component interface - component prep work (including one patch touching i915) Aditya Pakki (1): misc/ics932s401: Add a missing check to i2c_smbus_read_word_data Alan Tull (1): fpga: altera_freeze_bridge: remove restriction to socfpga Alban Bedel (7): nvmem: core: Set the provider read-only when no write callback is given nvmem: core: Fix of_nvmem_cell_get() for optional cells nvmem: core: Fix cell lookup when no cell is found nvmem: core: Properly handle connection ID in of_nvmem_device_get() nvmem: core: Always reference the device returned by nvmem_device_get() nvmem: core: Fix device reference leak nvmem: core: Avoid useless iterations in nvmem_cell_get_from_lookup() Alexander Kapshuk (1): ver_linux: Assign constant RE to variable name for clarity Alexander Usyskin (1): mei: squash single_recv_buf into one bit in client properties Anson Huang (2): dt-bindings: nvmem: imx-ocotp: add compatible string for i.MX7ULP nvmem: imx-ocotp: add i.MX7ULP support Buland Singh (1): hpet: Fix missing '=' character in the __setup() code of hpet_mmap_enable Chengguang Xu (2): uio: fix potential memory leak in error case uio: remove redundant check Christophe Leroy (2): lkdtm: Print real addresses lkdtm: Add tests for NULL pointer dereference Colin Ian King (2): drivers: misc: ad525x_dpot: clean indentation issue, remove tabs fpga: mgr: altera-ps-spi: make array dummy static, shrinks object size Daniel Vetter (4): component: Add documentation components: multiple components for a device i915/snd_hdac: I915 subcomponent for the snd_hdac Pull in char-misc-next from Greg David Dai (2): interconnect: qcom: Add sdm845 interconnect provider driver arm64: dts: sdm845: Add interconnect provider DT nodes Finn Thain (22): scsi/atari_scsi: Don't select CONFIG_NVRAM m68k/atari: Move Atari-specific code out of drivers/char/nvram.c char/nvram: Re-order functions to remove forward declarations and #ifdefs nvram: Replace nvram_* function exports with static functions m68k/atari: Implement arch_nvram_ops struct powerpc: Replace nvram_* extern declarations with standard header char/nvram: Adopt arch_nvram_ops char/nvram: Allow the set_checksum and initialize ioctls to be omitted char/nvram: Implement NVRAM read/write methods m68k/atari: Implement arch_nvram_ops methods and enable CONFIG_HAVE_ARCH_NVRAM_OPS m68k/mac: Adopt naming and calling conventions for PRAM routines m68k/mac: Use macros for RTC accesses not magic numbers m68k/mac: Fix PRAM accessors macintosh/via-cuda: Don't rely on Cuda to end a transfer m68k: Dispatch nvram_ops calls to Atari or Mac functions char/nvram: Add "devname:nvram" module alias powerpc: Define missing ppc_md.nvram_size for CHRP and PowerMac
Re: [Intel-gfx] [PULL] topic/mei-hdcp
Quoting Daniel Vetter (2019-02-19 09:55:27)
> Hi all,
>
> topic/mei-hdcp-2019-02-19:
> Prep patches + headers for the mei-hdcp/i915 component interfaces
>
> Also contains the prep work in the component helpers plus adjustements
> for the snd-hda/i915 component interface.
>
> Plus one small static inline in the drm_hdcp.h header that both i915
> and mei_hdcp will need.
>
> Joonas, please pull into drm-intel-next-queued so I can apply the i915
> hdcp patches.
This is now pulled.
Regards, Joonas
>
> Greg/Arnd, I think there's two options to get the mei-hdcp patches landed
> into drivers-misc:
> - You pull this topic pull and then apply the mei-hdcp patches on top in
> char-misc-next.
> - I also pull in char-misc-next to get at 32ea33a04484 ("mei: bus: export
> to_mei_cl_device for mei client devices drivers") and then apply all the
> mei-hdcp stuff into a new topic branch.
>
> I think 2nd option would be better, allows us to integration test easier,
> and we'll have a topic branch in case we need a fixup spanning mei-hdcp
> and i915. Also would allow me to start merging the patches, since I think
> it's too late for 5.1.
>
> Cheers, Daniel
>
> The following changes since commit 8834f5600cf3c8db365e18a3d5cac2c2780c81e5:
>
> Linux 5.0-rc5 (2019-02-03 13:48:04 -0800)
>
> are available in the Git repository at:
>
> git://anongit.freedesktop.org/drm/drm-intel tags/topic/mei-hdcp-2019-02-19
>
> for you to fetch changes up to 35c0272502cca0a1b461d310c23aac94a503983d:
>
> drm/audio: declaration of struct device (2019-02-18 20:19:28 +0100)
>
>
> Prep patches + headers for the mei-hdcp/i915 component interfaces
>
> Also contains the prep work in the component helpers plus adjustements
> for the snd-hda/i915 component interface.
>
> Plus one small static inline in the drm_hdcp.h header that both i915
> and mei_hdcp will need.
>
>
> Daniel Vetter (3):
> component: Add documentation
> components: multiple components for a device
> i915/snd_hdac: I915 subcomponent for the snd_hdac
>
> Ramalingam C (5):
> drm/i915: enum port definition is moved into i915_drm.h
> drm/i915: header for i915 - MEI_HDCP interface
> drm/i915: MEI interface definition
> drm: helper functions for hdcp2 seq_num to from u32
> drm/audio: declaration of struct device
>
> Documentation/driver-api/component.rst | 17 +++
> Documentation/driver-api/device_link.rst | 3 +
> Documentation/driver-api/index.rst | 1 +
> drivers/base/component.c | 206
> +--
> drivers/gpu/drm/i915/intel_audio.c | 4 +-
> drivers/gpu/drm/i915/intel_display.h | 16 +--
> include/drm/drm_audio_component.h| 1 +
> include/drm/drm_hdcp.h | 18 +++
> include/drm/i915_component.h | 5 +
> include/drm/i915_drm.h | 15 +++
> include/drm/i915_mei_hdcp_interface.h| 149 ++
> include/linux/component.h| 76
> include/sound/hda_component.h| 5 +-
> sound/hda/hdac_component.c | 4 +-
> sound/hda/hdac_i915.c| 6 +-
> 15 files changed, 493 insertions(+), 33 deletions(-)
> create mode 100644 Documentation/driver-api/component.rst
> create mode 100644 include/drm/i915_mei_hdcp_interface.h
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PULL] topic/mei-hdcp
On Tue, Feb 19, 2019 at 08:55:27AM +0100, Daniel Vetter wrote:
> Hi all,
>
> topic/mei-hdcp-2019-02-19:
> Prep patches + headers for the mei-hdcp/i915 component interfaces
>
> Also contains the prep work in the component helpers plus adjustements
> for the snd-hda/i915 component interface.
>
> Plus one small static inline in the drm_hdcp.h header that both i915
> and mei_hdcp will need.
>
> Joonas, please pull into drm-intel-next-queued so I can apply the i915
> hdcp patches.
>
> Greg/Arnd, I think there's two options to get the mei-hdcp patches landed
> into drivers-misc:
> - You pull this topic pull and then apply the mei-hdcp patches on top in
> char-misc-next.
> - I also pull in char-misc-next to get at 32ea33a04484 ("mei: bus: export
> to_mei_cl_device for mei client devices drivers") and then apply all the
> mei-hdcp stuff into a new topic branch.
>
> I think 2nd option would be better, allows us to integration test easier,
> and we'll have a topic branch in case we need a fixup spanning mei-hdcp
> and i915. Also would allow me to start merging the patches, since I think
> it's too late for 5.1.
No objection from me, pull away!
greg k-h
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PULL] topic/mei-hdcp
Hi all,
topic/mei-hdcp-2019-02-19:
Prep patches + headers for the mei-hdcp/i915 component interfaces
Also contains the prep work in the component helpers plus adjustements
for the snd-hda/i915 component interface.
Plus one small static inline in the drm_hdcp.h header that both i915
and mei_hdcp will need.
Joonas, please pull into drm-intel-next-queued so I can apply the i915
hdcp patches.
Greg/Arnd, I think there's two options to get the mei-hdcp patches landed
into drivers-misc:
- You pull this topic pull and then apply the mei-hdcp patches on top in
char-misc-next.
- I also pull in char-misc-next to get at 32ea33a04484 ("mei: bus: export
to_mei_cl_device for mei client devices drivers") and then apply all the
mei-hdcp stuff into a new topic branch.
I think 2nd option would be better, allows us to integration test easier,
and we'll have a topic branch in case we need a fixup spanning mei-hdcp
and i915. Also would allow me to start merging the patches, since I think
it's too late for 5.1.
Cheers, Daniel
The following changes since commit 8834f5600cf3c8db365e18a3d5cac2c2780c81e5:
Linux 5.0-rc5 (2019-02-03 13:48:04 -0800)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-intel tags/topic/mei-hdcp-2019-02-19
for you to fetch changes up to 35c0272502cca0a1b461d310c23aac94a503983d:
drm/audio: declaration of struct device (2019-02-18 20:19:28 +0100)
Prep patches + headers for the mei-hdcp/i915 component interfaces
Also contains the prep work in the component helpers plus adjustements
for the snd-hda/i915 component interface.
Plus one small static inline in the drm_hdcp.h header that both i915
and mei_hdcp will need.
Daniel Vetter (3):
component: Add documentation
components: multiple components for a device
i915/snd_hdac: I915 subcomponent for the snd_hdac
Ramalingam C (5):
drm/i915: enum port definition is moved into i915_drm.h
drm/i915: header for i915 - MEI_HDCP interface
drm/i915: MEI interface definition
drm: helper functions for hdcp2 seq_num to from u32
drm/audio: declaration of struct device
Documentation/driver-api/component.rst | 17 +++
Documentation/driver-api/device_link.rst | 3 +
Documentation/driver-api/index.rst | 1 +
drivers/base/component.c | 206 +--
drivers/gpu/drm/i915/intel_audio.c | 4 +-
drivers/gpu/drm/i915/intel_display.h | 16 +--
include/drm/drm_audio_component.h| 1 +
include/drm/drm_hdcp.h | 18 +++
include/drm/i915_component.h | 5 +
include/drm/i915_drm.h | 15 +++
include/drm/i915_mei_hdcp_interface.h| 149 ++
include/linux/component.h| 76
include/sound/hda_component.h| 5 +-
sound/hda/hdac_component.c | 4 +-
sound/hda/hdac_i915.c| 6 +-
15 files changed, 493 insertions(+), 33 deletions(-)
create mode 100644 Documentation/driver-api/component.rst
create mode 100644 include/drm/i915_mei_hdcp_interface.h
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
