AGPGART 5/5: Intel 460GX support
Subsystems (2)
PATCH 1/1 AGPGART 5/5: Intel 460GX support
This adds Intel 460GX GART support.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.692 -> 1.693
# drivers/char/drm/drm_agpsupport.h 1.10 -> 1.11
# drivers/char/agp/agpgart_be.c 1.39 -> 1.40
# drivers/char/drm/r128_cce.c 1.6 -> 1.7
# drivers/char/drm/radeon_cp.c 1.7 -> 1.8
# drivers/char/Config.in 1.36 -> 1.37
# drivers/char/drm-4.0/radeon_cp.c 1.2 -> 1.3
# include/linux/agp_backend.h 1.14 -> 1.15
# drivers/char/agp/agp.h 1.19 -> 1.20
# drivers/char/drm-4.0/r128_cce.c 1.2 -> 1.3
# drivers/char/drm-4.0/agpsupport.c 1.3 -> 1.4
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/27 [email protected] 1.693
# Intel 460GX GART support. Originally due to Chris Ahna
# ([email protected]).
# --------------------------------------------
#
drivers/char/Config.in +1 -0
@@ -284,6 +284,7 @@ bool ' ALI chipset support' CONFIG_AGP_ALI bool ' Serverworks LE/HE support' CONFIG_AGP_SWORKS if [ "$CONFIG_IA64" = "y" ]; then + bool ' Intel 460GX support' CONFIG_AGP_I460 bool ' HP ZX1 AGP support' CONFIG_AGP_HP_ZX1 fi fi
drivers/char/agp/agp.h +12 -0
@@ -229,6 +229,9 @@#ifndef PCI_DEVICE_ID_INTEL_82443GX_1 #define PCI_DEVICE_ID_INTEL_82443GX_1 0x71a1#endif +#ifndef PCI_DEVICE_ID_INTEL_460GX +#define PCI_DEVICE_ID_INTEL_460GX 0x84ea +#endif #ifndef PCI_DEVICE_ID_AMD_IRONGATE_0 #define PCI_DEVICE_ID_AMD_IRONGATE_0 0x7006#endif
@@ -279,6 +282,15 @@#define INTEL_AGPCTRL 0xb0#define INTEL_NBXCFG 0x50#define INTEL_ERRSTS 0x91 + +/* Intel 460GX Registers */ +#define INTEL_I460_APBASE 0x10 +#define INTEL_I460_BAPBASE 0x98 +#define INTEL_I460_GXBCTL 0xa0 +#define INTEL_I460_AGPSIZ 0xa2 +#define INTEL_I460_ATTBASE 0xfe200000 +#define INTEL_I460_GATT_VALID (1UL << 24) +#define INTEL_I460_GATT_COHERENT (1UL << 25)/* intel i830 registers */ #define I830_GMCH_CTRL 0x52
drivers/char/agp/agpgart_be.c +607 -2
622 lines not on this page · raw message
drivers/char/drm/drm_agpsupport.h +1 -0
@@ -270,6 +270,7 @@case INTEL_I840 : head->chipset ="Intel i840" ;break ;case INTEL_I845 : head->chipset ="Intel i845" ;break ;case INTEL_I850 : head->chipset ="Intel i850" ;break ; +case INTEL_460GX : head->chipset ="Intel 460GX" ;break ;case VIA_GENERIC : head->chipset ="VIA" ;break ;case VIA_VP3 : head->chipset ="VIA VP3" ;break ;
drivers/char/drm/r128_cce.c +32 -3
@@ -316,7 +316,7 @@static void r128_cce_init_ring_buffer (drm_device_t *dev,drm_r128_private_t *dev_priv ) { -u32 ring_start; +u32 ring_start, rptr_addr;u32 tmp;DRM_DEBUG ("%s\n" , __FUNCTION__ );
@@ -340,8 +340,24 @@SET_RING_HEAD ( &dev_priv->ring,0 );if ( !dev_priv->is_pci ) { -R128_WRITE (R128_PM4_BUFFER_DL_RPTR_ADDR , - dev_priv->ring_rptr->offset ); +/* +* 460GX doesn't claim PCI writes from the card into +* the AGP aperture, so we have to get space outside +* the aperture for RPTR_ADDR. +*/ +if ( dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off; + + alt_rh_off =__get_free_page (GFP_KERNEL |GFP_DMA ); +atomic_inc (&virt_to_page (alt_rh_off)->count); +set_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); + + dev_priv->ring.head = (__volatile__ u32 *) alt_rh_off; +SET_RING_HEAD ( &dev_priv->ring,0 ); + rptr_addr =__pa ( dev_priv->ring.head ); + }else + rptr_addr = dev_priv->ring_rptr->offset; +R128_WRITE (R128_PM4_BUFFER_DL_RPTR_ADDR , rptr_addr ); }else {drm_sg_mem_t *entry = dev->sg;unsigned long tmp_ofs, page_ofs;
@@ -633,6 +649,19 @@DRM_ERROR ("failed to cleanup PCI GART!\n" ); } +/* +* Free the page we grabbed for RPTR_ADDR +*/ +if ( !dev_priv->is_pci && dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off = + (unsigned long ) dev_priv->ring.head; + +atomic_dec (&virt_to_page (alt_rh_off)->count); +clear_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); +wake_up (&virt_to_page (alt_rh_off)->wait); +free_page (alt_rh_off); + } +DRM (free)( dev->dev_private,sizeof (drm_r128_private_t),DRM_MEM_DRIVER ); dev->dev_private =NULL ;
drivers/char/drm/radeon_cp.c +32 -3
@@ -574,7 +574,7 @@static void radeon_cp_init_ring_buffer (drm_device_t *dev,drm_radeon_private_t *dev_priv ) { -u32 ring_start, cur_read_ptr; +u32 ring_start, cur_read_ptr, rptr_addr;u32 tmp;/* Initialize the memory controller */
@@ -611,8 +611,24 @@ dev_priv->ring.tail = cur_read_ptr;if ( !dev_priv->is_pci ) { -RADEON_WRITE (RADEON_CP_RB_RPTR_ADDR , - dev_priv->ring_rptr->offset ); +/* +* 460GX doesn't claim PCI writes from the card into +* the AGP aperture, so we have to get space outside +* the aperture for RPTR_ADDR. +*/ +if ( dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off; + + alt_rh_off =__get_free_page (GFP_KERNEL |GFP_DMA ); +atomic_inc (&virt_to_page (alt_rh_off)->count); +set_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); + + dev_priv->ring.head = (__volatile__ u32 *) alt_rh_off; + *dev_priv->ring.head = cur_read_ptr; + rptr_addr =__pa ( dev_priv->ring.head ); + }else + rptr_addr = dev_priv->ring_rptr->offset; +RADEON_WRITE (RADEON_CP_RB_RPTR_ADDR , rptr_addr ); }else {drm_sg_mem_t *entry = dev->sg;unsigned long tmp_ofs, page_ofs;
@@ -992,6 +1008,19 @@DRM_ERROR ("failed to cleanup PCI GART!\n" ); } +/* +* Free the page we grabbed for RPTR_ADDR +*/ +if ( !dev_priv->is_pci && dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off = + (unsigned long ) dev_priv->ring.head; + +atomic_dec (&virt_to_page (alt_rh_off)->count); +clear_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); +wake_up (&virt_to_page (alt_rh_off)->wait); +free_page (alt_rh_off); + } +DRM (free)( dev->dev_private,sizeof (drm_radeon_private_t),DRM_MEM_DRIVER ); dev->dev_private =NULL ;
drivers/char/drm-4.0/agpsupport.c +1 -0
@@ -265,6 +265,7 @@#if LINUX_VERSION_CODE >=0x020400 case INTEL_I840 : head->chipset ="Intel i840" ;break ;#endif +case INTEL_460GX : head->chipset ="Intel 460GX" ;break ;case VIA_GENERIC : head->chipset ="VIA" ;break ;case VIA_VP3 : head->chipset ="VIA VP3" ;break ;
drivers/char/drm-4.0/r128_cce.c +33 -3
@@ -331,7 +344,7 @@static void r128_cce_init_ring_buffer (drm_device_t *dev ) {drm_r128_private_t *dev_priv = dev->dev_private; -u32 ring_start; +u32 ring_start, rptr_addr;u32 tmp;/* The manual (p. 2) says this address is in "VM space". This
@@ -343,10 +356,27 @@R128_WRITE (R128_PM4_BUFFER_DL_WPTR ,0 );R128_WRITE (R128_PM4_BUFFER_DL_RPTR ,0 ); +/* +* 460GX doesn't claim PCI writes from the card into the AGP +* aperture, so we have to get space outside the aperture for +* RPTR_ADDR. +*/ +if ( dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off; + + alt_rh_off =__get_free_page (GFP_KERNEL |GFP_DMA ); +atomic_inc (&virt_to_page (alt_rh_off)->count); +set_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); + + dev_priv->ring.head = (__volatile__ u32 *) alt_rh_off; + rptr_addr =__pa ( dev_priv->ring.head ); + }else { + rptr_addr = dev_priv->ring_rptr->offset; + } +/* DL_RPTR_ADDR is a physical address in AGP space. */ *dev_priv->ring.head =0 ; -R128_WRITE (R128_PM4_BUFFER_DL_RPTR_ADDR , - dev_priv->ring_rptr->offset ); +R128_WRITE (R128_PM4_BUFFER_DL_RPTR_ADDR , rptr_addr );/* Set watermark control */ R128_WRITE( R128_PM4_BUFFER_WM_CNTL,
@@ -530,6 +560,19 @@ DO_REMAPFREE( dev_priv->agp_textures, dev ); }#endif + +/* +* Free the page we grabbed for RPTR_ADDR +*/ +if ( dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off = + (unsigned long ) dev_priv->ring.head; + +atomic_dec (&virt_to_page (alt_rh_off)->count); +clear_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); +wake_up (&virt_to_page (alt_rh_off)->wait); +free_page (alt_rh_off); + }drm_free ( dev->dev_private,sizeof (drm_r128_private_t),DRM_MEM_DRIVER );
drivers/char/drm-4.0/radeon_cp.c +34 -2
@@ -570,7 +570,7 @@static void radeon_cp_init_ring_buffer (drm_device_t *dev ) {drm_radeon_private_t *dev_priv = dev->dev_private; -u32 ring_start, cur_read_ptr; +u32 ring_start, cur_read_ptr, rptr_addr;u32 tmp;/* Initialize the memory controller */
@@ -593,10 +593,29 @@/* Initialize the ring buffer's read and write pointers */ cur_read_ptr =RADEON_READ (RADEON_CP_RB_RPTR );RADEON_WRITE (RADEON_CP_RB_WPTR , cur_read_ptr ); + *dev_priv->ring.head = cur_read_ptr; dev_priv->ring.tail = cur_read_ptr; -RADEON_WRITE (RADEON_CP_RB_RPTR_ADDR , dev_priv->ring_rptr->offset ); +/* +* 460GX doesn't claim PCI writes from the card into the AGP +* aperture, so we have to get space outside the aperture for +* RPTR_ADDR. +*/ +if ( dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off; + + alt_rh_off =__get_free_page (GFP_KERNEL |GFP_DMA ); +atomic_inc (&virt_to_page (alt_rh_off)->count); +set_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); + + dev_priv->ring.head = (__volatile__ u32 *) alt_rh_off; + *dev_priv->ring.head = cur_read_ptr; + rptr_addr =__pa ( dev_priv->ring.head ); + }else + rptr_addr = dev_priv->ring_rptr->offset; + +RADEON_WRITE (RADEON_CP_RB_RPTR_ADDR , rptr_addr);/* Set ring buffer size */ RADEON_WRITE (RADEON_CP_RB_CNTL , dev_priv->ring.size_l2qw );
@@ -837,6 +856,19 @@ DO_IOREMAPFREE( dev_priv->agp_textures, dev ); }#endif + +/* +* Free the page we grabbed for RPTR_ADDR. +*/ +if ( dev->agp->agp_info.chipset ==INTEL_460GX ) { +unsigned long alt_rh_off = + (unsigned long ) dev_priv->ring.head; + +atomic_dec (&virt_to_page (alt_rh_off)->count); +clear_bit (PG_locked, &virt_to_page (alt_rh_off)->flags); +wake_up (&virt_to_page (alt_rh_off)->wait); +free_page (alt_rh_off); + }drm_free ( dev->dev_private,sizeof (drm_radeon_private_t),DRM_MEM_DRIVER );
include/linux/agp_backend.h +1 -0
@@ -53,6 +53,7 @@INTEL_I845 ,INTEL_I850 ,INTEL_I860 , +INTEL_460GX ,VIA_GENERIC ,VIA_VP3 , VIA_MVP3,