Commit 3eac4684 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hdcp: migrate away from kdev_to_i915() in bind/unbind 



Use to_intel_display() instead of kdev_to_i915() in the HDCP component
API hooks. Avoid further drive-by changes at this point, and just
convert the display pointer to i915, and leave the struct intel_display
conversion for later.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0beedaa438e912828b48d9980f017807e079d7ab.1724942754.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 14ee9fa8

drivers/gpu/drm/i915/display/intel_hdcp.c

+6 −4
Original line number Diff line number Diff line
@@ -2181,10 +2181,11 @@ static void intel_hdcp_check_work(struct work_struct *work) 
				   DRM_HDCP_CHECK_PERIOD_MS);

}



static int i915_hdcp_component_bind(struct device *i915_kdev,

static int i915_hdcp_component_bind(struct device *drv_kdev,

				    struct device *mei_kdev, void *data)

{

	struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);

	struct intel_display *display = to_intel_display(drv_kdev);

	struct drm_i915_private *i915 = to_i915(display->drm);



	drm_dbg(&i915->drm, "I915 HDCP comp bind\n");

	mutex_lock(&i915->display.hdcp.hdcp_mutex);
@@ -2195,10 +2196,11 @@ static int i915_hdcp_component_bind(struct device *i915_kdev, 
	return 0;

}



static void i915_hdcp_component_unbind(struct device *i915_kdev,

static void i915_hdcp_component_unbind(struct device *drv_kdev,

				       struct device *mei_kdev, void *data)

{

	struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);

	struct intel_display *display = to_intel_display(drv_kdev);

	struct drm_i915_private *i915 = to_i915(display->drm);



	drm_dbg(&i915->drm, "I915 HDCP comp unbind\n");

	mutex_lock(&i915->display.hdcp.hdcp_mutex);