Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon/kms: fix DDIA enable on some rs690 systems
Revert "drm/radeon/kms: fix typo in r100_blit_copy"
+10
-3
+2
-2
drivers/gpu/drm/radeon/r100.c
+2
-2
drivers/gpu/drm/radeon/r100.c
···
773
773
radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
774
774
radeon_ring_write(rdev, 0);
775
775
radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
776
-
radeon_ring_write(rdev, cur_pages);
777
-
radeon_ring_write(rdev, cur_pages);
776
+
radeon_ring_write(rdev, num_gpu_pages);
777
+
radeon_ring_write(rdev, num_gpu_pages);
778
778
radeon_ring_write(rdev, cur_pages | (stride_pixels << 16));
779
779
}
780
780
radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0));
+8
-1
drivers/gpu/drm/radeon/radeon_encoders.c
+8
-1
drivers/gpu/drm/radeon/radeon_encoders.c
···
1507
1507
switch (mode) {
1508
1508
case DRM_MODE_DPMS_ON:
1509
1509
args.ucAction = ATOM_ENABLE;
1510
-
atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
1510
+
/* workaround for DVOOutputControl on some RS690 systems */
1511
+
if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DDI) {
1512
+
u32 reg = RREG32(RADEON_BIOS_3_SCRATCH);
1513
+
WREG32(RADEON_BIOS_3_SCRATCH, reg & ~ATOM_S3_DFP2I_ACTIVE);
1514
+
atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
1515
+
WREG32(RADEON_BIOS_3_SCRATCH, reg);
1516
+
} else
1517
+
atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
1511
1518
if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
1512
1519
args.ucAction = ATOM_LCD_BLON;
1513
1520
atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);