Re: [PULL] topic/mei-hdcp for char-misc-next

From: Greg KH <gregkh@linuxfoundation.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dim-tools@lists.freedesktop.org, Arnd Bergmann <arnd@arndb.de>,
	Maxime Ripard <maxime.ripard@bootlin.com>,
	intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	Tomas Winkler <tomas.winkler@intel.com>
Subject: Re: [PULL] topic/mei-hdcp for char-misc-next
Date: Thu, 28 Feb 2019 13:00:54 +0100	[thread overview]
Message-ID: <20190228120054.GA7489@kroah.com> (raw)
In-Reply-To: <20190226211710.GA8465@phenom.ffwll.local>

On Tue, Feb 26, 2019 at 10:17:10PM +0100, Daniel Vetter wrote:
> Hi Greg&Arnd
> 
> 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&snd-hda), 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