clear-pkgs-linux-iot-lts2018/0595-drm-i915-gvt-unset-DDI...

51 lines
2.1 KiB
Diff
Raw Permalink Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-10-11 02:06:46 +08:00
From: Fei Jiang <fei.jiang@intel.com>
Date: Tue, 27 Mar 2018 22:59:22 +0800
Subject: [PATCH] drm/i915/gvt: unset DDI_BUF_CTL_ENABLE during port emulation
reset
2018-10-11 02:06:46 +08:00
HDMI port enabling will assert port status, if it's already set during
reset stage, i915 will pop up warning message. Unset those bits to avoid
such warning message.
Signed-off-by: Fei Jiang <fei.jiang@intel.com>
Change-Id: Ic8c738baa472d7f1086081cb1b634670327aae97
---
drivers/gpu/drm/i915/gvt/display.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
2020-10-27 02:14:06 +08:00
index 39b255985cd8..9a41756c7df3 100644
2018-10-11 02:06:46 +08:00
--- a/drivers/gpu/drm/i915/gvt/display.c
+++ b/drivers/gpu/drm/i915/gvt/display.c
2020-06-21 05:57:46 +08:00
@@ -255,7 +255,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
2018-10-11 02:06:46 +08:00
vgpu_vreg_t(vgpu, PORT_CLK_SEL(PORT_B)) |=
PORT_CLK_SEL_LCPLL_810;
}
- vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_B)) |= DDI_BUF_CTL_ENABLE;
+ vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_B)) &= ~DDI_BUF_CTL_ENABLE;
vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_B)) &= ~DDI_BUF_IS_IDLE;
vgpu_vreg_t(vgpu, SDEISR) |= SDE_PORTB_HOTPLUG_CPT;
}
2020-06-21 05:57:46 +08:00
@@ -281,7 +281,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
2018-10-11 02:06:46 +08:00
vgpu_vreg_t(vgpu, PORT_CLK_SEL(PORT_C)) |=
PORT_CLK_SEL_LCPLL_810;
}
- vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_C)) |= DDI_BUF_CTL_ENABLE;
+ vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_C)) &= ~DDI_BUF_CTL_ENABLE;
vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_C)) &= ~DDI_BUF_IS_IDLE;
vgpu_vreg_t(vgpu, SFUSE_STRAP) |= SFUSE_STRAP_DDIC_DETECTED;
}
2020-06-21 05:57:46 +08:00
@@ -307,7 +307,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
2018-10-11 02:06:46 +08:00
vgpu_vreg_t(vgpu, PORT_CLK_SEL(PORT_D)) |=
PORT_CLK_SEL_LCPLL_810;
}
- vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_D)) |= DDI_BUF_CTL_ENABLE;
+ vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_D)) &= ~DDI_BUF_CTL_ENABLE;
vgpu_vreg_t(vgpu, DDI_BUF_CTL(PORT_D)) &= ~DDI_BUF_IS_IDLE;
vgpu_vreg_t(vgpu, SFUSE_STRAP) |= SFUSE_STRAP_DDID_DETECTED;
}
--
https://clearlinux.org
2018-10-11 02:06:46 +08:00