From: <mad...@ke...> - 2008-07-03 06:08:29
|
linux-core/drm_sysfs.c | 9 ++++----- linux-core/nv50_crtc.h | 2 +- linux-core/nv50_display.c | 2 +- linux-core/nv50_kms_wrapper.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) New commits: commit d5ca5c9cd379438ac303598677f3789adc3687b1 Author: Maarten Maathuis <mad...@gm...> Date: Thu Jul 3 08:07:35 2008 +0200 [drm-sysfs] connected is ambigious in the context of a connector, replace with enabled diff --git a/linux-core/drm_sysfs.c b/linux-core/drm_sysfs.c index 02b0853..36b9222 100644 --- a/linux-core/drm_sysfs.c +++ b/linux-core/drm_sysfs.c @@ -176,17 +176,16 @@ static ssize_t dpms_show(struct device *device, return snprintf(buf, PAGE_SIZE, "%s", drm_get_dpms_name((int)dpms_status)); } -static ssize_t connected_show(struct device *device, +static ssize_t enabled_show(struct device *device, struct device_attribute *attr, char *buf) { struct drm_connector *connector = container_of(device, struct drm_connector, kdev); - struct drm_device *dev = connector->dev; if (connector->encoder) - return snprintf(buf, PAGE_SIZE, "connected"); + return snprintf(buf, PAGE_SIZE, "enabled"); else - return snprintf(buf, PAGE_SIZE, "disconnected"); + return snprintf(buf, PAGE_SIZE, "disabled"); } static ssize_t edid_show(struct kobject *kobj, struct bin_attribute *attr, @@ -234,7 +233,7 @@ static ssize_t modes_show(struct device *device, static struct device_attribute connector_attrs[] = { __ATTR_RO(status), - __ATTR_RO(connected), + __ATTR_RO(enabled), __ATTR_RO(dpms), __ATTR_RO(modes), }; commit 47c8f317410976c679aeaee69a372ec45485d442 Author: Maarten Maathuis <mad...@gm...> Date: Thu Jul 3 07:18:18 2008 +0200 NV50: replace active by enabled diff --git a/linux-core/nv50_crtc.h b/linux-core/nv50_crtc.h index de9a33f..8235c9d 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 cd527c4..2d12fb4 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 2a214f6..46edfb3 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; } } |