Skip to content

Commit 5016bd2

Browse files
airliedairlied
committed
Merge tag 'drm-intel-fixes-2019-02-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
drm/i915 fixes for v5.0-rc7: - combo phy programming fix - opregion version check fix for VBT RVDA lookup - gem mmap ioctl race fix - fbdev hpd during suspend fix - array size bounds check fix in pmu Signed-off-by: Dave Airlie <airlied@redhat.com> From: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/877ee3504b.fsf@intel.com
2 parents d586d57 + 16eb0f3 commit 5016bd2

File tree

10 files changed

+208
-178
lines changed

10 files changed

+208
-178
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1824,6 +1824,16 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
18241824
return 0;
18251825
}
18261826

1827+
static inline bool
1828+
__vma_matches(struct vm_area_struct *vma, struct file *filp,
1829+
unsigned long addr, unsigned long size)
1830+
{
1831+
if (vma->vm_file != filp)
1832+
return false;
1833+
1834+
return vma->vm_start == addr && (vma->vm_end - vma->vm_start) == size;
1835+
}
1836+
18271837
/**
18281838
* i915_gem_mmap_ioctl - Maps the contents of an object, returning the address
18291839
* it is mapped to.
@@ -1882,7 +1892,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
18821892
return -EINTR;
18831893
}
18841894
vma = find_vma(mm, addr);
1885-
if (vma)
1895+
if (vma && __vma_matches(vma, obj->base.filp, addr, args->size))
18861896
vma->vm_page_prot =
18871897
pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
18881898
else

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,8 @@ static void i915_pmu_enable(struct perf_event *event)
594594
* Update the bitmask of enabled events and increment
595595
* the event reference counter.
596596
*/
597-
GEM_BUG_ON(bit >= I915_PMU_MASK_BITS);
597+
BUILD_BUG_ON(ARRAY_SIZE(i915->pmu.enable_count) != I915_PMU_MASK_BITS);
598+
GEM_BUG_ON(bit >= ARRAY_SIZE(i915->pmu.enable_count));
598599
GEM_BUG_ON(i915->pmu.enable_count[bit] == ~0);
599600
i915->pmu.enable |= BIT_ULL(bit);
600601
i915->pmu.enable_count[bit]++;
@@ -615,11 +616,16 @@ static void i915_pmu_enable(struct perf_event *event)
615616
engine = intel_engine_lookup_user(i915,
616617
engine_event_class(event),
617618
engine_event_instance(event));
618-
GEM_BUG_ON(!engine);
619-
engine->pmu.enable |= BIT(sample);
620619

621-
GEM_BUG_ON(sample >= I915_PMU_SAMPLE_BITS);
620+
BUILD_BUG_ON(ARRAY_SIZE(engine->pmu.enable_count) !=
621+
I915_ENGINE_SAMPLE_COUNT);
622+
BUILD_BUG_ON(ARRAY_SIZE(engine->pmu.sample) !=
623+
I915_ENGINE_SAMPLE_COUNT);
624+
GEM_BUG_ON(sample >= ARRAY_SIZE(engine->pmu.enable_count));
625+
GEM_BUG_ON(sample >= ARRAY_SIZE(engine->pmu.sample));
622626
GEM_BUG_ON(engine->pmu.enable_count[sample] == ~0);
627+
628+
engine->pmu.enable |= BIT(sample);
623629
engine->pmu.enable_count[sample]++;
624630
}
625631

@@ -649,9 +655,11 @@ static void i915_pmu_disable(struct perf_event *event)
649655
engine = intel_engine_lookup_user(i915,
650656
engine_event_class(event),
651657
engine_event_instance(event));
652-
GEM_BUG_ON(!engine);
653-
GEM_BUG_ON(sample >= I915_PMU_SAMPLE_BITS);
658+
659+
GEM_BUG_ON(sample >= ARRAY_SIZE(engine->pmu.enable_count));
660+
GEM_BUG_ON(sample >= ARRAY_SIZE(engine->pmu.sample));
654661
GEM_BUG_ON(engine->pmu.enable_count[sample] == 0);
662+
655663
/*
656664
* Decrement the reference count and clear the enabled
657665
* bitmask when the last listener on an event goes away.
@@ -660,7 +668,7 @@ static void i915_pmu_disable(struct perf_event *event)
660668
engine->pmu.enable &= ~BIT(sample);
661669
}
662670

663-
GEM_BUG_ON(bit >= I915_PMU_MASK_BITS);
671+
GEM_BUG_ON(bit >= ARRAY_SIZE(i915->pmu.enable_count));
664672
GEM_BUG_ON(i915->pmu.enable_count[bit] == 0);
665673
/*
666674
* Decrement the reference count and clear the enabled

‎drivers/gpu/drm/i915/i915_pmu.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ enum {
3131
((1 << I915_PMU_SAMPLE_BITS) + \
3232
(I915_PMU_LAST + 1 - __I915_PMU_OTHER(0)))
3333

34+
#define I915_ENGINE_SAMPLE_COUNT (I915_SAMPLE_SEMA + 1)
35+
3436
struct i915_pmu_sample {
3537
u64 cur;
3638
};

‎drivers/gpu/drm/i915/i915_reg.h

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,15 +1790,15 @@ enum i915_power_well_id {
17901790
#define _CNL_PORT_TX_C_LN0_OFFSET 0x162C40
17911791
#define _CNL_PORT_TX_D_LN0_OFFSET 0x162E40
17921792
#define _CNL_PORT_TX_F_LN0_OFFSET 0x162840
1793-
#define _CNL_PORT_TX_DW_GRP(port, dw) (_PICK((port), \
1793+
#define _CNL_PORT_TX_DW_GRP(dw, port) (_PICK((port), \
17941794
_CNL_PORT_TX_AE_GRP_OFFSET, \
17951795
_CNL_PORT_TX_B_GRP_OFFSET, \
17961796
_CNL_PORT_TX_B_GRP_OFFSET, \
17971797
_CNL_PORT_TX_D_GRP_OFFSET, \
17981798
_CNL_PORT_TX_AE_GRP_OFFSET, \
17991799
_CNL_PORT_TX_F_GRP_OFFSET) + \
18001800
4 * (dw))
1801-
#define _CNL_PORT_TX_DW_LN0(port, dw) (_PICK((port), \
1801+
#define _CNL_PORT_TX_DW_LN0(dw, port) (_PICK((port), \
18021802
_CNL_PORT_TX_AE_LN0_OFFSET, \
18031803
_CNL_PORT_TX_B_LN0_OFFSET, \
18041804
_CNL_PORT_TX_B_LN0_OFFSET, \
@@ -1834,9 +1834,9 @@ enum i915_power_well_id {
18341834

18351835
#define _CNL_PORT_TX_DW4_LN0_AE 0x162450
18361836
#define _CNL_PORT_TX_DW4_LN1_AE 0x1624D0
1837-
#define CNL_PORT_TX_DW4_GRP(port) _MMIO(_CNL_PORT_TX_DW_GRP((port), 4))
1838-
#define CNL_PORT_TX_DW4_LN0(port) _MMIO(_CNL_PORT_TX_DW_LN0((port), 4))
1839-
#define CNL_PORT_TX_DW4_LN(port, ln) _MMIO(_CNL_PORT_TX_DW_LN0((port), 4) + \
1837+
#define CNL_PORT_TX_DW4_GRP(port) _MMIO(_CNL_PORT_TX_DW_GRP(4, (port)))
1838+
#define CNL_PORT_TX_DW4_LN0(port) _MMIO(_CNL_PORT_TX_DW_LN0(4, (port)))
1839+
#define CNL_PORT_TX_DW4_LN(port, ln) _MMIO(_CNL_PORT_TX_DW_LN0(4, (port)) + \
18401840
((ln) * (_CNL_PORT_TX_DW4_LN1_AE - \
18411841
_CNL_PORT_TX_DW4_LN0_AE)))
18421842
#define ICL_PORT_TX_DW4_AUX(port) _MMIO(_ICL_PORT_TX_DW_AUX(4, port))
@@ -1864,8 +1864,12 @@ enum i915_power_well_id {
18641864
#define RTERM_SELECT(x) ((x) << 3)
18651865
#define RTERM_SELECT_MASK (0x7 << 3)
18661866

1867-
#define CNL_PORT_TX_DW7_GRP(port) _MMIO(_CNL_PORT_TX_DW_GRP((port), 7))
1868-
#define CNL_PORT_TX_DW7_LN0(port) _MMIO(_CNL_PORT_TX_DW_LN0((port), 7))
1867+
#define CNL_PORT_TX_DW7_GRP(port) _MMIO(_CNL_PORT_TX_DW_GRP(7, (port)))
1868+
#define CNL_PORT_TX_DW7_LN0(port) _MMIO(_CNL_PORT_TX_DW_LN0(7, (port)))
1869+
#define ICL_PORT_TX_DW7_AUX(port) _MMIO(_ICL_PORT_TX_DW_AUX(7, port))
1870+
#define ICL_PORT_TX_DW7_GRP(port) _MMIO(_ICL_PORT_TX_DW_GRP(7, port))
1871+
#define ICL_PORT_TX_DW7_LN0(port) _MMIO(_ICL_PORT_TX_DW_LN(7, 0, port))
1872+
#define ICL_PORT_TX_DW7_LN(port, ln) _MMIO(_ICL_PORT_TX_DW_LN(7, ln, port))
18691873
#define N_SCALAR(x) ((x) << 24)
18701874
#define N_SCALAR_MASK (0x7F << 24)
18711875

0 commit comments

Comments
 (0)