modesetting-101: rename modeflags, as to avoid conflicts with the xorg definitions

[platform/upstream/libdrm.git] / linux-core / nv50_dac.c

diff --git a/linux-core/nv50_dac.c b/linux-core/nv50_dac.c
index f51ecf9..ce01d57 100644 (file)
--- a/linux-core/nv50_dac.c
+++ b/linux-core/nv50_dac.c
@@ -73,10 +73,10 @@ static int nv50_dac_execute_mode(struct nv50_output *output, bool disconnect)
                mode_ctl |= 0x100;
        }
 
-       if (desired_mode->flags & V_NHSYNC)
+       if (desired_mode->flags & DRM_MODE_FLAG_NHSYNC)
                mode_ctl2 |= NV50_DAC_MODE_CTRL2_NHSYNC;
 
-       if (desired_mode->flags & V_NVSYNC)
+       if (desired_mode->flags & DRM_MODE_FLAG_NVSYNC)
                mode_ctl2 |= NV50_DAC_MODE_CTRL2_NVSYNC;
 
        OUT_MODE(NV50_DAC0_MODE_CTRL + offset, mode_ctl);
@@ -144,7 +144,7 @@ static int nv50_dac_destroy(struct nv50_output *output)
        if (!display || !output)
                return -EINVAL;
 
-       list_del(&output->head);
+       list_del(&output->item);
 
        kfree(output->native_mode);
        if (dev_priv->free_output)
@@ -197,7 +197,7 @@ int nv50_dac_create(struct drm_device *dev, int dcb_entry)
        output->dcb_entry = dcb_entry;
        output->bus = entry->bus;
 
-       list_add_tail(&output->head, &display->outputs);
+       list_add_tail(&output->item, &display->outputs);
 
        output->native_mode = kzalloc(sizeof(struct nouveau_hw_mode), GFP_KERNEL);
        if (!output->native_mode) {