From 142a309604b65c26ca95594943ee91dde8688697 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 4 Jul 2008 09:34:24 +1000
Subject: [PATCH] modesetting: rip out all of the generation code.

not needed, hotplug will work just as well hopefully.
---
 libdrm/xf86drmMode.h  | 11 -----------
 linux-core/drm_crtc.c |  5 -----
 linux-core/drm_crtc.h |  3 ---
 shared-core/drm.h     |  7 -------
 4 files changed, 26 deletions(-)

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 7afc71d..3e2f5c0 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -50,16 +50,8 @@
  * buffer object interface. This object needs to be pinned.
  */
 
-/*
- * generation - these are to be read by userspace, and if it notices
- * while calling a get output or get crtc that the generation has changed
- * it should re-call the mode resource functions resync its view of the
- * outputs with current view.
- */
-
 typedef struct _drmModeRes {
 
-	uint32_t generation;
 	int count_fbs;
 	uint32_t *fbs;
 
@@ -99,7 +91,6 @@ typedef struct _drmModeProperty {
 typedef struct _drmModeCrtc {
 	unsigned int crtc_id;
 	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect */
-	uint32_t generation;
 
 	uint32_t x, y; /**< Position on the frameuffer */
 	uint32_t width, height;
@@ -111,7 +102,6 @@ typedef struct _drmModeCrtc {
 } drmModeCrtc, *drmModeCrtcPtr;
 
 typedef struct _drmModeEncoder {
-	uint32_t generation;
 	unsigned int encoder_id;
 	unsigned int encoder_type;
 	uint32_t crtc;
@@ -135,7 +125,6 @@ typedef enum {
 } drmModeSubPixel;
 
 typedef struct _drmModeConnector {
-	uint32_t generation;
 	unsigned int connector_id;
 	unsigned int encoder; /**< Encoder currently connected to */
 	unsigned int connector_type;
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index c20dacd..ca5e75a 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 d6fa4cc..65ff3f2 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;
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 40653b4..132c774 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -1033,7 +1033,6 @@ struct drm_mode_card_res {
 	int count_encoders;
 	int min_width, max_width;
 	int min_height, max_height;
-	uint32_t generation;
 };
 
 struct drm_mode_crtc {
@@ -1044,8 +1043,6 @@ struct drm_mode_crtc {
 
 	int x, y; /**< Position on the frameuffer */
 
-	uint32_t generation;
-
 	int count_connectors;
 	unsigned int connectors; /**< Connectors that are connected */
 
@@ -1058,8 +1055,6 @@ struct drm_mode_crtc {
 
 struct drm_mode_get_encoder {
 
-	uint32_t generation;
-
 	uint32_t encoder_type;
 	uint32_t encoder_id;
 
@@ -1090,8 +1085,6 @@ struct drm_mode_get_connector {
 	unsigned int connector_type;
 	unsigned int connector_type_id;
 
-	uint32_t generation;
-
 	unsigned int connection;
 	unsigned int mm_width, mm_height; /**< HxW in millimeters */
 	unsigned int subpixel;
-- 
2.7.4