]> git.baikalelectronics.ru Git - kernel.git/commit
drm: Fix HDCP failures when SRM fw is missing
authorSean Paul <seanpaul@chromium.org>
Tue, 14 Apr 2020 19:02:55 +0000 (15:02 -0400)
committerSean Paul <seanpaul@chromium.org>
Tue, 5 May 2020 18:01:53 +0000 (14:01 -0400)
commit5a7d3b0b9d7f7c03b32707759a97a975150696d3
treee012109e6312bfd20826bdcdd775b8e6191f7702
parentbc89fb6f65d895117fd3bd098604e5896d3ce809
drm: Fix HDCP failures when SRM fw is missing

The SRM cleanup in f80b9f3b1a5a4 ("drm/hdcp: optimizing the srm
handling") inadvertently altered the behavior of HDCP auth when
the SRM firmware is missing. Before that patch, missing SRM was
interpreted as the device having no revoked keys. With that patch,
if the SRM fw file is missing we reject _all_ keys.

This patch fixes that regression by returning success if the file
cannot be found. It also checks the return value from request_srm such
that we won't end up trying to parse the ksv list if there is an error
fetching it.

Fixes: f80b9f3b1a5a ("drm/hdcp: optimizing the srm handling")
Cc: stable@vger.kernel.org
Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200414190258.38873-1-sean@poorly.run
Changes in v2:
-Noticed a couple other things to clean up
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
drivers/gpu/drm/drm_hdcp.c