NV50: replace active by enabled

diff --git a/linux-core/nv50_crtc.h b/linux-core/nv50_crtc.h
index de9a33f..8235c9d 100644 (file)
--- a/linux-core/nv50_crtc.h
+++ b/linux-core/nv50_crtc.h
@@ -38,7 +38,7 @@ struct nv50_crtc {
 
        struct drm_device *dev;
        int index;
-       bool active;
+       bool enabled;
        bool blanked;
 
        struct nouveau_hw_mode *mode;

diff --git a/linux-core/nv50_display.c b/linux-core/nv50_display.c
index cd527c4..2d12fb4 100644 (file)
--- a/linux-core/nv50_display.c
+++ b/linux-core/nv50_display.c
@@ -147,7 +147,7 @@ static int nv50_display_disable(struct nv50_display *display)
 
        /* Almost like ack'ing a vblank interrupt, maybe in the spirit of cleaning up? */
        list_for_each_entry(crtc, &display->crtcs, item) {
-               if (crtc->active) {
+               if (crtc->enabled) {
                        uint32_t mask;
 
                        if (crtc->index == 1)

diff --git a/linux-core/nv50_kms_wrapper.c b/linux-core/nv50_kms_wrapper.c
index 2a214f6..46edfb3 100644 (file)
--- a/linux-core/nv50_kms_wrapper.c
+++ b/linux-core/nv50_kms_wrapper.c
@@ -185,7 +185,7 @@ static void nv50_kms_mirror_routing(struct drm_device *dev)
        list_for_each_entry(drm_crtc, &dev->mode_config.crtc_list, head) {
                crtc = to_nv50_crtc(drm_crtc);
 
-               crtc->active = drm_crtc->enabled;
+               crtc->enabled = drm_crtc->enabled;
        }
 }