Skip to content

Commit 101a6fd

Browse files
torvaldstorvalds
committed
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "One intel fix, one rockchip fix, and a bunch of radeon fixes for some regressions from audio rework and vm stability" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/i915/chv: Implement WaDisableShadowRegForCpd drm/radeon: fix userptr return value checking (v2) drm/radeon: check new address before removing old one drm/radeon: reset BOs address after clearing it. drm/radeon: fix lockup when BOs aren't part of the VM on release drm/radeon: add SI DPM quirk for Sapphire R9 270 Dual-X 2G GDDR5 drm/radeon: adjust pll when audio is not enabled drm/radeon: only enable audio streams if the monitor supports it drm/radeon: only mark audio as connected if the monitor supports it (v3) drm/radeon/audio: don't enable packets until the end drm/radeon: drop dce6_dp_enable drm/radeon: fix ordering of AVI packet setup drm/radeon: Use drm_calloc_ab for CS relocs drm/rockchip: fix error check when getting irq MAINTAINERS: add entry for Rockchip drm drivers
2 parents 61f06db + 71aee81 commit 101a6fd

15 files changed

+117
-94
lines changed

‎MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3413,6 +3413,13 @@ F: drivers/gpu/drm/rcar-du/
34133413
F: drivers/gpu/drm/shmobile/
34143414
F: include/linux/platform_data/shmob_drm.h
34153415

3416+
DRM DRIVERS FOR ROCKCHIP
3417+
M: Mark Yao <mark.yao@rock-chips.com>
3418+
L: dri-devel@lists.freedesktop.org
3419+
S: Maintained
3420+
F: drivers/gpu/drm/rockchip/
3421+
F: Documentation/devicetree/bindings/video/rockchip*
3422+
34163423
DSBR100 USB FM RADIO DRIVER
34173424
M: Alexey Klimov <klimov.linux@gmail.com>
34183425
L: linux-media@vger.kernel.org

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6074,6 +6074,8 @@ enum skl_disp_power_wells {
60746074
#define GTFIFOCTL 0x120008
60756075
#define GT_FIFO_FREE_ENTRIES_MASK 0x7f
60766076
#define GT_FIFO_NUM_RESERVED_ENTRIES 20
6077+
#define GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL (1 << 12)
6078+
#define GT_FIFO_CTL_RC6_POLICY_STALL (1 << 11)
60776079

60786080
#define HSW_IDICR 0x9008
60796081
#define IDIHASHMSK(x) (((x) & 0x3f) << 16)

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,14 @@ static void __intel_uncore_early_sanitize(struct drm_device *dev,
360360
__raw_i915_write32(dev_priv, GTFIFODBG,
361361
__raw_i915_read32(dev_priv, GTFIFODBG));
362362

363+
/* WaDisableShadowRegForCpd:chv */
364+
if (IS_CHERRYVIEW(dev)) {
365+
__raw_i915_write32(dev_priv, GTFIFOCTL,
366+
__raw_i915_read32(dev_priv, GTFIFOCTL) |
367+
GT_FIFO_CTL_BLOCK_ALL_POLICY_STALL |
368+
GT_FIFO_CTL_RC6_POLICY_STALL);
369+
}
370+
363371
intel_uncore_forcewake_reset(dev, restore_forcewake);
364372
}
365373

‎drivers/gpu/drm/radeon/atombios_crtc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
580580
else
581581
radeon_crtc->pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;
582582

583+
/* if there is no audio, set MINM_OVER_MAXP */
584+
if (!drm_detect_monitor_audio(radeon_connector_edid(connector)))
585+
radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;
583586
if (rdev->family < CHIP_RV770)
584587
radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;
585588
/* use frac fb div on APUs */

‎drivers/gpu/drm/radeon/atombios_encoders.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,17 +1761,15 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode)
17611761
struct drm_device *dev = encoder->dev;
17621762
struct radeon_device *rdev = dev->dev_private;
17631763
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
1764-
struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
17651764
int encoder_mode = atombios_get_encoder_mode(encoder);
17661765

17671766
DRM_DEBUG_KMS("encoder dpms %d to mode %d, devices %08x, active_devices %08x\n",
17681767
radeon_encoder->encoder_id, mode, radeon_encoder->devices,
17691768
radeon_encoder->active_device);
17701769

1771-
if (connector && (radeon_audio != 0) &&
1770+
if ((radeon_audio != 0) &&
17721771
((encoder_mode == ATOM_ENCODER_MODE_HDMI) ||
1773-
(ENCODER_MODE_IS_DP(encoder_mode) &&
1774-
drm_detect_monitor_audio(radeon_connector_edid(connector)))))
1772+
ENCODER_MODE_IS_DP(encoder_mode)))
17751773
radeon_audio_dpms(encoder, mode);
17761774

17771775
switch (radeon_encoder->encoder_id) {

‎drivers/gpu/drm/radeon/dce6_afmt.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -295,28 +295,3 @@ void dce6_dp_audio_set_dto(struct radeon_device *rdev,
295295
WREG32(DCCG_AUDIO_DTO1_MODULE, clock);
296296
}
297297
}
298-
299-
void dce6_dp_enable(struct drm_encoder *encoder, bool enable)
300-
{
301-
struct drm_device *dev = encoder->dev;
302-
struct radeon_device *rdev = dev->dev_private;
303-
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
304-
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
305-
306-
if (!dig || !dig->afmt)
307-
return;
308-
309-
if (enable) {
310-
WREG32(EVERGREEN_DP_SEC_TIMESTAMP + dig->afmt->offset,
311-
EVERGREEN_DP_SEC_TIMESTAMP_MODE(1));
312-
WREG32(EVERGREEN_DP_SEC_CNTL + dig->afmt->offset,
313-
EVERGREEN_DP_SEC_ASP_ENABLE | /* Audio packet transmission */
314-
EVERGREEN_DP_SEC_ATP_ENABLE | /* Audio timestamp packet transmission */
315-
EVERGREEN_DP_SEC_AIP_ENABLE | /* Audio infoframe packet transmission */
316-
EVERGREEN_DP_SEC_STREAM_ENABLE); /* Master enable for secondary stream engine */
317-
} else {
318-
WREG32(EVERGREEN_DP_SEC_CNTL + dig->afmt->offset, 0);
319-
}
320-
321-
dig->afmt->enabled = enable;
322-
}

‎drivers/gpu/drm/radeon/evergreen_hdmi.c

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,9 @@ void evergreen_set_avi_packet(struct radeon_device *rdev, u32 offset,
219219
WREG32(AFMT_AVI_INFO3 + offset,
220220
frame[0xC] | (frame[0xD] << 8) | (buffer[1] << 24));
221221

222-
WREG32_OR(HDMI_INFOFRAME_CONTROL0 + offset,
223-
HDMI_AVI_INFO_SEND | /* enable AVI info frames */
224-
HDMI_AVI_INFO_CONT); /* required for audio info values to be updated */
225-
226222
WREG32_P(HDMI_INFOFRAME_CONTROL1 + offset,
227-
HDMI_AVI_INFO_LINE(2), /* anything other than 0 */
228-
~HDMI_AVI_INFO_LINE_MASK);
223+
HDMI_AVI_INFO_LINE(2), /* anything other than 0 */
224+
~HDMI_AVI_INFO_LINE_MASK);
229225
}
230226

231227
void dce4_hdmi_audio_set_dto(struct radeon_device *rdev,
@@ -370,9 +366,13 @@ void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset)
370366
WREG32(AFMT_AUDIO_PACKET_CONTROL2 + offset,
371367
AFMT_AUDIO_CHANNEL_ENABLE(0xff));
372368

369+
WREG32(HDMI_AUDIO_PACKET_CONTROL + offset,
370+
HDMI_AUDIO_DELAY_EN(1) | /* set the default audio delay */
371+
HDMI_AUDIO_PACKETS_PER_LINE(3)); /* should be suffient for all audio modes and small enough for all hblanks */
372+
373373
/* allow 60958 channel status and send audio packets fields to be updated */
374-
WREG32(AFMT_AUDIO_PACKET_CONTROL + offset,
375-
AFMT_AUDIO_SAMPLE_SEND | AFMT_RESET_FIFO_WHEN_AUDIO_DIS | AFMT_60958_CS_UPDATE);
374+
WREG32_OR(AFMT_AUDIO_PACKET_CONTROL + offset,
375+
AFMT_RESET_FIFO_WHEN_AUDIO_DIS | AFMT_60958_CS_UPDATE);
376376
}
377377

378378

@@ -398,17 +398,26 @@ void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable)
398398
return;
399399

400400
if (enable) {
401-
WREG32(HDMI_INFOFRAME_CONTROL1 + dig->afmt->offset,
402-
HDMI_AUDIO_INFO_LINE(2)); /* anything other than 0 */
403-
404-
WREG32(HDMI_AUDIO_PACKET_CONTROL + dig->afmt->offset,
405-
HDMI_AUDIO_DELAY_EN(1) | /* set the default audio delay */
406-
HDMI_AUDIO_PACKETS_PER_LINE(3)); /* should be suffient for all audio modes and small enough for all hblanks */
401+
struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
407402

408-
WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset,
409-
HDMI_AUDIO_INFO_SEND | /* enable audio info frames (frames won't be set until audio is enabled) */
410-
HDMI_AUDIO_INFO_CONT); /* required for audio info values to be updated */
403+
if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {
404+
WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset,
405+
HDMI_AVI_INFO_SEND | /* enable AVI info frames */
406+
HDMI_AVI_INFO_CONT | /* required for audio info values to be updated */
407+
HDMI_AUDIO_INFO_SEND | /* enable audio info frames (frames won't be set until audio is enabled) */
408+
HDMI_AUDIO_INFO_CONT); /* required for audio info values to be updated */
409+
WREG32_OR(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,
410+
AFMT_AUDIO_SAMPLE_SEND);
411+
} else {
412+
WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset,
413+
HDMI_AVI_INFO_SEND | /* enable AVI info frames */
414+
HDMI_AVI_INFO_CONT); /* required for audio info values to be updated */
415+
WREG32_AND(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,
416+
~AFMT_AUDIO_SAMPLE_SEND);
417+
}
411418
} else {
419+
WREG32_AND(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,
420+
~AFMT_AUDIO_SAMPLE_SEND);
412421
WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset, 0);
413422
}
414423

@@ -424,20 +433,24 @@ void evergreen_dp_enable(struct drm_encoder *encoder, bool enable)
424433
struct radeon_device *rdev = dev->dev_private;
425434
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
426435
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
436+
struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
427437

428438
if (!dig || !dig->afmt)
429439
return;
430440

431-
if (enable) {
441+
if (enable && drm_detect_monitor_audio(radeon_connector_edid(connector))) {
432442
struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
433443
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
434444
struct radeon_connector_atom_dig *dig_connector;
435445
uint32_t val;
436446

447+
WREG32_OR(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,
448+
AFMT_AUDIO_SAMPLE_SEND);
449+
437450
WREG32(EVERGREEN_DP_SEC_TIMESTAMP + dig->afmt->offset,
438451
EVERGREEN_DP_SEC_TIMESTAMP_MODE(1));
439452

440-
if (radeon_connector->con_priv) {
453+
if (!ASIC_IS_DCE6(rdev) && radeon_connector->con_priv) {
441454
dig_connector = radeon_connector->con_priv;
442455
val = RREG32(EVERGREEN_DP_SEC_AUD_N + dig->afmt->offset);
443456
val &= ~EVERGREEN_DP_SEC_N_BASE_MULTIPLE(0xf);
@@ -457,6 +470,8 @@ void evergreen_dp_enable(struct drm_encoder *encoder, bool enable)
457470
EVERGREEN_DP_SEC_STREAM_ENABLE); /* Master enable for secondary stream engine */
458471
} else {
459472
WREG32(EVERGREEN_DP_SEC_CNTL + dig->afmt->offset, 0);
473+
WREG32_AND(AFMT_AUDIO_PACKET_CONTROL + dig->afmt->offset,
474+
~AFMT_AUDIO_SAMPLE_SEND);
460475
}
461476

462477
dig->afmt->enabled = enable;

‎drivers/gpu/drm/radeon/r600_hdmi.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,13 @@ void r600_set_avi_packet(struct radeon_device *rdev, u32 offset,
228228
WREG32(HDMI0_AVI_INFO3 + offset,
229229
frame[0xC] | (frame[0xD] << 8) | (buffer[1] << 24));
230230

231+
WREG32_OR(HDMI0_INFOFRAME_CONTROL1 + offset,
232+
HDMI0_AVI_INFO_LINE(2)); /* anything other than 0 */
233+
231234
WREG32_OR(HDMI0_INFOFRAME_CONTROL0 + offset,
232-
HDMI0_AVI_INFO_SEND | /* enable AVI info frames */
233-
HDMI0_AVI_INFO_CONT); /* send AVI info frames every frame/field */
235+
HDMI0_AVI_INFO_SEND | /* enable AVI info frames */
236+
HDMI0_AVI_INFO_CONT); /* send AVI info frames every frame/field */
234237

235-
WREG32_OR(HDMI0_INFOFRAME_CONTROL1 + offset,
236-
HDMI0_AVI_INFO_LINE(2)); /* anything other than 0 */
237238
}
238239

239240
/*

‎drivers/gpu/drm/radeon/radeon_audio.c

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ static void radeon_audio_dp_mode_set(struct drm_encoder *encoder,
102102
void r600_hdmi_enable(struct drm_encoder *encoder, bool enable);
103103
void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable);
104104
void evergreen_dp_enable(struct drm_encoder *encoder, bool enable);
105-
void dce6_dp_enable(struct drm_encoder *encoder, bool enable);
106105

107106
static const u32 pin_offsets[7] =
108107
{
@@ -240,7 +239,7 @@ static struct radeon_audio_funcs dce6_dp_funcs = {
240239
.set_avi_packet = evergreen_set_avi_packet,
241240
.set_audio_packet = dce4_set_audio_packet,
242241
.mode_set = radeon_audio_dp_mode_set,
243-
.dpms = dce6_dp_enable,
242+
.dpms = evergreen_dp_enable,
244243
};
245244

246245
static void radeon_audio_interface_init(struct radeon_device *rdev)
@@ -461,30 +460,33 @@ void radeon_audio_detect(struct drm_connector *connector,
461460
if (!connector || !connector->encoder)
462461
return;
463462

463+
if (!radeon_encoder_is_digital(connector->encoder))
464+
return;
465+
464466
rdev = connector->encoder->dev->dev_private;
465467
radeon_encoder = to_radeon_encoder(connector->encoder);
466468
dig = radeon_encoder->enc_priv;
467469

468-
if (status == connector_status_connected) {
469-
struct radeon_connector *radeon_connector;
470-
int sink_type;
471-
472-
if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) {
473-
radeon_encoder->audio = NULL;
474-
return;
475-
}
470+
if (!dig->afmt)
471+
return;
476472

477-
radeon_connector = to_radeon_connector(connector);
478-
sink_type = radeon_dp_getsinktype(radeon_connector);
473+
if (status == connector_status_connected) {
474+
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
479475

480476
if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
481-
sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)
477+
radeon_dp_getsinktype(radeon_connector) ==
478+
CONNECTOR_OBJECT_ID_DISPLAYPORT)
482479
radeon_encoder->audio = rdev->audio.dp_funcs;
483480
else
484481
radeon_encoder->audio = rdev->audio.hdmi_funcs;
485482

486483
dig->afmt->pin = radeon_audio_get_pin(connector->encoder);
487-
radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
484+
if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {
485+
radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
486+
} else {
487+
radeon_audio_enable(rdev, dig->afmt->pin, 0);
488+
dig->afmt->pin = NULL;
489+
}
488490
} else {
489491
radeon_audio_enable(rdev, dig->afmt->pin, 0);
490492
dig->afmt->pin = NULL;

‎drivers/gpu/drm/radeon/radeon_connectors.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,8 +1379,10 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
13791379
/* updated in get modes as well since we need to know if it's analog or digital */
13801380
radeon_connector_update_scratch_regs(connector, ret);
13811381

1382-
if (radeon_audio != 0)
1382+
if (radeon_audio != 0) {
1383+
radeon_connector_get_edid(connector);
13831384
radeon_audio_detect(connector, ret);
1385+
}
13841386

13851387
exit:
13861388
pm_runtime_mark_last_busy(connector->dev->dev);
@@ -1717,8 +1719,10 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
17171719

17181720
radeon_connector_update_scratch_regs(connector, ret);
17191721

1720-
if (radeon_audio != 0)
1722+
if (radeon_audio != 0) {
1723+
radeon_connector_get_edid(connector);
17211724
radeon_audio_detect(connector, ret);
1725+
}
17221726

17231727
out:
17241728
pm_runtime_mark_last_busy(connector->dev->dev);

‎drivers/gpu/drm/radeon/radeon_cs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
8888
p->dma_reloc_idx = 0;
8989
/* FIXME: we assume that each relocs use 4 dwords */
9090
p->nrelocs = chunk->length_dw / 4;
91-
p->relocs = kcalloc(p->nrelocs, sizeof(struct radeon_bo_list), GFP_KERNEL);
91+
p->relocs = drm_calloc_large(p->nrelocs, sizeof(struct radeon_bo_list));
9292
if (p->relocs == NULL) {
9393
return -ENOMEM;
9494
}
@@ -428,7 +428,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error, bo
428428
}
429429
}
430430
kfree(parser->track);
431-
kfree(parser->relocs);
431+
drm_free_large(parser->relocs);
432432
drm_free_large(parser->vm_bos);
433433
for (i = 0; i < parser->nchunks; i++)
434434
drm_free_large(parser->chunks[i].kdata);

‎drivers/gpu/drm/radeon/radeon_mn.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
135135
while (it) {
136136
struct radeon_mn_node *node;
137137
struct radeon_bo *bo;
138-
int r;
138+
long r;
139139

140140
node = container_of(it, struct radeon_mn_node, it);
141141
it = interval_tree_iter_next(it, start, end);
@@ -144,19 +144,19 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
144144

145145
r = radeon_bo_reserve(bo, true);
146146
if (r) {
147-
DRM_ERROR("(%d) failed to reserve user bo\n", r);
147+
DRM_ERROR("(%ld) failed to reserve user bo\n", r);
148148
continue;
149149
}
150150

151151
r = reservation_object_wait_timeout_rcu(bo->tbo.resv,
152152
true, false, MAX_SCHEDULE_TIMEOUT);
153-
if (r)
154-
DRM_ERROR("(%d) failed to wait for user bo\n", r);
153+
if (r <= 0)
154+
DRM_ERROR("(%ld) failed to wait for user bo\n", r);
155155

156156
radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_CPU);
157157
r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
158158
if (r)
159-
DRM_ERROR("(%d) failed to validate user bo\n", r);
159+
DRM_ERROR("(%ld) failed to validate user bo\n", r);
160160

161161
radeon_bo_unreserve(bo);
162162
}

0 commit comments

Comments
 (0)