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

Commit 7a4ee320 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

a few more radeon fixes.

* 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dpm: fix typo in EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters
  drm/radeon/cik: fix typo in documentation
  drm/radeon: silence GCC warning on 32 bit
  drm/radeon: resume old pm late
  drm/radeon: TTM must be init with cpu-visible VRAM, v2
parents 6d7c2a67 13714323

drivers/gpu/drm/radeon/cik.c

+3 −2
Original line number Diff line number Diff line
@@ -3046,7 +3046,7 @@ static u32 cik_create_bitmask(u32 bit_width) 
}



/**

 * cik_select_se_sh - select which SE, SH to address

 * cik_get_rb_disabled - computes the mask of disabled RBs

 *

 * @rdev: radeon_device pointer

 * @max_rb_num: max RBs (render backends) for the asic
@@ -7902,6 +7902,7 @@ int cik_resume(struct radeon_device *rdev) 
	/* init golden registers */

	cik_init_golden_registers(rdev);



	if (rdev->pm.pm_method == PM_METHOD_DPM)

		radeon_pm_resume(rdev);



	rdev->accel_working = true;

drivers/gpu/drm/radeon/evergreen.c

+2 −1
Original line number Diff line number Diff line
@@ -5299,6 +5299,7 @@ int evergreen_resume(struct radeon_device *rdev) 
	/* init golden registers */

	evergreen_init_golden_registers(rdev);



	if (rdev->pm.pm_method == PM_METHOD_DPM)

		radeon_pm_resume(rdev);



	rdev->accel_working = true;

drivers/gpu/drm/radeon/evergreen_smc.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ typedef struct SMC_Evergreen_MCRegisters SMC_Evergreen_MCRegisters; 


#define EVERGREEN_SMC_FIRMWARE_HEADER_LOCATION 0x100



#define EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters   0x0

#define EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters   0x8

#define EVERGREEN_SMC_FIRMWARE_HEADER_stateTable      0xC

#define EVERGREEN_SMC_FIRMWARE_HEADER_mcRegisterTable 0x20

drivers/gpu/drm/radeon/ni.c

+2 −1
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ int cayman_resume(struct radeon_device *rdev) 
	/* init golden registers */

	ni_init_golden_registers(rdev);



	if (rdev->pm.pm_method == PM_METHOD_DPM)

		radeon_pm_resume(rdev);



	rdev->accel_working = true;

drivers/gpu/drm/radeon/r100.c

+0 −2
Original line number Diff line number Diff line
@@ -3942,8 +3942,6 @@ int r100_resume(struct radeon_device *rdev) 
	/* Initialize surface registers */

	radeon_surface_init(rdev);



	radeon_pm_resume(rdev);



	rdev->accel_working = true;

	r = r100_startup(rdev);

	if (r) {