diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-10-28 23:33:12 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-10-30 14:48:04 +0200 |
| commit | e5abaab30eca51d537b5ecfc01ddbe572d5b9d78 (patch) | |
| tree | 270b7bf3a1ab7b75a793e5f00bb601fce97d08bc /drivers/gpu/drm/i915/gvt/display.c | |
| parent | 8625b221f307efcbc32ac892fdaa5da3d27ba93a (diff) | |
| download | lwn-e5abaab30eca51d537b5ecfc01ddbe572d5b9d78.tar.gz lwn-e5abaab30eca51d537b5ecfc01ddbe572d5b9d78.zip | |
drm/i915: Introduce GEN8_DE_PORT_HOTPLUG()
Unify the BDW/BXT hotplug bits. BDW only has port A, but that
matches BXT port A so we can shar the same macro for both.
v2: Remember the gvt
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028213323.5423-9-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/display.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c index c124734e114c..5b5c71a0b4af 100644 --- a/drivers/gpu/drm/i915/gvt/display.c +++ b/drivers/gpu/drm/i915/gvt/display.c @@ -174,23 +174,23 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) if (IS_BROXTON(dev_priv)) { vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) &= - ~(BXT_DE_PORT_HP_DDI(HPD_PORT_A) | - BXT_DE_PORT_HP_DDI(HPD_PORT_B) | - BXT_DE_PORT_HP_DDI(HPD_PORT_C)); + ~(GEN8_DE_PORT_HOTPLUG(HPD_PORT_A) | + GEN8_DE_PORT_HOTPLUG(HPD_PORT_B) | + GEN8_DE_PORT_HOTPLUG(HPD_PORT_C)); if (intel_vgpu_has_monitor_on_port(vgpu, PORT_A)) { vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |= - BXT_DE_PORT_HP_DDI(HPD_PORT_A); + GEN8_DE_PORT_HOTPLUG(HPD_PORT_A); } if (intel_vgpu_has_monitor_on_port(vgpu, PORT_B)) { vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |= - BXT_DE_PORT_HP_DDI(HPD_PORT_B); + GEN8_DE_PORT_HOTPLUG(HPD_PORT_B); } if (intel_vgpu_has_monitor_on_port(vgpu, PORT_C)) { vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |= - BXT_DE_PORT_HP_DDI(HPD_PORT_C); + GEN8_DE_PORT_HOTPLUG(HPD_PORT_C); } return; @@ -328,7 +328,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) if (intel_vgpu_has_monitor_on_port(vgpu, PORT_A)) { if (IS_BROADWELL(dev_priv)) vgpu_vreg_t(vgpu, GEN8_DE_PORT_ISR) |= - GEN8_PORT_DP_A_HOTPLUG; + GEN8_DE_PORT_HOTPLUG(HPD_PORT_A); else vgpu_vreg_t(vgpu, SDEISR) |= SDE_PORTA_HOTPLUG_SPT; |