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

Commit 414ed537 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: add initial r300 3D support. 



This adds initial r300 3D support to the radeon DRM.

From: Nicolai Haehnle, Vladimir Dergachev, and others.
Signed-off-by: default avatarDavid Airlie <airlied@linux.ie>
parent 282a1674

drivers/char/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o 
i810-objs   := i810_drv.o i810_dma.o

i830-objs   := i830_drv.o i830_dma.o i830_irq.o

i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o

radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o

radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o

ffb-objs    := ffb_drv.o ffb_context.o

sis-objs    := sis_drv.o sis_ds.o sis_mm.o

savage-objs := savage_drv.o savage_bci.o savage_state.o

drivers/char/drm/drm_pciids.h

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
	{0x1002, 0x4965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \

	{0x1002, 0x4966, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \

	{0x1002, 0x4967, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \

	{0x1002, 0x4A49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \

	{0x1002, 0x4A4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \

	{0x1002, 0x4C57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \

	{0x1002, 0x4C58, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \

	{0x1002, 0x4C59, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100|CHIP_IS_MOBILITY}, \
@@ -33,7 +35,17 @@ 
	{0x1002, 0x4C65, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \

	{0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \

	{0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \

	{0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \

	{0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \

	{0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \

	{0x1002, 0x4E47, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \

	{0x1002, 0x4E48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \

	{0x1002, 0x4E49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \

	{0x1002, 0x4E4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \

	{0x1002, 0x4E4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \

	{0x1002, 0x4E50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \

	{0x1002, 0x4E51, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \

	{0x1002, 0x4E54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \

	{0x1002, 0x5144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \

	{0x1002, 0x5145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \

	{0x1002, 0x5146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \
@@ -56,6 +68,7 @@ 
	{0x1002, 0x516A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \

	{0x1002, 0x516B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \

	{0x1002, 0x516C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \

	{0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \

	{0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \

	{0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY}, \

	{0x1002, 0x5836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \

drivers/char/drm/r300_cmdbuf.c

0 → 100644
+801 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/r300_reg.h

0 → 100644
+1412 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/radeon_cp.c

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "drm.h"

#include "radeon_drm.h"

#include "radeon_drv.h"

#include "r300_reg.h"



#define RADEON_FIFO_DEBUG	0
@@ -1151,6 +1152,8 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev, 


#if __OS_HAS_AGP

	if ( !dev_priv->is_pci ) {

		/* set RADEON_AGP_BASE here instead of relying on X from user space */

		RADEON_WRITE(RADEON_AGP_BASE, (unsigned int)dev->agp->base);

		RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,

			      dev_priv->ring_rptr->offset

			      - dev->agp->base
@@ -1626,6 +1629,9 @@ int radeon_cp_init( DRM_IOCTL_ARGS ) 


	DRM_COPY_FROM_USER_IOCTL( init, (drm_radeon_init_t __user *)data, sizeof(init) );



	if(init.func == RADEON_INIT_R300_CP)

		r300_init_reg_flags();



	switch ( init.func ) {

	case RADEON_INIT_CP:

	case RADEON_INIT_R200_CP:
@@ -2040,12 +2046,19 @@ int radeon_driver_preinit(struct drm_device *dev, unsigned long flags) 
	case CHIP_RV200:

	case CHIP_R200:

	case CHIP_R300:

	case CHIP_R420:

		dev_priv->flags |= CHIP_HAS_HIERZ;

		break;

	default:

	/* all other chips have no hierarchical z buffer */

		break;

	}



	if (drm_device_is_agp(dev))

		dev_priv->flags |= CHIP_IS_AGP;

	

	DRM_DEBUG("%s card detected\n",

		  ((dev_priv->flags & CHIP_IS_AGP) ? "AGP" : "PCI"));

	return ret;

}