leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

via: add some new chipsets

Browse Source 
Disable 3D functionality and AGP DMA for chipsets with the DX9 3D engine.

Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
Thomas Hellstrom 2007-01-08 21:19:57 +11:00 committed by Dave Airlie
parent 76f625511e
commit 689692e73e
5 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/drm/drm_pciids.h
View File

@ -226,12 +226,14 @@
{0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3118, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ {0x1106, 0x3118, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \
{0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x7204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3344, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3344, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x7204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
{0, 0, 0} {0, 0, 0}
#define i810_PCI_IDS \ #define i810_PCI_IDS \

7
drivers/char/drm/via_drv.h
View File

@ -79,7 +79,7 @@ typedef struct drm_via_private {
char pci_buf[VIA_PCI_BUF_SIZE]; char pci_buf[VIA_PCI_BUF_SIZE];
const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
uint32_t num_fire_offsets; uint32_t num_fire_offsets;
int pro_group_a; int chipset;
drm_via_irq_t via_irqs[VIA_NUM_IRQS]; drm_via_irq_t via_irqs[VIA_NUM_IRQS];
unsigned num_irqs; unsigned num_irqs;
maskarray_t *irq_masks; maskarray_t *irq_masks;
@ -96,8 +96,9 @@ typedef struct drm_via_private {
} drm_via_private_t; } drm_via_private_t;
enum via_family { enum via_family {
VIA_OTHER = 0, VIA_OTHER = 0, /* Baseline */
VIA_PRO_GROUP_A, VIA_PRO_GROUP_A, /* Another video engine and DMA commands */
VIA_DX9_0 /* Same video as pro_group_a, but 3D is unsupported */
}; };
/* VIA MMIO register access */ /* VIA MMIO register access */

16
drivers/char/drm/via_irq.c
View File

@ -258,12 +258,16 @@ void via_driver_irq_preinstall(drm_device_t * dev)
dev_priv->irq_enable_mask = VIA_IRQ_VBLANK_ENABLE; dev_priv->irq_enable_mask = VIA_IRQ_VBLANK_ENABLE;
dev_priv->irq_pending_mask = VIA_IRQ_VBLANK_PENDING; dev_priv->irq_pending_mask = VIA_IRQ_VBLANK_PENDING;
dev_priv->irq_masks = (dev_priv->pro_group_a) ? if (dev_priv->chipset == VIA_PRO_GROUP_A ||
via_pro_group_a_irqs : via_unichrome_irqs; dev_priv->chipset == VIA_DX9_0) {
dev_priv->num_irqs = (dev_priv->pro_group_a) ? dev_priv->irq_masks = via_pro_group_a_irqs;
via_num_pro_group_a : via_num_unichrome; dev_priv->num_irqs = via_num_pro_group_a;
dev_priv->irq_map = (dev_priv->pro_group_a) ? dev_priv->irq_map = via_irqmap_pro_group_a;
via_irqmap_pro_group_a : via_irqmap_unichrome; } else {
dev_priv->irq_masks = via_unichrome_irqs;
dev_priv->num_irqs = via_num_unichrome;
dev_priv->irq_map = via_irqmap_unichrome;
}
for (i = 0; i < dev_priv->num_irqs; ++i) { for (i = 0; i < dev_priv->num_irqs; ++i) {
atomic_set(&cur_irq->irq_received, 0); atomic_set(&cur_irq->irq_received, 0);

3
drivers/char/drm/via_map.c
View File

@ -106,8 +106,7 @@ int via_driver_load(drm_device_t *dev, unsigned long chipset)
dev->dev_private = (void *)dev_priv; dev->dev_private = (void *)dev_priv;
if (chipset == VIA_PRO_GROUP_A) dev_priv->chipset = chipset;
dev_priv->pro_group_a = 1;
ret = drm_sman_init(&dev_priv->sman, 2, 12, 8); ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
if (ret) { if (ret) {

20
drivers/char/drm/via_verifier.c
View File

@ -961,7 +961,13 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
uint32_t cmd; uint32_t cmd;
const uint32_t *buf_end = buf + (size >> 2); const uint32_t *buf_end = buf + (size >> 2);
verifier_state_t state = state_command; verifier_state_t state = state_command;
int pro_group_a = dev_priv->pro_group_a; int cme_video;
int supported_3d;
cme_video = (dev_priv->chipset == VIA_PRO_GROUP_A ||
dev_priv->chipset == VIA_DX9_0);
supported_3d = dev_priv->chipset != VIA_DX9_0;
hc_state->dev = dev; hc_state->dev = dev;
hc_state->unfinished = no_sequence; hc_state->unfinished = no_sequence;
@ -986,17 +992,21 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
state = via_check_vheader6(&buf, buf_end); state = via_check_vheader6(&buf, buf_end);
break; break;
case state_command: case state_command:
if (HALCYON_HEADER2 == (cmd = *buf)) if ((HALCYON_HEADER2 == (cmd = *buf)) &&
supported_3d)
state = state_header2; state = state_header2;
else if ((cmd & HALCYON_HEADER1MASK) == HALCYON_HEADER1) else if ((cmd & HALCYON_HEADER1MASK) == HALCYON_HEADER1)
state = state_header1; state = state_header1;
else if (pro_group_a else if (cme_video
&& (cmd & VIA_VIDEOMASK) == VIA_VIDEO_HEADER5) && (cmd & VIA_VIDEOMASK) == VIA_VIDEO_HEADER5)
state = state_vheader5; state = state_vheader5;
else if (pro_group_a else if (cme_video
&& (cmd & VIA_VIDEOMASK) == VIA_VIDEO_HEADER6) && (cmd & VIA_VIDEOMASK) == VIA_VIDEO_HEADER6)
state = state_vheader6; state = state_vheader6;
else { else if ((cmd == HALCYON_HEADER2) && !supported_3d) {
DRM_ERROR("Accelerated 3D is not supported on this chipset yet.\n");
state = state_error;
} else {
DRM_ERROR DRM_ERROR
("Invalid / Unimplemented DMA HEADER command. 0x%x\n", ("Invalid / Unimplemented DMA HEADER command. 0x%x\n",
cmd); cmd);