History

Merge tag 'drm-intel-next-fixes-2021-06-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

The biggest fix is the restoration of mmap ioctl for gen12 integrated parts which lack was breaking ADL-P with media stack. Besides that a small selftest fix and a theoretical overflow on i915->pipe_to_crtc_mapping. Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 5 years ago

Commit 8a02ea42 parents 4bac159 c90c4c66 files · +76 −42Browse files

Unified · Split

6 files
  1. drivers/gpu/drm/i915/display/intel_display.c +3 −4
  2. drivers/gpu/drm/i915/display/intel_display_types.h +8 −0
  3. drivers/gpu/drm/i915/display/intel_vdsc.c +28 −12
  4. drivers/gpu/drm/i915/display/intel_vdsc.h +1 −0
  5. drivers/gpu/drm/i915/gem/i915_gem_mman.c +4 −3
  6. drivers/gpu/drm/i915/gt/selftest_execlists.c +32 −23
drivers/gpu/drm/i915/display/intel_display.c+3−4
@@ -9618,7 +9618,6 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state, · 9617 unmodified lines
9618 struct intel_crtc_state *old_crtc_state,9618 struct intel_crtc_state *old_crtc_state,
9619 struct intel_crtc_state *new_crtc_state)9619 struct intel_crtc_state *new_crtc_state)
9620{9620{
9621 struct drm_i915_private *dev_priv = to_i915(state->base.dev);
9622 struct intel_crtc_state *slave_crtc_state, *master_crtc_state;9621 struct intel_crtc_state *slave_crtc_state, *master_crtc_state;
9623 struct intel_crtc *slave, *master;9622 struct intel_crtc *slave, *master;
9624 9623
@@ -9634,15 +9633,15 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state, · 9 unmodified lines
9634 if (!new_crtc_state->bigjoiner)9633 if (!new_crtc_state->bigjoiner)
9635 return 0;9634 return 0;
9636 9635
9637 if (1 + crtc->pipe >= INTEL_NUM_PIPES(dev_priv)) {9636 slave = intel_dsc_get_bigjoiner_secondary(crtc);
9637 if (!slave) {
9638 DRM_DEBUG_KMS("[CRTC:%d:%s] Big joiner configuration requires "9638 DRM_DEBUG_KMS("[CRTC:%d:%s] Big joiner configuration requires "
9639 "CRTC + 1 to be used, doesn't exist\n",9639 "CRTC + 1 to be used, doesn't exist\n",
9640 crtc->base.base.id, crtc->base.name);9640 crtc->base.base.id, crtc->base.name);
9641 return -EINVAL;9641 return -EINVAL;
9642 }9642 }
9643 9643
9644 slave = new_crtc_state->bigjoiner_linked_crtc =9644 new_crtc_state->bigjoiner_linked_crtc = slave;
9645 intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1);
9646 slave_crtc_state = intel_atomic_get_crtc_state(&state->base, slave);9645 slave_crtc_state = intel_atomic_get_crtc_state(&state->base, slave);
9647 master = crtc;9646 master = crtc;
9648 if (IS_ERR(slave_crtc_state))9647 if (IS_ERR(slave_crtc_state))
drivers/gpu/drm/i915/display/intel_display_types.h+8−0
@@ -1723,6 +1723,14 @@ vlv_pipe_to_channel(enum pipe pipe) · 1722 unmodified lines
1723 }1723 }
1724}1724}
1725 1725
1726static inline bool intel_pipe_valid(struct drm_i915_private *i915, enum pipe pipe)
1727{
1728 return (pipe >= 0 &&
1729 pipe < ARRAY_SIZE(i915->pipe_to_crtc_mapping) &&
1730 INTEL_INFO(i915)->pipe_mask & BIT(pipe) &&
1731 i915->pipe_to_crtc_mapping[pipe]);
1732}
1733
1726static inline struct intel_crtc *1734static inline struct intel_crtc *
1727intel_get_first_crtc(struct drm_i915_private *dev_priv)1735intel_get_first_crtc(struct drm_i915_private *dev_priv)
1728{1736{
drivers/gpu/drm/i915/display/intel_vdsc.c+28−12
@@ -1106,6 +1106,27 @@ static i915_reg_t dss_ctl2_reg(const struct intel_crtc_state *crtc_state) · 1105 unmodified lines
1106 return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL2(pipe) : DSS_CTL2;1106 return is_pipe_dsc(crtc_state) ? ICL_PIPE_DSS_CTL2(pipe) : DSS_CTL2;
1107}1107}
1108 1108
1109static struct intel_crtc *
1110_get_crtc_for_pipe(struct drm_i915_private *i915, enum pipe pipe)
1111{
1112 if (!intel_pipe_valid(i915, pipe))
1113 return NULL;
1114
1115 return intel_get_crtc_for_pipe(i915, pipe);
1116}
1117
1118struct intel_crtc *
1119intel_dsc_get_bigjoiner_secondary(const struct intel_crtc *primary_crtc)
1120{
1121 return _get_crtc_for_pipe(to_i915(primary_crtc->base.dev), primary_crtc->pipe + 1);
1122}
1123
1124static struct intel_crtc *
1125intel_dsc_get_bigjoiner_primary(const struct intel_crtc *secondary_crtc)
1126{
1127 return _get_crtc_for_pipe(to_i915(secondary_crtc->base.dev), secondary_crtc->pipe - 1);
1128}
1129
1109void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state)1130void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state)
1110{1131{
1111 struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);1132 struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
@@ -1178,15 +1199,13 @@ void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state) · 66 unmodified lines
1178 dss_ctl1 = intel_de_read(dev_priv, dss_ctl1_reg(crtc_state));1199 dss_ctl1 = intel_de_read(dev_priv, dss_ctl1_reg(crtc_state));
1179 if (dss_ctl1 & UNCOMPRESSED_JOINER_MASTER) {1200 if (dss_ctl1 & UNCOMPRESSED_JOINER_MASTER) {
1180 crtc_state->bigjoiner = true;1201 crtc_state->bigjoiner = true;
1181 if (!WARN_ON(INTEL_NUM_PIPES(dev_priv) == crtc->pipe + 1))1202 crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_secondary(crtc);
1182 crtc_state->bigjoiner_linked_crtc =1203 drm_WARN_ON(&dev_priv->drm, !crtc_state->bigjoiner_linked_crtc);
1183 intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1);
1184 } else if (dss_ctl1 & UNCOMPRESSED_JOINER_SLAVE) {1204 } else if (dss_ctl1 & UNCOMPRESSED_JOINER_SLAVE) {
1185 crtc_state->bigjoiner = true;1205 crtc_state->bigjoiner = true;
1186 crtc_state->bigjoiner_slave = true;1206 crtc_state->bigjoiner_slave = true;
1187 if (!WARN_ON(crtc->pipe == PIPE_A))1207 crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_primary(crtc);
1188 crtc_state->bigjoiner_linked_crtc =1208 drm_WARN_ON(&dev_priv->drm, !crtc_state->bigjoiner_linked_crtc);
1189 intel_get_crtc_for_pipe(dev_priv, crtc->pipe - 1);
1190 }1209 }
1191}1210}
1192 1211
@@ -1224,14 +1243,11 @@ void intel_dsc_get_config(struct intel_crtc_state *crtc_state) · 31 unmodified lines
1224 1243
1225 if (!(dss_ctl1 & MASTER_BIG_JOINER_ENABLE)) {1244 if (!(dss_ctl1 & MASTER_BIG_JOINER_ENABLE)) {
1226 crtc_state->bigjoiner_slave = true;1245 crtc_state->bigjoiner_slave = true;
1227 if (!WARN_ON(crtc->pipe == PIPE_A))1246 crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_primary(crtc);
1228 crtc_state->bigjoiner_linked_crtc =
1229 intel_get_crtc_for_pipe(dev_priv, crtc->pipe - 1);
1230 } else {1247 } else {
1231 if (!WARN_ON(INTEL_NUM_PIPES(dev_priv) == crtc->pipe + 1))1248 crtc_state->bigjoiner_linked_crtc = intel_dsc_get_bigjoiner_secondary(crtc);
1232 crtc_state->bigjoiner_linked_crtc =
1233 intel_get_crtc_for_pipe(dev_priv, crtc->pipe + 1);
1234 }1249 }
1250 drm_WARN_ON(&dev_priv->drm, !crtc_state->bigjoiner_linked_crtc);
1235 }1251 }
1236 1252
1237 /* FIXME: add more state readout as needed */1253 /* FIXME: add more state readout as needed */
drivers/gpu/drm/i915/display/intel_vdsc.h+1−0
@@ -22,5 +22,6 @@ void intel_uncompressed_joiner_get_config(struct intel_crtc_state *crtc_state); · 21 unmodified lines
22void intel_dsc_get_config(struct intel_crtc_state *crtc_state);22void intel_dsc_get_config(struct intel_crtc_state *crtc_state);
23enum intel_display_power_domain23enum intel_display_power_domain
24intel_dsc_power_domain(const struct intel_crtc_state *crtc_state);24intel_dsc_power_domain(const struct intel_crtc_state *crtc_state);
25struct intel_crtc *intel_dsc_get_bigjoiner_secondary(const struct intel_crtc *primary_crtc);
25 26
26#endif /* __INTEL_VDSC_H__ */27#endif /* __INTEL_VDSC_H__ */
drivers/gpu/drm/i915/gem/i915_gem_mman.c+4−3
@@ -61,10 +61,11 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, · 60 unmodified lines
61 struct drm_i915_gem_object *obj;61 struct drm_i915_gem_object *obj;
62 unsigned long addr;62 unsigned long addr;
63 63
64 /* mmap ioctl is disallowed for all platforms after TGL-LP. This also64 /*
65 * covers all platforms with local memory.65 * mmap ioctl is disallowed for all discrete platforms,
66 * and for all platforms with GRAPHICS_VER > 12.
66 */67 */
67 if (GRAPHICS_VER(i915) >= 12 && !IS_TIGERLAKE(i915))68 if (IS_DGFX(i915) || GRAPHICS_VER(i915) > 12)
68 return -EOPNOTSUPP;69 return -EOPNOTSUPP;
69 70
70 if (args->flags & ~(I915_MMAP_WC))71 if (args->flags & ~(I915_MMAP_WC))
drivers/gpu/drm/i915/gt/selftest_execlists.c+32−23
@@ -551,6 +551,32 @@ static int live_pin_rewind(void *arg) · 550 unmodified lines
551 return err;551 return err;
552}552}
553 553
554static int engine_lock_reset_tasklet(struct intel_engine_cs *engine)
555{
556 tasklet_disable(&engine->execlists.tasklet);
557 local_bh_disable();
558
559 if (test_and_set_bit(I915_RESET_ENGINE + engine->id,
560 &engine->gt->reset.flags)) {
561 local_bh_enable();
562 tasklet_enable(&engine->execlists.tasklet);
563
564 intel_gt_set_wedged(engine->gt);
565 return -EBUSY;
566 }
567
568 return 0;
569}
570
571static void engine_unlock_reset_tasklet(struct intel_engine_cs *engine)
572{
573 clear_and_wake_up_bit(I915_RESET_ENGINE + engine->id,
574 &engine->gt->reset.flags);
575
576 local_bh_enable();
577 tasklet_enable(&engine->execlists.tasklet);
578}
579
554static int live_hold_reset(void *arg)580static int live_hold_reset(void *arg)
555{581{
556 struct intel_gt *gt = arg;582 struct intel_gt *gt = arg;
@@ -598,15 +624,9 @@ static int live_hold_reset(void *arg) · 41 unmodified lines
598 624
599 /* We have our request executing, now remove it and reset */625 /* We have our request executing, now remove it and reset */
600 626
601 local_bh_disable();627 err = engine_lock_reset_tasklet(engine);
602 if (test_and_set_bit(I915_RESET_ENGINE + id,628 if (err)
603 &gt->reset.flags)) {
604 local_bh_enable();
605 intel_gt_set_wedged(gt);
606 err = -EBUSY;
607 goto out;629 goto out;
608 }
609 tasklet_disable(&engine->execlists.tasklet);
610 630
611 engine->execlists.tasklet.callback(&engine->execlists.tasklet);631 engine->execlists.tasklet.callback(&engine->execlists.tasklet);
612 GEM_BUG_ON(execlists_active(&engine->execlists) != rq);632 GEM_BUG_ON(execlists_active(&engine->execlists) != rq);
@@ -618,10 +638,7 @@ static int live_hold_reset(void *arg) · 5 unmodified lines
618 __intel_engine_reset_bh(engine, NULL);638 __intel_engine_reset_bh(engine, NULL);
619 GEM_BUG_ON(rq->fence.error != -EIO);639 GEM_BUG_ON(rq->fence.error != -EIO);
620 640
621 tasklet_enable(&engine->execlists.tasklet);641 engine_unlock_reset_tasklet(engine);
622 clear_and_wake_up_bit(I915_RESET_ENGINE + id,
623 &gt->reset.flags);
624 local_bh_enable();
625 642
626 /* Check that we do not resubmit the held request */643 /* Check that we do not resubmit the held request */
627 if (!i915_request_wait(rq, 0, HZ / 5)) {644 if (!i915_request_wait(rq, 0, HZ / 5)) {
@@ -4585,15 +4602,9 @@ static int reset_virtual_engine(struct intel_gt *gt, · 3957 unmodified lines
4585 GEM_BUG_ON(engine == ve->engine);4602 GEM_BUG_ON(engine == ve->engine);
4586 4603
4587 /* Take ownership of the reset and tasklet */4604 /* Take ownership of the reset and tasklet */
4588 local_bh_disable();4605 err = engine_lock_reset_tasklet(engine);
4589 if (test_and_set_bit(I915_RESET_ENGINE + engine->id,4606 if (err)
4590 &gt->reset.flags)) {
4591 local_bh_enable();
4592 intel_gt_set_wedged(gt);
4593 err = -EBUSY;
4594 goto out_heartbeat;4607 goto out_heartbeat;
4595 }
4596 tasklet_disable(&engine->execlists.tasklet);
4597 4608
4598 engine->execlists.tasklet.callback(&engine->execlists.tasklet);4609 engine->execlists.tasklet.callback(&engine->execlists.tasklet);
4599 GEM_BUG_ON(execlists_active(&engine->execlists) != rq);4610 GEM_BUG_ON(execlists_active(&engine->execlists) != rq);
@@ -4612,9 +4623,7 @@ static int reset_virtual_engine(struct intel_gt *gt, · 12 unmodified lines
4612 GEM_BUG_ON(rq->fence.error != -EIO);4623 GEM_BUG_ON(rq->fence.error != -EIO);
4613 4624
4614 /* Release our grasp on the engine, letting CS flow again */4625 /* Release our grasp on the engine, letting CS flow again */
4615 tasklet_enable(&engine->execlists.tasklet);4626 engine_unlock_reset_tasklet(engine);
4616 clear_and_wake_up_bit(I915_RESET_ENGINE + engine->id, &gt->reset.flags);
4617 local_bh_enable();
4618 4627
4619 /* Check that we do not resubmit the held request */4628 /* Check that we do not resubmit the held request */
4620 i915_request_get(rq);4629 i915_request_get(rq);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t