Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f35f3dc4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 0acf043e fdfc6159

drivers/gpu/drm/radeon/r100.c

+2 −2
Original line number Diff line number Diff line
@@ -773,8 +773,8 @@ int r100_copy_blit(struct radeon_device *rdev, 
		radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));

		radeon_ring_write(rdev, 0);

		radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));

		radeon_ring_write(rdev, cur_pages);

		radeon_ring_write(rdev, cur_pages);

		radeon_ring_write(rdev, num_gpu_pages);

		radeon_ring_write(rdev, num_gpu_pages);

		radeon_ring_write(rdev, cur_pages | (stride_pixels << 16));

	}

	radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0));

drivers/gpu/drm/radeon/radeon_encoders.c

+8 −1
Original line number Diff line number Diff line
@@ -1507,6 +1507,13 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) 
		switch (mode) {

		case DRM_MODE_DPMS_ON:

			args.ucAction = ATOM_ENABLE;

			/* workaround for DVOOutputControl on some RS690 systems */

			if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DDI) {

				u32 reg = RREG32(RADEON_BIOS_3_SCRATCH);

				WREG32(RADEON_BIOS_3_SCRATCH, reg & ~ATOM_S3_DFP2I_ACTIVE);

				atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);

				WREG32(RADEON_BIOS_3_SCRATCH, reg);

			} else

				atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);

			if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

				args.ucAction = ATOM_LCD_BLON;