Skip to content

Commit 88c0871

Browse files
airliedairlied
committed
Merge tag 'drm-intel-fixes-2016-06-30' of git://anongit.freedesktop.org/drm-intel into drm-fixes
here's a batch of i915 fixes for 4.7. * tag 'drm-intel-fixes-2016-06-30' of git://anongit.freedesktop.org/drm-intel: drm/i915: Fix missing unlock on error in i915_ppgtt_info() drm/i915: Removing PCI IDs that are no longer listed as Kabylake. drm/i915: Add more Kabylake PCI IDs. drm/i915: Avoid early timeout during AUX transfers drm/i915/hsw: Avoid early timeout during LCPLL disable/restore drm/i915/lpt: Avoid early timeout during FDI PHY reset drm/i915/bxt: Avoid early timeout during PLL enable drm/i915: Refresh cached DP port register value on resume
2 parents 40793e8 + cab1032 commit 88c0871

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,16 +2365,16 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
23652365
task = get_pid_task(file->pid, PIDTYPE_PID);
23662366
if (!task) {
23672367
ret = -ESRCH;
2368-
goto out_put;
2368+
goto out_unlock;
23692369
}
23702370
seq_printf(m, "\nproc: %s\n", task->comm);
23712371
put_task_struct(task);
23722372
idr_for_each(&file_priv->context_idr, per_file_ctx,
23732373
(void *)(unsigned long)m);
23742374
}
2375+
out_unlock:
23752376
mutex_unlock(&dev->filelist_mutex);
23762377

2377-
out_put:
23782378
intel_runtime_pm_put(dev_priv);
23792379
mutex_unlock(&dev->struct_mutex);
23802380

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8447,16 +8447,16 @@ static void lpt_reset_fdi_mphy(struct drm_i915_private *dev_priv)
84478447
tmp |= FDI_MPHY_IOSFSB_RESET_CTL;
84488448
I915_WRITE(SOUTH_CHICKEN2, tmp);
84498449

8450-
if (wait_for_atomic_us(I915_READ(SOUTH_CHICKEN2) &
8451-
FDI_MPHY_IOSFSB_RESET_STATUS, 100))
8450+
if (wait_for_us(I915_READ(SOUTH_CHICKEN2) &
8451+
FDI_MPHY_IOSFSB_RESET_STATUS, 100))
84528452
DRM_ERROR("FDI mPHY reset assert timeout\n");
84538453

84548454
tmp = I915_READ(SOUTH_CHICKEN2);
84558455
tmp &= ~FDI_MPHY_IOSFSB_RESET_CTL;
84568456
I915_WRITE(SOUTH_CHICKEN2, tmp);
84578457

8458-
if (wait_for_atomic_us((I915_READ(SOUTH_CHICKEN2) &
8459-
FDI_MPHY_IOSFSB_RESET_STATUS) == 0, 100))
8458+
if (wait_for_us((I915_READ(SOUTH_CHICKEN2) &
8459+
FDI_MPHY_IOSFSB_RESET_STATUS) == 0, 100))
84608460
DRM_ERROR("FDI mPHY reset de-assert timeout\n");
84618461
}
84628462

@@ -9440,8 +9440,8 @@ static void hsw_disable_lcpll(struct drm_i915_private *dev_priv,
94409440
val |= LCPLL_CD_SOURCE_FCLK;
94419441
I915_WRITE(LCPLL_CTL, val);
94429442

9443-
if (wait_for_atomic_us(I915_READ(LCPLL_CTL) &
9444-
LCPLL_CD_SOURCE_FCLK_DONE, 1))
9443+
if (wait_for_us(I915_READ(LCPLL_CTL) &
9444+
LCPLL_CD_SOURCE_FCLK_DONE, 1))
94459445
DRM_ERROR("Switching to FCLK failed\n");
94469446

94479447
val = I915_READ(LCPLL_CTL);
@@ -9514,8 +9514,8 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)
95149514
val &= ~LCPLL_CD_SOURCE_FCLK;
95159515
I915_WRITE(LCPLL_CTL, val);
95169516

9517-
if (wait_for_atomic_us((I915_READ(LCPLL_CTL) &
9518-
LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
9517+
if (wait_for_us((I915_READ(LCPLL_CTL) &
9518+
LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
95199519
DRM_ERROR("Switching back to LCPLL failed\n");
95209520
}
95219521

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq)
663663
done = wait_event_timeout(dev_priv->gmbus_wait_queue, C,
664664
msecs_to_jiffies_timeout(10));
665665
else
666-
done = wait_for_atomic(C, 10) == 0;
666+
done = wait_for(C, 10) == 0;
667667
if (!done)
668668
DRM_ERROR("dp aux hw did not signal timeout (has irq: %i)!\n",
669669
has_aux_irq);
@@ -4899,13 +4899,15 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp)
48994899

49004900
void intel_dp_encoder_reset(struct drm_encoder *encoder)
49014901
{
4902-
struct intel_dp *intel_dp;
4902+
struct drm_i915_private *dev_priv = to_i915(encoder->dev);
4903+
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
4904+
4905+
if (!HAS_DDI(dev_priv))
4906+
intel_dp->DP = I915_READ(intel_dp->output_reg);
49034907

49044908
if (to_intel_encoder(encoder)->type != INTEL_OUTPUT_EDP)
49054909
return;
49064910

4907-
intel_dp = enc_to_intel_dp(encoder);
4908-
49094911
pps_lock(intel_dp);
49104912

49114913
/*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,8 +1377,8 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *dev_priv,
13771377
I915_WRITE(BXT_PORT_PLL_ENABLE(port), temp);
13781378
POSTING_READ(BXT_PORT_PLL_ENABLE(port));
13791379

1380-
if (wait_for_atomic_us((I915_READ(BXT_PORT_PLL_ENABLE(port)) &
1381-
PORT_PLL_LOCK), 200))
1380+
if (wait_for_us((I915_READ(BXT_PORT_PLL_ENABLE(port)) & PORT_PLL_LOCK),
1381+
200))
13821382
DRM_ERROR("PLL %d not locked\n", port);
13831383

13841384
/*

‎include/drm/i915_pciids.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@
309309
INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
310310
INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
311311
INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
312+
INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
312313
INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
313314
INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
314315

@@ -322,15 +323,12 @@
322323
INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
323324

324325
#define INTEL_KBL_GT3_IDS(info) \
326+
INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \
325327
INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
326-
INTEL_VGA_DEVICE(0x592B, info), /* Halo GT3 */ \
327-
INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */
328+
INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */
328329

329330
#define INTEL_KBL_GT4_IDS(info) \
330-
INTEL_VGA_DEVICE(0x5932, info), /* DT GT4 */ \
331-
INTEL_VGA_DEVICE(0x593B, info), /* Halo GT4 */ \
332-
INTEL_VGA_DEVICE(0x593A, info), /* SRV GT4 */ \
333-
INTEL_VGA_DEVICE(0x593D, info) /* WKS GT4 */
331+
INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
334332

335333
#define INTEL_KBL_IDS(info) \
336334
INTEL_KBL_GT1_IDS(info), \

0 commit comments

Comments
 (0)