Skip to content

Commit bc9ebca

Browse files
airliedairlied
committed
Merge tag 'drm-intel-next-fixes-2018-04-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
- Fix for FDO #105549: Avoid OOPS on bad VBT (Jani) - Fix rare pre-emption race (Chris) - Fix RC6 race against PM transitions (Tvrtko) * tag 'drm-intel-next-fixes-2018-04-19' of git://anongit.freedesktop.org/drm/drm-intel: drm/i915/audio: Fix audio detection issue on GLK drm/i915: Call i915_perf_fini() on init_hw error unwind drm/i915/bios: filter out invalid DDC pins from VBT child devices drm/i915/pmu: Inspect runtime PM state more carefully while estimating RC6 drm/i915: Do no use kfree() to free a kmem_cache_alloc() return value drm/i915/execlists: Clear user-active flag on preemption completion drm/i915/gvt: Add drm_format_mod update drm/i915/gvt: Disable primary/sprite/cursor plane at virtual display initialization drm/i915/gvt: Delete redundant error message in fb_decode.c drm/i915/gvt: Cancel dma map when resetting ggtt entries drm/i915/gvt: Missed to cancel dma map for ggtt entries drm/i915/gvt: Make MI_USER_INTERRUPT nop in cmd parser drm/i915/gvt: Mark expected switch fall-through in handle_g2v_notification drm/i915/gvt: throw error on unhandled vfio ioctls
2 parents e1898f9 + b461573 commit bc9ebca

File tree

14 files changed

+131
-55
lines changed

14 files changed

+131
-55
lines changed

‎drivers/gpu/drm/i915/gvt/cmd_parser.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,7 @@ static int cmd_handler_mi_user_interrupt(struct parser_exec_state *s)
10801080
{
10811081
set_bit(cmd_interrupt_events[s->ring_id].mi_user_interrupt,
10821082
s->workload->pending_events);
1083+
patch_value(s, cmd_ptr(s, 0), MI_NOOP);
10831084
return 0;
10841085
}
10851086

‎drivers/gpu/drm/i915/gvt/display.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ static u8 dpcd_fix_data[DPCD_HEADER_SIZE] = {
169169
static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
170170
{
171171
struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;
172+
int pipe;
173+
172174
vgpu_vreg_t(vgpu, SDEISR) &= ~(SDE_PORTB_HOTPLUG_CPT |
173175
SDE_PORTC_HOTPLUG_CPT |
174176
SDE_PORTD_HOTPLUG_CPT);
@@ -267,6 +269,14 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
267269
if (IS_BROADWELL(dev_priv))
268270
vgpu_vreg_t(vgpu, PCH_ADPA) &= ~ADPA_CRT_HOTPLUG_MONITOR_MASK;
269271

272+
/* Disable Primary/Sprite/Cursor plane */
273+
for_each_pipe(dev_priv, pipe) {
274+
vgpu_vreg_t(vgpu, DSPCNTR(pipe)) &= ~DISPLAY_PLANE_ENABLE;
275+
vgpu_vreg_t(vgpu, SPRCTL(pipe)) &= ~SPRITE_ENABLE;
276+
vgpu_vreg_t(vgpu, CURCNTR(pipe)) &= ~CURSOR_MODE;
277+
vgpu_vreg_t(vgpu, CURCNTR(pipe)) |= CURSOR_MODE_DISABLE;
278+
}
279+
270280
vgpu_vreg_t(vgpu, PIPECONF(PIPE_A)) |= PIPECONF_ENABLE;
271281
}
272282

‎drivers/gpu/drm/i915/gvt/dmabuf.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ static void update_fb_info(struct vfio_device_gfx_plane_info *gvt_dmabuf,
323323
struct intel_vgpu_fb_info *fb_info)
324324
{
325325
gvt_dmabuf->drm_format = fb_info->drm_format;
326+
gvt_dmabuf->drm_format_mod = fb_info->drm_format_mod;
326327
gvt_dmabuf->width = fb_info->width;
327328
gvt_dmabuf->height = fb_info->height;
328329
gvt_dmabuf->stride = fb_info->stride;

‎drivers/gpu/drm/i915/gvt/fb_decoder.c‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,13 @@ int intel_vgpu_decode_primary_plane(struct intel_vgpu *vgpu,
245245
plane->hw_format = fmt;
246246

247247
plane->base = vgpu_vreg_t(vgpu, DSPSURF(pipe)) & I915_GTT_PAGE_MASK;
248-
if (!intel_gvt_ggtt_validate_range(vgpu, plane->base, 0)) {
249-
gvt_vgpu_err("invalid gma address: %lx\n",
250-
(unsigned long)plane->base);
248+
if (!intel_gvt_ggtt_validate_range(vgpu, plane->base, 0))
251249
return -EINVAL;
252-
}
253250

254251
plane->base_gpa = intel_vgpu_gma_to_gpa(vgpu->gtt.ggtt_mm, plane->base);
255252
if (plane->base_gpa == INTEL_GVT_INVALID_ADDR) {
256-
gvt_vgpu_err("invalid gma address: %lx\n",
257-
(unsigned long)plane->base);
253+
gvt_vgpu_err("Translate primary plane gma 0x%x to gpa fail\n",
254+
plane->base);
258255
return -EINVAL;
259256
}
260257

@@ -371,16 +368,13 @@ int intel_vgpu_decode_cursor_plane(struct intel_vgpu *vgpu,
371368
alpha_plane, alpha_force);
372369

373370
plane->base = vgpu_vreg_t(vgpu, CURBASE(pipe)) & I915_GTT_PAGE_MASK;
374-
if (!intel_gvt_ggtt_validate_range(vgpu, plane->base, 0)) {
375-
gvt_vgpu_err("invalid gma address: %lx\n",
376-
(unsigned long)plane->base);
371+
if (!intel_gvt_ggtt_validate_range(vgpu, plane->base, 0))
377372
return -EINVAL;
378-
}
379373

380374
plane->base_gpa = intel_vgpu_gma_to_gpa(vgpu->gtt.ggtt_mm, plane->base);
381375
if (plane->base_gpa == INTEL_GVT_INVALID_ADDR) {
382-
gvt_vgpu_err("invalid gma address: %lx\n",
383-
(unsigned long)plane->base);
376+
gvt_vgpu_err("Translate cursor plane gma 0x%x to gpa fail\n",
377+
plane->base);
384378
return -EINVAL;
385379
}
386380

@@ -476,16 +470,13 @@ int intel_vgpu_decode_sprite_plane(struct intel_vgpu *vgpu,
476470
plane->drm_format = drm_format;
477471

478472
plane->base = vgpu_vreg_t(vgpu, SPRSURF(pipe)) & I915_GTT_PAGE_MASK;
479-
if (!intel_gvt_ggtt_validate_range(vgpu, plane->base, 0)) {
480-
gvt_vgpu_err("invalid gma address: %lx\n",
481-
(unsigned long)plane->base);
473+
if (!intel_gvt_ggtt_validate_range(vgpu, plane->base, 0))
482474
return -EINVAL;
483-
}
484475

485476
plane->base_gpa = intel_vgpu_gma_to_gpa(vgpu->gtt.ggtt_mm, plane->base);
486477
if (plane->base_gpa == INTEL_GVT_INVALID_ADDR) {
487-
gvt_vgpu_err("invalid gma address: %lx\n",
488-
(unsigned long)plane->base);
478+
gvt_vgpu_err("Translate sprite plane gma 0x%x to gpa fail\n",
479+
plane->base);
489480
return -EINVAL;
490481
}
491482

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

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,16 @@ static void ggtt_set_guest_entry(struct intel_vgpu_mm *mm,
530530
false, 0, mm->vgpu);
531531
}
532532

533+
static void ggtt_get_host_entry(struct intel_vgpu_mm *mm,
534+
struct intel_gvt_gtt_entry *entry, unsigned long index)
535+
{
536+
struct intel_gvt_gtt_pte_ops *pte_ops = mm->vgpu->gvt->gtt.pte_ops;
537+
538+
GEM_BUG_ON(mm->type != INTEL_GVT_MM_GGTT);
539+
540+
pte_ops->get_entry(NULL, entry, index, false, 0, mm->vgpu);
541+
}
542+
533543
static void ggtt_set_host_entry(struct intel_vgpu_mm *mm,
534544
struct intel_gvt_gtt_entry *entry, unsigned long index)
535545
{
@@ -1818,6 +1828,18 @@ int intel_vgpu_emulate_ggtt_mmio_read(struct intel_vgpu *vgpu, unsigned int off,
18181828
return ret;
18191829
}
18201830

1831+
static void ggtt_invalidate_pte(struct intel_vgpu *vgpu,
1832+
struct intel_gvt_gtt_entry *entry)
1833+
{
1834+
struct intel_gvt_gtt_pte_ops *pte_ops = vgpu->gvt->gtt.pte_ops;
1835+
unsigned long pfn;
1836+
1837+
pfn = pte_ops->get_pfn(entry);
1838+
if (pfn != vgpu->gvt->gtt.scratch_mfn)
1839+
intel_gvt_hypervisor_dma_unmap_guest_page(vgpu,
1840+
pfn << PAGE_SHIFT);
1841+
}
1842+
18211843
static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,
18221844
void *p_data, unsigned int bytes)
18231845
{
@@ -1844,10 +1866,10 @@ static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,
18441866

18451867
memcpy((void *)&e.val64 + (off & (info->gtt_entry_size - 1)), p_data,
18461868
bytes);
1847-
m = e;
18481869

18491870
if (ops->test_present(&e)) {
18501871
gfn = ops->get_pfn(&e);
1872+
m = e;
18511873

18521874
/* one PTE update may be issued in multiple writes and the
18531875
* first write may not construct a valid gfn
@@ -1868,8 +1890,12 @@ static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,
18681890
ops->set_pfn(&m, gvt->gtt.scratch_mfn);
18691891
} else
18701892
ops->set_pfn(&m, dma_addr >> PAGE_SHIFT);
1871-
} else
1893+
} else {
1894+
ggtt_get_host_entry(ggtt_mm, &m, g_gtt_index);
1895+
ggtt_invalidate_pte(vgpu, &m);
18721896
ops->set_pfn(&m, gvt->gtt.scratch_mfn);
1897+
ops->clear_present(&m);
1898+
}
18731899

18741900
out:
18751901
ggtt_set_host_entry(ggtt_mm, &m, g_gtt_index);
@@ -2030,7 +2056,7 @@ int intel_vgpu_init_gtt(struct intel_vgpu *vgpu)
20302056
return PTR_ERR(gtt->ggtt_mm);
20312057
}
20322058

2033-
intel_vgpu_reset_ggtt(vgpu);
2059+
intel_vgpu_reset_ggtt(vgpu, false);
20342060

20352061
return create_scratch_page_tree(vgpu);
20362062
}
@@ -2315,17 +2341,19 @@ void intel_vgpu_invalidate_ppgtt(struct intel_vgpu *vgpu)
23152341
/**
23162342
* intel_vgpu_reset_ggtt - reset the GGTT entry
23172343
* @vgpu: a vGPU
2344+
* @invalidate_old: invalidate old entries
23182345
*
23192346
* This function is called at the vGPU create stage
23202347
* to reset all the GGTT entries.
23212348
*
23222349
*/
2323-
void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu)
2350+
void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old)
23242351
{
23252352
struct intel_gvt *gvt = vgpu->gvt;
23262353
struct drm_i915_private *dev_priv = gvt->dev_priv;
23272354
struct intel_gvt_gtt_pte_ops *pte_ops = vgpu->gvt->gtt.pte_ops;
23282355
struct intel_gvt_gtt_entry entry = {.type = GTT_TYPE_GGTT_PTE};
2356+
struct intel_gvt_gtt_entry old_entry;
23292357
u32 index;
23302358
u32 num_entries;
23312359

@@ -2334,13 +2362,23 @@ void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu)
23342362

23352363
index = vgpu_aperture_gmadr_base(vgpu) >> PAGE_SHIFT;
23362364
num_entries = vgpu_aperture_sz(vgpu) >> PAGE_SHIFT;
2337-
while (num_entries--)
2365+
while (num_entries--) {
2366+
if (invalidate_old) {
2367+
ggtt_get_host_entry(vgpu->gtt.ggtt_mm, &old_entry, index);
2368+
ggtt_invalidate_pte(vgpu, &old_entry);
2369+
}
23382370
ggtt_set_host_entry(vgpu->gtt.ggtt_mm, &entry, index++);
2371+
}
23392372

23402373
index = vgpu_hidden_gmadr_base(vgpu) >> PAGE_SHIFT;
23412374
num_entries = vgpu_hidden_sz(vgpu) >> PAGE_SHIFT;
2342-
while (num_entries--)
2375+
while (num_entries--) {
2376+
if (invalidate_old) {
2377+
ggtt_get_host_entry(vgpu->gtt.ggtt_mm, &old_entry, index);
2378+
ggtt_invalidate_pte(vgpu, &old_entry);
2379+
}
23432380
ggtt_set_host_entry(vgpu->gtt.ggtt_mm, &entry, index++);
2381+
}
23442382

23452383
ggtt_invalidate(dev_priv);
23462384
}
@@ -2360,5 +2398,5 @@ void intel_vgpu_reset_gtt(struct intel_vgpu *vgpu)
23602398
* removing the shadow pages.
23612399
*/
23622400
intel_vgpu_destroy_all_ppgtt_mm(vgpu);
2363-
intel_vgpu_reset_ggtt(vgpu);
2401+
intel_vgpu_reset_ggtt(vgpu, true);
23642402
}

‎drivers/gpu/drm/i915/gvt/gtt.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ struct intel_vgpu_gtt {
193193

194194
extern int intel_vgpu_init_gtt(struct intel_vgpu *vgpu);
195195
extern void intel_vgpu_clean_gtt(struct intel_vgpu *vgpu);
196-
void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu);
196+
void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old);
197197
void intel_vgpu_invalidate_ppgtt(struct intel_vgpu *vgpu);
198198

199199
extern int intel_gvt_init_gtt(struct intel_gvt *gvt);

‎drivers/gpu/drm/i915/gvt/handlers.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,7 @@ static int handle_g2v_notification(struct intel_vgpu *vgpu, int notification)
11501150
switch (notification) {
11511151
case VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE:
11521152
root_entry_type = GTT_TYPE_PPGTT_ROOT_L3_ENTRY;
1153+
/* fall through */
11531154
case VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE:
11541155
mm = intel_vgpu_get_ppgtt_mm(vgpu, root_entry_type, pdps);
11551156
return PTR_ERR_OR_ZERO(mm);

‎drivers/gpu/drm/i915/gvt/kvmgt.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
13011301

13021302
}
13031303

1304-
return 0;
1304+
return -ENOTTY;
13051305
}
13061306

13071307
static ssize_t

‎drivers/gpu/drm/i915/i915_drv.c‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,30 +1102,32 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
11021102

11031103
ret = i915_ggtt_probe_hw(dev_priv);
11041104
if (ret)
1105-
return ret;
1105+
goto err_perf;
11061106

1107-
/* WARNING: Apparently we must kick fbdev drivers before vgacon,
1108-
* otherwise the vga fbdev driver falls over. */
1107+
/*
1108+
* WARNING: Apparently we must kick fbdev drivers before vgacon,
1109+
* otherwise the vga fbdev driver falls over.
1110+
*/
11091111
ret = i915_kick_out_firmware_fb(dev_priv);
11101112
if (ret) {
11111113
DRM_ERROR("failed to remove conflicting framebuffer drivers\n");
1112-
goto out_ggtt;
1114+
goto err_ggtt;
11131115
}
11141116

11151117
ret = i915_kick_out_vgacon(dev_priv);
11161118
if (ret) {
11171119
DRM_ERROR("failed to remove conflicting VGA console\n");
1118-
goto out_ggtt;
1120+
goto err_ggtt;
11191121
}
11201122

11211123
ret = i915_ggtt_init_hw(dev_priv);
11221124
if (ret)
1123-
return ret;
1125+
goto err_ggtt;
11241126

11251127
ret = i915_ggtt_enable_hw(dev_priv);
11261128
if (ret) {
11271129
DRM_ERROR("failed to enable GGTT\n");
1128-
goto out_ggtt;
1130+
goto err_ggtt;
11291131
}
11301132

11311133
pci_set_master(pdev);
@@ -1136,7 +1138,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
11361138
if (ret) {
11371139
DRM_ERROR("failed to set DMA mask\n");
11381140

1139-
goto out_ggtt;
1141+
goto err_ggtt;
11401142
}
11411143
}
11421144

@@ -1154,7 +1156,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
11541156
if (ret) {
11551157
DRM_ERROR("failed to set DMA mask\n");
11561158

1157-
goto out_ggtt;
1159+
goto err_ggtt;
11581160
}
11591161
}
11601162

@@ -1187,13 +1189,14 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
11871189

11881190
ret = intel_gvt_init(dev_priv);
11891191
if (ret)
1190-
goto out_ggtt;
1192+
goto err_ggtt;
11911193

11921194
return 0;
11931195

1194-
out_ggtt:
1196+
err_ggtt:
11951197
i915_ggtt_cleanup_hw(dev_priv);
1196-
1198+
err_perf:
1199+
i915_perf_fini(dev_priv);
11971200
return ret;
11981201
}
11991202

‎drivers/gpu/drm/i915/i915_gem_execbuffer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb)
728728

729729
err = radix_tree_insert(handles_vma, handle, vma);
730730
if (unlikely(err)) {
731-
kfree(lut);
731+
kmem_cache_free(eb->i915->luts, lut);
732732
goto err_obj;
733733
}
734734

0 commit comments

Comments
 (0)