]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915/hdcp: Nuke intel_hdcp_transcoder_config()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 4 Dec 2019 18:05:41 +0000 (20:05 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 10 Dec 2019 10:37:53 +0000 (12:37 +0200)
commit70947291c1e4f2b25334bb8fdec601b12d4d9cd2
treeed698ae25900de281c748a0ec416f9c98bb1be70
parent4ee3bde60eae6a12b993d1a667a787a0f01d6996
drm/i915/hdcp: Nuke intel_hdcp_transcoder_config()

intel_hdcp_transcoder_config() is clobbering some globally visible
state in .compute_config(). That is a big no no as .compute_config()
is supposed to have no visible side effects when either the commit
fails or it's just a TEST_ONLY commit.

Inline this stuff into intel_hdcp_enable() so that the state only
gets modified when we actually commit the state to the hardware.

Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Fixes: 87f380f18c72 ("drm/i915/hdcp: update current transcoder into intel_hdcp")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191204180549.1267-2-ville.syrjala@linux.intel.com
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
(cherry picked from commit 67e1d5ed85a83e232a9e0b995f5778a86722b96e)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/display/intel_ddi.c
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/display/intel_hdcp.c
drivers/gpu/drm/i915/display/intel_hdcp.h
drivers/gpu/drm/i915/display/intel_hdmi.c