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

Commit 17eac85a authored by Pierre Moreau's avatar Pierre Moreau Committed by Ben Skeggs
Browse files

drm/nouveau: Fix duplicate definition of NV04_PFB_BOOT_0_* 



Signed-off-by: default avatarPierre Moreau <pierre.morrow@free.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 703fa264

drivers/gpu/drm/nouveau/core/include/subdev/fb/regsnv04.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_FB_REGS_04_H__

#define __NOUVEAU_FB_REGS_04_H__



#define NV04_PFB_BOOT_0						0x00100000

#	define NV04_PFB_BOOT_0_RAM_AMOUNT			0x00000003

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_32MB			0x00000000

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_4MB			0x00000001

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_8MB			0x00000002

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_16MB			0x00000003

#	define NV04_PFB_BOOT_0_RAM_WIDTH_128			0x00000004

#	define NV04_PFB_BOOT_0_RAM_TYPE				0x00000028

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_8MBIT		0x00000000

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT		0x00000008

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT_4BANK	0x00000010

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_16MBIT		0x00000018

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBIT		0x00000020

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBITX16		0x00000028

#	define NV04_PFB_BOOT_0_UMA_ENABLE			0x00000100

#	define NV04_PFB_BOOT_0_UMA_SIZE				0x0000f000



#endif

drivers/gpu/drm/nouveau/core/subdev/devinit/fbmem.h

+2 −16
Original line number Diff line number Diff line
@@ -26,22 +26,8 @@ 


#include <core/device.h>



#define NV04_PFB_BOOT_0						0x00100000

#	define NV04_PFB_BOOT_0_RAM_AMOUNT			0x00000003

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_32MB			0x00000000

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_4MB			0x00000001

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_8MB			0x00000002

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_16MB			0x00000003

#	define NV04_PFB_BOOT_0_RAM_WIDTH_128			0x00000004

#	define NV04_PFB_BOOT_0_RAM_TYPE				0x00000028

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_8MBIT		0x00000000

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT		0x00000008

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT_4BANK	0x00000010

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_16MBIT		0x00000018

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBIT		0x00000020

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBITX16		0x00000028

#	define NV04_PFB_BOOT_0_UMA_ENABLE			0x00000100

#	define NV04_PFB_BOOT_0_UMA_SIZE				0x0000f000

#include <subdev/fb/regsnv04.h>



#define NV04_PFB_DEBUG_0					0x00100080

#	define NV04_PFB_DEBUG_0_PAGE_MODE			0x00000001

#	define NV04_PFB_DEBUG_0_REFRESH_OFF			0x00000010

drivers/gpu/drm/nouveau/core/subdev/fb/ramnv04.c

+1 −16
Original line number Diff line number Diff line
@@ -22,22 +22,7 @@ 
 * Authors: Ben Skeggs

 */



#define NV04_PFB_BOOT_0						0x00100000

#	define NV04_PFB_BOOT_0_RAM_AMOUNT			0x00000003

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_32MB			0x00000000

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_4MB			0x00000001

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_8MB			0x00000002

#	define NV04_PFB_BOOT_0_RAM_AMOUNT_16MB			0x00000003

#	define NV04_PFB_BOOT_0_RAM_WIDTH_128			0x00000004

#	define NV04_PFB_BOOT_0_RAM_TYPE				0x00000028

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_8MBIT		0x00000000

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT		0x00000008

#	define NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT_4BANK	0x00000010

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_16MBIT		0x00000018

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBIT		0x00000020

#	define NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_64MBITX16		0x00000028

#	define NV04_PFB_BOOT_0_UMA_ENABLE			0x00000100

#	define NV04_PFB_BOOT_0_UMA_SIZE				0x0000f000

#include <subdev/fb/regsnv04.h>



#include "priv.h"