Skip to content

Commit 3eac468

Browse files
committed
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: Gustavo Sousa <gustavo.sousa@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/0beedaa438e912828b48d9980f017807e079d7ab.1724942754.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 14ee9fa commit 3eac468

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,10 +2181,11 @@ static void intel_hdcp_check_work(struct work_struct *work)
21812181
DRM_HDCP_CHECK_PERIOD_MS);
21822182
}
21832183

2184-
static int i915_hdcp_component_bind(struct device *i915_kdev,
2184+
static int i915_hdcp_component_bind(struct device *drv_kdev,
21852185
struct device *mei_kdev, void *data)
21862186
{
2187-
struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
2187+
struct intel_display *display = to_intel_display(drv_kdev);
2188+
struct drm_i915_private *i915 = to_i915(display->drm);
21882189

21892190
drm_dbg(&i915->drm, "I915 HDCP comp bind\n");
21902191
mutex_lock(&i915->display.hdcp.hdcp_mutex);
@@ -2195,10 +2196,11 @@ static int i915_hdcp_component_bind(struct device *i915_kdev,
21952196
return 0;
21962197
}
21972198

2198-
static void i915_hdcp_component_unbind(struct device *i915_kdev,
2199+
static void i915_hdcp_component_unbind(struct device *drv_kdev,
21992200
struct device *mei_kdev, void *data)
22002201
{
2201-
struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
2202+
struct intel_display *display = to_intel_display(drv_kdev);
2203+
struct drm_i915_private *i915 = to_i915(display->drm);
22022204

22032205
drm_dbg(&i915->drm, "I915 HDCP comp unbind\n");
22042206
mutex_lock(&i915->display.hdcp.hdcp_mutex);

0 commit comments

Comments
 (0)