Commit 0790e63f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2020-08-20' of... 

Merge tag 'drm-intel-fixes-2020-08-20' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.9-rc2:
- GVT fixes
- Fix device parameter usage for selftest mock i915 device
- Fix LPSP capability debugfs NULL dereference
- Fix buddy register pagemask table
- Fix intel_atomic_check() non-negative return value
- Fix selftests passing a random 0 into ilog2()
- Fix TGL power well enable/disable ordering
- Switch to PMU module refcounting

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87a6yp7jp3.fsf@intel.com
parents ba9086a6 4a4064ad

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

+1 −1
Original line number Diff line number Diff line
@@ -14930,7 +14930,7 @@ static int intel_atomic_check(struct drm_device *dev, 
	if (any_ms && !check_digital_port_conflicts(state)) {

		drm_dbg_kms(&dev_priv->drm,

			    "rejecting conflicting digital port configuration\n");

		ret = EINVAL;

		ret = -EINVAL;

		goto fail;

	}
































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



+5
−2






























Original line number
Diff line number
Diff line







@@ -2044,9 +2044,12 @@ DEFINE_SHOW_ATTRIBUTE(i915_hdcp_sink_capability);







static int i915_lpsp_capability_show(struct seq_file *m, void *data)









{









	struct drm_connector *connector = m->private;









	struct intel_encoder *encoder =









			intel_attached_encoder(to_intel_connector(connector));









	struct drm_i915_private *i915 = to_i915(connector->dev);









	struct intel_encoder *encoder;



















	encoder = intel_attached_encoder(to_intel_connector(connector));









	if (!encoder)









		return -ENODEV;



















	if (connector->status != connector_status_connected)









		return -ENODEV;
































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



+7
−7






























Original line number
Diff line number
Diff line







@@ -4146,6 +4146,12 @@ static const struct i915_power_well_desc tgl_power_wells[] = {







			.hsw.idx = TGL_PW_CTL_IDX_DDI_TC6,









		},









	},









	{









		.name = "TC cold off",









		.domains = TGL_TC_COLD_OFF_POWER_DOMAINS,









		.ops = &tgl_tc_cold_off_ops,









		.id = DISP_PW_ID_NONE,









	},









	{









		.name = "AUX A",









		.domains = TGL_AUX_A_IO_POWER_DOMAINS,








@@ -4332,12 +4338,6 @@ static const struct i915_power_well_desc tgl_power_wells[] = {







			.hsw.irq_pipe_mask = BIT(PIPE_D),









		},









	},









	{









		.name = "TC cold off",









		.domains = TGL_TC_COLD_OFF_POWER_DOMAINS,









		.ops = &tgl_tc_cold_off_ops,









		.id = DISP_PW_ID_NONE,









	},









};



















static const struct i915_power_well_desc rkl_power_wells[] = {








@@ -5240,10 +5240,10 @@ struct buddy_page_mask {







};



















static const struct buddy_page_mask tgl_buddy_page_masks[] = {









	{ .num_channels = 1, .type = INTEL_DRAM_LPDDR4, .page_mask = 0xE },









	{ .num_channels = 1, .type = INTEL_DRAM_DDR4,   .page_mask = 0xF },









	{ .num_channels = 2, .type = INTEL_DRAM_LPDDR4, .page_mask = 0x1C },









	{ .num_channels = 2, .type = INTEL_DRAM_DDR4,   .page_mask = 0x1F },









	{ .num_channels = 4, .type = INTEL_DRAM_LPDDR4, .page_mask = 0x38 },









	{}









};










































drivers/gpu/drm/i915/gvt/cfg_space.c



+24
−0






























Original line number
Diff line number
Diff line







@@ -70,6 +70,7 @@ static void vgpu_pci_cfg_mem_write(struct intel_vgpu *vgpu, unsigned int off,







{









	u8 *cfg_base = vgpu_cfg_space(vgpu);









	u8 mask, new, old;









	pci_power_t pwr;









	int i = 0;



















	for (; i < bytes && (off + i < sizeof(pci_cfg_space_rw_bmp)); i++) {








@@ -91,6 +92,15 @@ static void vgpu_pci_cfg_mem_write(struct intel_vgpu *vgpu, unsigned int off,







	/* For other configuration space directly copy as it is. */









	if (i < bytes)









		memcpy(cfg_base + off + i, src + i, bytes - i);



















	if (off == vgpu->cfg_space.pmcsr_off && vgpu->cfg_space.pmcsr_off) {









		pwr = (pci_power_t __force)(*(u16*)(&vgpu_cfg_space(vgpu)[off])









			& PCI_PM_CTRL_STATE_MASK);









		if (pwr == PCI_D3hot)









			vgpu->d3_entered = true;









		gvt_dbg_core("vgpu-%d power status changed to %d\n",









			     vgpu->id, pwr);









	}









}



















/**








@@ -366,6 +376,7 @@ void intel_vgpu_init_cfg_space(struct intel_vgpu *vgpu,







	struct intel_gvt *gvt = vgpu->gvt;









	const struct intel_gvt_device_info *info = &gvt->device_info;









	u16 *gmch_ctl;









	u8 next;



















	memcpy(vgpu_cfg_space(vgpu), gvt->firmware.cfg_space,









	       info->cfg_space_size);








@@ -401,6 +412,19 @@ void intel_vgpu_init_cfg_space(struct intel_vgpu *vgpu,







		pci_resource_len(gvt->gt->i915->drm.pdev, 2);



















	memset(vgpu_cfg_space(vgpu) + PCI_ROM_ADDRESS, 0, 4);



















	/* PM Support */









	vgpu->cfg_space.pmcsr_off = 0;









	if (vgpu_cfg_space(vgpu)[PCI_STATUS] & PCI_STATUS_CAP_LIST) {









		next = vgpu_cfg_space(vgpu)[PCI_CAPABILITY_LIST];









		do {









			if (vgpu_cfg_space(vgpu)[next + PCI_CAP_LIST_ID] == PCI_CAP_ID_PM) {









				vgpu->cfg_space.pmcsr_off = next + PCI_PM_CTRL;









				break;









			}









			next = vgpu_cfg_space(vgpu)[next + PCI_CAP_LIST_NEXT];









		} while (next);









	}









}



















/**
































drivers/gpu/drm/i915/gvt/gtt.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2501,7 +2501,7 @@ int intel_vgpu_init_gtt(struct intel_vgpu *vgpu)







	return create_scratch_page_tree(vgpu);









}



















static void intel_vgpu_destroy_all_ppgtt_mm(struct intel_vgpu *vgpu)









void intel_vgpu_destroy_all_ppgtt_mm(struct intel_vgpu *vgpu)









{









	struct list_head *pos, *n;









	struct intel_vgpu_mm *mm;