Merge tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
GLK pipe C related fix, and a gvt fix. * tag 'drm-intel-fixes-2017-12-22-1' of git://anongit.freedesktop.org/drm/drm-intel: i915: Reject CCS modifiers for pipe C on Geminilake drm/i915/gvt: Fix pipe A enable as default for vgpuhifive-unleashed-5.1
commit
03bfd4e19b
|
@ -266,6 +266,8 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
|
||||||
/* Clear host CRT status, so guest couldn't detect this host CRT. */
|
/* Clear host CRT status, so guest couldn't detect this host CRT. */
|
||||||
if (IS_BROADWELL(dev_priv))
|
if (IS_BROADWELL(dev_priv))
|
||||||
vgpu_vreg(vgpu, PCH_ADPA) &= ~ADPA_CRT_HOTPLUG_MONITOR_MASK;
|
vgpu_vreg(vgpu, PCH_ADPA) &= ~ADPA_CRT_HOTPLUG_MONITOR_MASK;
|
||||||
|
|
||||||
|
vgpu_vreg(vgpu, PIPECONF(PIPE_A)) |= PIPECONF_ENABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void clean_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num)
|
static void clean_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num)
|
||||||
|
@ -282,7 +284,6 @@ static void clean_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num)
|
||||||
static int setup_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num,
|
static int setup_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num,
|
||||||
int type, unsigned int resolution)
|
int type, unsigned int resolution)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
|
|
||||||
struct intel_vgpu_port *port = intel_vgpu_port(vgpu, port_num);
|
struct intel_vgpu_port *port = intel_vgpu_port(vgpu, port_num);
|
||||||
|
|
||||||
if (WARN_ON(resolution >= GVT_EDID_NUM))
|
if (WARN_ON(resolution >= GVT_EDID_NUM))
|
||||||
|
@ -308,7 +309,7 @@ static int setup_virtual_dp_monitor(struct intel_vgpu *vgpu, int port_num,
|
||||||
port->type = type;
|
port->type = type;
|
||||||
|
|
||||||
emulate_monitor_status_change(vgpu);
|
emulate_monitor_status_change(vgpu);
|
||||||
vgpu_vreg(vgpu, PIPECONF(PIPE_A)) |= PIPECONF_ENABLE;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13194,7 +13194,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
|
||||||
primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe);
|
primary->frontbuffer_bit = INTEL_FRONTBUFFER_PRIMARY(pipe);
|
||||||
primary->check_plane = intel_check_primary_plane;
|
primary->check_plane = intel_check_primary_plane;
|
||||||
|
|
||||||
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
|
if (INTEL_GEN(dev_priv) >= 10) {
|
||||||
intel_primary_formats = skl_primary_formats;
|
intel_primary_formats = skl_primary_formats;
|
||||||
num_formats = ARRAY_SIZE(skl_primary_formats);
|
num_formats = ARRAY_SIZE(skl_primary_formats);
|
||||||
modifiers = skl_format_modifiers_ccs;
|
modifiers = skl_format_modifiers_ccs;
|
||||||
|
|
Loading…
Reference in New Issue