Skip to content

Commit 9e1673d

Browse files
committed
drm/i915/combo-phy: convert intel_combo_phy.[ch] to struct intel_display
Going forward, struct intel_display is the main display device data pointer. Convert as much as possible of intel_combo_phy.[ch] to struct intel_display, along with intel_phy_is_combo() in intel_display.c. Drive-by convert some drm_dbg() to drm_dbg_kms() while at it. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/c2e0a6294a8eaa4c16632881edc4f2d23c576101.1739378096.git.jani.nikula@intel.com
1 parent 82fafa7 commit 9e1673d

File tree

8 files changed

+109
-113
lines changed

8 files changed

+109
-113
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include <drm/drm_mipi_dsi.h>
3232
#include <drm/drm_probe_helper.h>
3333

34-
#include "i915_drv.h"
3534
#include "i915_reg.h"
35+
#include "i915_utils.h"
3636
#include "icl_dsi.h"
3737
#include "icl_dsi_regs.h"
3838
#include "intel_atomic.h"
@@ -413,12 +413,12 @@ static void gen11_dsi_enable_io_power(struct intel_encoder *encoder)
413413

414414
static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)
415415
{
416-
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
416+
struct intel_display *display = to_intel_display(encoder);
417417
struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
418418
enum phy phy;
419419

420420
for_each_dsi_phy(phy, intel_dsi->phys)
421-
intel_combo_phy_power_up_lanes(dev_priv, phy, true,
421+
intel_combo_phy_power_up_lanes(display, phy, true,
422422
intel_dsi->lane_count, false);
423423
}
424424

0 commit comments

Comments
 (0)