svn commit: r278005 - projects/clang360-import/sys/dev/drm2/radeon

[Dimitry Andric]

Author: dim
Date: Sat Jan 31 22:26:39 2015
New Revision: 278005
URL: https://svnweb.freebsd.org/changeset/base/278005

Log:
  Merge ^/head r278003 through r278004.

Modified:
  projects/clang360-import/sys/dev/drm2/radeon/ni.c
  projects/clang360-import/sys/dev/drm2/radeon/si.c
Directory Properties:
  projects/clang360-import/   (props changed)
  projects/clang360-import/sys/   (props changed)

Modified: projects/clang360-import/sys/dev/drm2/radeon/ni.c
==============================================================================
--- projects/clang360-import/sys/dev/drm2/radeon/ni.c	Sat Jan 31 22:18:52 2015	(r278004)
+++ projects/clang360-import/sys/dev/drm2/radeon/ni.c	Sat Jan 31 22:26:39 2015	(r278005)
@@ -182,7 +182,7 @@ int ni_mc_load_microcode(struct radeon_d
 {
 	const __be32 *fw_data;
 	u32 mem_type, running, blackout = 0;
-	u32 *io_mc_regs;
+	const u32 *io_mc_regs;
 	int i, ucode_size, regs_size;
 
 	if (!rdev->mc_fw)
@@ -190,23 +190,23 @@ int ni_mc_load_microcode(struct radeon_d
 
 	switch (rdev->family) {
 	case CHIP_BARTS:
-		io_mc_regs = (u32 *)&barts_io_mc_regs;
+		io_mc_regs = (const u32 *)&barts_io_mc_regs;
 		ucode_size = BTC_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_TURKS:
-		io_mc_regs = (u32 *)&turks_io_mc_regs;
+		io_mc_regs = (const u32 *)&turks_io_mc_regs;
 		ucode_size = BTC_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_CAICOS:
 	default:
-		io_mc_regs = (u32 *)&caicos_io_mc_regs;
+		io_mc_regs = (const u32 *)&caicos_io_mc_regs;
 		ucode_size = BTC_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_CAYMAN:
-		io_mc_regs = (u32 *)&cayman_io_mc_regs;
+		io_mc_regs = (const u32 *)&cayman_io_mc_regs;
 		ucode_size = CAYMAN_MC_UCODE_SIZE;
 		regs_size = BTC_IO_MC_REGS_SIZE;
 		break;

Modified: projects/clang360-import/sys/dev/drm2/radeon/si.c
==============================================================================
--- projects/clang360-import/sys/dev/drm2/radeon/si.c	Sat Jan 31 22:18:52 2015	(r278004)
+++ projects/clang360-import/sys/dev/drm2/radeon/si.c	Sat Jan 31 22:26:39 2015	(r278005)
@@ -182,7 +182,7 @@ static int si_mc_load_microcode(struct r
 {
 	const __be32 *fw_data;
 	u32 running, blackout = 0;
-	u32 *io_mc_regs;
+	const u32 *io_mc_regs;
 	int i, ucode_size, regs_size;
 
 	if (!rdev->mc_fw)
@@ -190,18 +190,18 @@ static int si_mc_load_microcode(struct r
 
 	switch (rdev->family) {
 	case CHIP_TAHITI:
-		io_mc_regs = (u32 *)&tahiti_io_mc_regs;
+		io_mc_regs = (const u32 *)&tahiti_io_mc_regs;
 		ucode_size = SI_MC_UCODE_SIZE;
 		regs_size = TAHITI_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_PITCAIRN:
-		io_mc_regs = (u32 *)&pitcairn_io_mc_regs;
+		io_mc_regs = (const u32 *)&pitcairn_io_mc_regs;
 		ucode_size = SI_MC_UCODE_SIZE;
 		regs_size = TAHITI_IO_MC_REGS_SIZE;
 		break;
 	case CHIP_VERDE:
 	default:
-		io_mc_regs = (u32 *)&verde_io_mc_regs;
+		io_mc_regs = (const u32 *)&verde_io_mc_regs;
 		ucode_size = SI_MC_UCODE_SIZE;
 		regs_size = TAHITI_IO_MC_REGS_SIZE;
 		break;