|
@@ -196,7 +196,7 @@ via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
|
|
|
{
|
|
|
drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
|
|
|
unsigned int cur_irq_sequence;
|
|
|
- drm_via_irq_t *cur_irq = dev_priv->via_irqs;
|
|
|
+ drm_via_irq_t *cur_irq;
|
|
|
int ret = 0;
|
|
|
maskarray_t *masks;
|
|
|
int real_irq;
|
|
@@ -223,7 +223,7 @@ via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
|
|
|
}
|
|
|
|
|
|
masks = dev_priv->irq_masks;
|
|
|
- cur_irq += real_irq;
|
|
|
+ cur_irq = dev_priv->via_irqs + real_irq;
|
|
|
|
|
|
if (masks[real_irq][2] && !force_sequence) {
|
|
|
DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
|
|
@@ -248,11 +248,12 @@ void via_driver_irq_preinstall(drm_device_t * dev)
|
|
|
{
|
|
|
drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
|
|
|
u32 status;
|
|
|
- drm_via_irq_t *cur_irq = dev_priv->via_irqs;
|
|
|
+ drm_via_irq_t *cur_irq;
|
|
|
int i;
|
|
|
|
|
|
DRM_DEBUG("driver_irq_preinstall: dev_priv: %p\n", dev_priv);
|
|
|
if (dev_priv) {
|
|
|
+ cur_irq = dev_priv->via_irqs;
|
|
|
|
|
|
dev_priv->irq_enable_mask = VIA_IRQ_VBLANK_ENABLE;
|
|
|
dev_priv->irq_pending_mask = VIA_IRQ_VBLANK_PENDING;
|