Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/dkl: convert intel_dkl_phy.[ch] to struct intel_display

Going forward, struct intel_display is the main display device data
pointer. Convert intel_dkl_phy.[ch] to struct intel_display.

Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/fce153dbd3a69dc574a66fb97b7c1f441df9726f.1740502116.git.jani.nikula@intel.com
[Jani: Fix a missing include while applying]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+6 -7
+1 -1
drivers/gpu/drm/i915/display/intel_display_driver.c
··· 194 194 mutex_init(&display->hdcp.hdcp_mutex); 195 195 196 196 intel_display_irq_init(i915); 197 - intel_dkl_phy_init(i915); 197 + intel_dkl_phy_init(display); 198 198 intel_color_init_hooks(display); 199 199 intel_init_cdclk_hooks(display); 200 200 intel_audio_hooks_init(display);
+4 -4
drivers/gpu/drm/i915/display/intel_dkl_phy.c
··· 3 3 * Copyright © 2022 Intel Corporation 4 4 */ 5 5 6 - #include "i915_drv.h" 6 + #include <drm/drm_device.h> 7 7 8 8 #include "intel_de.h" 9 9 #include "intel_display.h" ··· 12 12 13 13 /** 14 14 * intel_dkl_phy_init - initialize Dekel PHY 15 - * @i915: i915 device instance 15 + * @display: display device instance 16 16 */ 17 - void intel_dkl_phy_init(struct drm_i915_private *i915) 17 + void intel_dkl_phy_init(struct intel_display *display) 18 18 { 19 - spin_lock_init(&i915->display.dkl.phy_lock); 19 + spin_lock_init(&display->dkl.phy_lock); 20 20 } 21 21 22 22 static void
+1 -2
drivers/gpu/drm/i915/display/intel_dkl_phy.h
··· 10 10 11 11 #include "intel_dkl_phy_regs.h" 12 12 13 - struct drm_i915_private; 14 13 struct intel_display; 15 14 16 - void intel_dkl_phy_init(struct drm_i915_private *i915); 15 + void intel_dkl_phy_init(struct intel_display *display); 17 16 u32 18 17 intel_dkl_phy_read(struct intel_display *display, struct intel_dkl_phy_reg reg); 19 18 void