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

Commit a3f5aed4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next 

A number of fixes, and one revert for a patch having some wierd side effects.

* 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
  Revert "drm/radeon: do not move bo to different placement at each cs"
  drm/radeon: improve semaphore debugging on lockup
  drm/radeon: allow FP16 color clear registers on r500
  drm/radeon: clear reset flags if engines are idle
parents 7b4cf994 20707874

drivers/gpu/drm/radeon/evergreen.c

+6 −0
Original line number Diff line number Diff line
@@ -2401,6 +2401,12 @@ static int evergreen_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) 
{

	struct evergreen_mc_save save;



	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))

		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE);



	if (RREG32(DMA_STATUS_REG) & DMA_IDLE)

		reset_mask &= ~RADEON_RESET_DMA;



	if (reset_mask == 0)

		return 0;

drivers/gpu/drm/radeon/ni.c

+6 −0
Original line number Diff line number Diff line
@@ -1409,6 +1409,12 @@ static int cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) 
{

	struct evergreen_mc_save save;



	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))

		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE);



	if (RREG32(DMA_STATUS_REG) & DMA_IDLE)

		reset_mask &= ~RADEON_RESET_DMA;



	if (reset_mask == 0)

		return 0;

drivers/gpu/drm/radeon/r600.c

+6 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,12 @@ static int r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) 
{

	struct rv515_mc_save save;



	if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))

		reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE);



	if (RREG32(DMA_STATUS_REG) & DMA_IDLE)

		reset_mask &= ~RADEON_RESET_DMA;



	if (reset_mask == 0)

		return 0;

drivers/gpu/drm/radeon/radeon.h

+2 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ struct radeon_bo { 
	struct list_head		list;

	/* Protected by tbo.reserved */

	u32				placements[3];

	u32				busy_placements[3];

	struct ttm_placement		placement;

	struct ttm_buffer_object	tbo;

	struct ttm_bo_kmap_obj		kmap;
@@ -654,6 +653,8 @@ struct radeon_ring { 
	u32			ptr_reg_mask;

	u32			nop;

	u32			idx;

	u64			last_semaphore_signal_addr;

	u64			last_semaphore_wait_addr;

};



/*

drivers/gpu/drm/radeon/radeon_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -69,9 +69,10 @@ 
 *   2.26.0 - r600-eg: fix htile size computation

 *   2.27.0 - r600-SI: Add CS ioctl support for async DMA

 *   2.28.0 - r600-eg: Add MEM_WRITE packet support

 *   2.29.0 - R500 FP16 color clear registers

 */

#define KMS_DRIVER_MAJOR	2

#define KMS_DRIVER_MINOR	28

#define KMS_DRIVER_MINOR	29

#define KMS_DRIVER_PATCHLEVEL	0

int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);

int radeon_driver_unload_kms(struct drm_device *dev);