diff options
| author | Maarten Maathuis <madman2003@gmail.com> | 2008-07-03 07:18:18 +0200 |
|---|---|---|
| committer | Maarten Maathuis <madman2003@gmail.com> | 2008-07-03 07:18:18 +0200 |
| commit | 47c8f317410976c679aeaee69a372ec45485d442 (patch) | |
| tree | 2616f7d16e1614f75fc569d90afe507b7bdd4ab7 /linux-core | |
| parent | 02b30739f7676082af4ce92448d910085d1dfc65 (diff) | |
NV50: replace active by enabled
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/nv50_crtc.h | 2 | ||||
| -rw-r--r-- | linux-core/nv50_display.c | 2 | ||||
| -rw-r--r-- | linux-core/nv50_kms_wrapper.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/nv50_crtc.h b/linux-core/nv50_crtc.h index de9a33f2..8235c9d6 100644 --- 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 cd527c44..2d12fb4f 100644 --- 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 2a214f68..46edfb34 100644 --- 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; } } |