summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-07-04 09:34:24 +1000
committerDave Airlie <airlied@redhat.com>2008-07-04 09:34:24 +1000
commit142a309604b65c26ca95594943ee91dde8688697 (patch)
treef601ee065d7a81b701ba18e0461a5f6ef4122257 /linux-core
parent11b7a81c8a776aa7761ee03fe55d741a44ba5df7 (diff)
modesetting: rip out all of the generation code.
not needed, hotplug will work just as well hopefully.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_crtc.c5
-rw-r--r--linux-core/drm_crtc.h3
2 files changed, 0 insertions, 8 deletions
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index c20dacd8..ca5e75a4 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -574,7 +574,6 @@ void drm_mode_config_init(struct drm_device *dev)
drm_mode_create_standard_connector_properties(dev);
/* Just to be sure */
- dev->mode_config.current_generation = 0;
dev->mode_config.num_fb = 0;
dev->mode_config.num_connector = 0;
dev->mode_config.num_crtc = 0;
@@ -805,7 +804,6 @@ int drm_mode_getresources(struct drm_device *dev,
card_res->min_height = dev->mode_config.min_height;
card_res->max_width = dev->mode_config.max_width;
card_res->min_width = dev->mode_config.min_width;
- card_res->generation = dev->mode_config.current_generation;
/* handle this in 4 parts */
/* FBs */
@@ -946,7 +944,6 @@ int drm_mode_getcrtc(struct drm_device *dev,
crtc_resp->x = crtc->x;
crtc_resp->y = crtc->y;
crtc_resp->gamma_size = crtc->gamma_size;
- crtc_resp->generation = dev->mode_config.current_generation;
if (crtc->fb)
crtc_resp->fb_id = crtc->fb->base.id;
else
@@ -1036,7 +1033,6 @@ int drm_mode_getconnector(struct drm_device *dev,
list_for_each_entry(mode, &connector->modes, head)
mode_count++;
- out_resp->generation = dev->mode_config.current_generation;
out_resp->connector_type = connector->connector_type;
out_resp->connector_type_id = connector->connector_type_id;
out_resp->mm_width = connector->display_info.width_mm;
@@ -1125,7 +1121,6 @@ int drm_mode_getencoder(struct drm_device *dev,
enc_resp->crtc = encoder->crtc->base.id;
else
enc_resp->crtc = 0;
- enc_resp->generation = dev->mode_config.current_generation;
enc_resp->encoder_type = encoder->encoder_type;
enc_resp->encoder_id = encoder->base.id;
enc_resp->crtcs = encoder->possible_crtcs;
diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d6fa4cca..65ff3f29 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -561,9 +561,6 @@ struct drm_mode_config {
/* in-kernel framebuffers - hung of filp_head in drm_framebuffer */
struct list_head fb_kernel_list;
- /* currently in use generation id */
- int current_generation;
-
int min_width, min_height;
int max_width, max_height;
struct drm_mode_config_funcs *funcs;