Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
forked fromtorvalds/linux

Commit8c2d689

Browse files
committed
Merge tag 'drm-intel-fixes-2018-03-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
One fix for DP MST and one fix for GPU reset on hang check.* tag 'drm-intel-fixes-2018-03-21' of git://anongit.freedesktop.org/drm/drm-intel: drm/i915: Specify which engines to reset following semaphore/event lockups drm/i915/dp: Write to SET_POWER dpcd to enable MST hub.
2 parents096c49e +3a088dd commit8c2d689

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2175,8 +2175,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
21752175
intel_prepare_dp_ddi_buffers(encoder,crtc_state);
21762176

21772177
intel_ddi_init_dp_buf_reg(encoder);
2178-
if (!is_mst)
2179-
intel_dp_sink_dpms(intel_dp,DRM_MODE_DPMS_ON);
2178+
intel_dp_sink_dpms(intel_dp,DRM_MODE_DPMS_ON);
21802179
intel_dp_start_link_train(intel_dp);
21812180
if (port!=PORT_A||INTEL_GEN(dev_priv) >=9)
21822181
intel_dp_stop_link_train(intel_dp);
@@ -2274,14 +2273,12 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,
22742273
structdrm_i915_private*dev_priv=to_i915(encoder->base.dev);
22752274
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);
22762275
structintel_dp*intel_dp=&dig_port->dp;
2277-
boolis_mst=intel_crtc_has_type(old_crtc_state,INTEL_OUTPUT_DP_MST);
22782276

22792277
/*
22802278
* Power down sink before disabling the port, otherwise we end
22812279
* up getting interrupts from the sink on detecting link loss.
22822280
*/
2283-
if (!is_mst)
2284-
intel_dp_sink_dpms(intel_dp,DRM_MODE_DPMS_OFF);
2281+
intel_dp_sink_dpms(intel_dp,DRM_MODE_DPMS_OFF);
22852282

22862283
intel_disable_ddi_buf(encoder);
22872284

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd)
246246
*/
247247
tmp=I915_READ_CTL(engine);
248248
if (tmp&RING_WAIT) {
249-
i915_handle_error(dev_priv,0,
249+
i915_handle_error(dev_priv,BIT(engine->id),
250250
"Kicking stuck wait on %s",
251251
engine->name);
252252
I915_WRITE_CTL(engine,tmp);
@@ -258,7 +258,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd)
258258
default:
259259
returnENGINE_DEAD;
260260
case1:
261-
i915_handle_error(dev_priv,0,
261+
i915_handle_error(dev_priv,ALL_ENGINES,
262262
"Kicking stuck semaphore on %s",
263263
engine->name);
264264
I915_WRITE_CTL(engine,tmp);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp