From 52f9028c84baea81230dc673b756552e8e90aecd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 11:21:06 +1000
Subject: Initial import of modesetting for intel driver in DRM

---
 linux-core/drm_crtc.h | 428 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 428 insertions(+)
 create mode 100644 linux-core/drm_crtc.h

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
new file mode 100644
index 00000000..1be115d1
--- /dev/null
+++ b/linux-core/drm_crtc.h
@@ -0,0 +1,428 @@
+/*
+ * Copyright © 2006 Keith Packard
+ * Copyright © 2007 Intel Corporation
+ *   Jesse Barnes <jesse.barnes@intel.com>
+ */
+#ifndef __DRM_CRTC_H__
+#define __DRM_CRTC_H__
+
+#include <linux/i2c.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+#include "drmP.h"
+#include "drm.h"
+
+struct drm_device;
+
+/*
+ * Note on terminology:  here, for brevity and convenience, we refer to output
+ * control chips as 'CRTCs'.  They can control any type of output, VGA, LVDS,
+ * DVI, etc.  And 'screen' refers to the whole of the visible display, which
+ * may span multiple monitors (and therefore multiple CRTC and output
+ * structures).
+ */
+
+enum drm_mode_status {
+    MODE_OK	= 0,	/* Mode OK */
+    MODE_HSYNC,		/* hsync out of range */
+    MODE_VSYNC,		/* vsync out of range */
+    MODE_H_ILLEGAL,	/* mode has illegal horizontal timings */
+    MODE_V_ILLEGAL,	/* mode has illegal horizontal timings */
+    MODE_BAD_WIDTH,	/* requires an unsupported linepitch */
+    MODE_NOMODE,	/* no mode with a maching name */
+    MODE_NO_INTERLACE,	/* interlaced mode not supported */
+    MODE_NO_DBLESCAN,	/* doublescan mode not supported */
+    MODE_NO_VSCAN,	/* multiscan mode not supported */
+    MODE_MEM,		/* insufficient video memory */
+    MODE_VIRTUAL_X,	/* mode width too large for specified virtual size */
+    MODE_VIRTUAL_Y,	/* mode height too large for specified virtual size */
+    MODE_MEM_VIRT,	/* insufficient video memory given virtual size */
+    MODE_NOCLOCK,	/* no fixed clock available */
+    MODE_CLOCK_HIGH,	/* clock required is too high */
+    MODE_CLOCK_LOW,	/* clock required is too low */
+    MODE_CLOCK_RANGE,	/* clock/mode isn't in a ClockRange */
+    MODE_BAD_HVALUE,	/* horizontal timing was out of range */
+    MODE_BAD_VVALUE,	/* vertical timing was out of range */
+    MODE_BAD_VSCAN,	/* VScan value out of range */
+    MODE_HSYNC_NARROW,	/* horizontal sync too narrow */
+    MODE_HSYNC_WIDE,	/* horizontal sync too wide */
+    MODE_HBLANK_NARROW,	/* horizontal blanking too narrow */
+    MODE_HBLANK_WIDE,	/* horizontal blanking too wide */
+    MODE_VSYNC_NARROW,	/* vertical sync too narrow */
+    MODE_VSYNC_WIDE,	/* vertical sync too wide */
+    MODE_VBLANK_NARROW,	/* vertical blanking too narrow */
+    MODE_VBLANK_WIDE,	/* vertical blanking too wide */
+    MODE_PANEL,         /* exceeds panel dimensions */
+    MODE_INTERLACE_WIDTH, /* width too large for interlaced mode */
+    MODE_ONE_WIDTH,     /* only one width is supported */
+    MODE_ONE_HEIGHT,    /* only one height is supported */
+    MODE_ONE_SIZE,      /* only one resolution is supported */
+    MODE_NO_REDUCED,    /* monitor doesn't accept reduced blanking */
+    MODE_BAD = -2,	/* unspecified reason */
+    MODE_ERROR	= -1	/* error condition */
+};
+
+#define DRM_MODE_TYPE_BUILTIN	(1<<0)
+#define DRM_MODE_TYPE_CLOCK_C	((1<<1) | DRM_MODE_TYPE_BUILTIN)
+#define DRM_MODE_TYPE_CRTC_C	((1<<2) | DRM_MODE_TYPE_BUILTIN)
+#define DRM_MODE_TYPE_PREFERRED	(1<<3)
+#define DRM_MODE_TYPE_DEFAULT	(1<<4)
+#define DRM_MODE_TYPE_USERDEF	(1<<5)
+#define DRM_MODE_TYPE_DRIVER	(1<<6)
+
+#define DRM_MODE_TYPE_CLOCK_CRTC_C (DRM_MODE_TYPE_CLOCK_C | \
+				    DRM_MODE_TYPE_CRTC_C)
+
+#define DRM_DISPLAY_MODE_LEN 32
+
+#define DRM_MODE(nm, t, c, hd, hss, hse, ht, hsk, vd, vss, vse, vt, vs, f) \
+	.name = nm, .status = 0, .type = (t), .clock = (c), \
+	.hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
+	.htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
+	.vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
+	.vscan = (vs), .flags = (f)
+
+struct drm_display_mode {
+	/* Header */
+	struct list_head head;
+	char name[DRM_DISPLAY_MODE_LEN];
+	enum drm_mode_status status;
+	int type;
+
+	/* Proposed mode values */
+	int clock;
+	int hdisplay;
+	int hsync_start;
+	int hsync_end;
+	int htotal;
+	int hskew;
+	int vdisplay;
+	int vsync_start;
+	int vsync_end;
+	int vtotal;
+	int vscan;
+	unsigned int flags;
+
+	/* Actual mode we give to hw */
+	int clock_index;
+	int synth_clock;
+	int crtc_hdisplay;
+	int crtc_hblank_start;
+	int crtc_hblank_end;
+	int crtc_hsync_start;
+	int crtc_hsync_end;
+	int crtc_htotal;
+	int crtc_hskew;
+	int crtc_vdisplay;
+	int crtc_vblank_start;
+	int crtc_vblank_end;
+	int crtc_vsync_start;
+	int crtc_vsync_end;
+	int crtc_vtotal;
+	int crtc_hadjusted;
+	int crtc_vadjusted;
+
+	/* Driver private mode info */
+	int private_size;
+	int *private;
+	int private_flags;
+
+	int vrefresh;
+	float hsync;//, vrefresh;
+};
+
+/* Video mode flags */
+#define V_PHSYNC	(1<<0)
+#define V_NHSYNC	(1<<1)
+#define V_PVSYNC	(1<<2)
+#define V_NVSYNC	(1<<3)
+#define V_INTERLACE	(1<<4)
+#define V_DBLSCAN	(1<<5)
+#define V_CSYNC		(1<<6)
+#define V_PCSYNC	(1<<7)
+#define V_NCSYNC	(1<<8)
+#define V_HSKEW		(1<<9) /* hskew provided */
+#define V_BCAST		(1<<10)
+#define V_PIXMUX	(1<<11)
+#define V_DBLCLK	(1<<12)
+#define V_CLKDIV2	(1<<13)
+
+#define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */
+#define DPMSModeOn 0
+#define DPMSModeStandby 1
+#define DPMSModeSuspend 2
+#define DPMSModeOff 3
+
+enum drm_output_status {
+	output_status_connected,
+	output_status_disconnected,
+	output_status_unknown,
+};
+
+enum subpixel_order {
+	SubPixelUnknown = 0,
+	SubPixelHorizontalRGB,
+	SubPixelHorizontalBGR,
+	SubPixelVerticalRGB,
+	SubPixelVerticalBGR,
+	SubPixelNone,
+};
+
+struct drm_framebuffer {
+	struct drm_device *dev;
+	struct list_head head;
+	unsigned int pitch;
+	unsigned long offset;
+	unsigned int width;
+	unsigned int height;
+	/* depth can be 15 or 16 */
+	unsigned int depth;
+	int bits_per_pixel;
+	int flags;
+};
+struct drm_crtc;
+struct drm_output;
+
+/**
+ * drm_crtc_funcs - control CRTCs for a given device
+ * @dpms: control display power levels
+ * @save: save CRTC state
+ * @resore: restore CRTC state
+ * @lock: lock the CRTC
+ * @unlock: unlock the CRTC
+ * @shadow_allocate: allocate shadow pixmap
+ * @shadow_create: create shadow pixmap for rotation support
+ * @shadow_destroy: free shadow pixmap
+ * @mode_fixup: fixup proposed mode
+ * @mode_set: set the desired mode on the CRTC
+ * @gamma_set: specify color ramp for CRTC
+ * @cleanup: cleanup driver private state prior to close
+ *
+ * The drm_crtc_funcs structure is the central CRTC management structure
+ * in the DRM.  Each CRTC controls one or more outputs (note that the name
+ * CRTC is simply historical, a CRTC may control LVDS, VGA, DVI, TV out, etc.
+ * outputs, not just CRTs).
+ *
+ * Each driver is responsible for filling out this structure at startup time,
+ * in addition to providing other modesetting features, like i2c and DDC
+ * bus accessors.
+ */
+struct drm_crtc_funcs {
+	/*
+	 * Control power levels on the CRTC.  If the mode passed in is
+	 * unsupported, the provider must use the next lowest power level.
+	 */
+	void (*dpms)(struct drm_crtc *crtc, int mode);
+
+	/* JJJ:  Are these needed? */
+	/* Save CRTC state */
+	void (*save)(struct drm_crtc *crtc); /* suspend? */
+	/* Restore CRTC state */
+	void (*restore)(struct drm_crtc *crtc); /* resume? */
+	bool (*lock)(struct drm_crtc *crtc);
+	void (*unlock)(struct drm_crtc *crtc);
+
+	void (*prepare)(struct drm_crtc *crtc);
+	void (*commit)(struct drm_crtc *crtc);
+
+	/* Provider can fixup or change mode timings before modeset occurs */
+	bool (*mode_fixup)(struct drm_crtc *crtc,
+			   struct drm_display_mode *mode,
+			   struct drm_display_mode *adjusted_mode);
+	/* Actually set the mode */
+	void (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode,
+			 struct drm_display_mode *adjusted_mode, int x, int y);
+	/* Set gamma on the CRTC */
+	void (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
+			  int size);
+	/* Driver cleanup routine */
+	void (*cleanup)(struct drm_crtc *crtc);
+};
+
+/**
+ * drm_crtc - central CRTC control structure
+ * @enabled: is this CRTC enabled?
+ * @x: x position on screen
+ * @y: y position on screen
+ * @desired_mode: new desired mode
+ * @desired_x: desired x for desired_mode
+ * @desired_y: desired y for desired_mode
+ * @funcs: CRTC control functions
+ * @driver_private: arbitrary driver data
+ *
+ * Each CRTC may have one or more outputs associated with it.  This structure
+ * allows the CRTC to be controlled.
+ */
+struct drm_crtc {
+	struct drm_device *dev;
+	struct list_head head;
+
+	/* framebuffer the CRTC is currently bound to */
+	struct drm_framebuffer *fb;
+
+	bool enabled;
+
+	/* JJJ: are these needed? */
+	bool cursor_in_range;
+	bool cursor_shown;
+
+	struct drm_display_mode mode;
+
+	int x, y;
+	struct drm_display_mode desired_mode;
+	int desired_x, desired_y;
+	const struct drm_crtc_funcs *funcs;
+	void *driver_private;
+
+	/* RRCrtcPtr randr_crtc? */
+};
+
+extern struct drm_crtc *drm_crtc_create(struct drm_device *dev,
+					const struct drm_crtc_funcs *funcs);
+
+/**
+ * drm_output_funcs - control outputs on a given device
+ * @init: setup this output
+ * @dpms: set power state (see drm_crtc_funcs above)
+ * @save: save output state
+ * @restore: restore output state
+ * @mode_valid: is this mode valid on the given output?
+ * @mode_fixup: try to fixup proposed mode for this output
+ * @mode_set: set this mode
+ * @detect: is this output active?
+ * @get_modes: get mode list for this output
+ * @set_property: property for this output may need update
+ * @cleanup: output is going away, cleanup
+ *
+ * Each CRTC may have one or more outputs attached to it.  The functions
+ * below allow the core DRM code to control outputs, enumerate available modes,
+ * etc.
+ */
+struct drm_output_funcs {
+	void (*init)(struct drm_output *output);
+	void (*dpms)(struct drm_output *output, int mode);
+	void (*save)(struct drm_output *output);
+	void (*restore)(struct drm_output *output);
+	int (*mode_valid)(struct drm_output *output,
+			  struct drm_display_mode *mode);
+	bool (*mode_fixup)(struct drm_output *output,
+			   struct drm_display_mode *mode,
+			   struct drm_display_mode *adjusted_mode);
+	void (*prepare)(struct drm_output *output);
+	void (*commit)(struct drm_output *output);
+	void (*mode_set)(struct drm_output *output,
+			 struct drm_display_mode *mode,
+			 struct drm_display_mode *adjusted_mode);
+	enum drm_output_status (*detect)(struct drm_output *output);
+	int (*get_modes)(struct drm_output *output);
+	/* JJJ: type checking for properties via property value type */
+	bool (*set_property)(struct drm_output *output, int prop, void *val);
+	void (*cleanup)(struct drm_output *output);
+};
+
+#define DRM_OUTPUT_LEN 32
+/**
+ * drm_output - central DRM output control structure
+ * @crtc: CRTC this output is currently connected to, NULL if none
+ * @possible_crtcs: bitmap of CRTCS this output could be attached to
+ * @possible_clones: bitmap of possible outputs this output could clone
+ * @interlace_allowed: can this output handle interlaced modes?
+ * @doublescan_allowed: can this output handle doublescan?
+ * @available_modes: modes available on this output (from get_modes() + user)
+ * @initial_x: initial x position for this output
+ * @initial_y: initial y position for this output
+ * @status: output connected?
+ * @subpixel_order: for this output
+ * @mm_width: displayable width of output in mm
+ * @mm_height: displayable height of output in mm
+ * @name: name of output (should be one of a few standard names)
+ * @funcs: output control functions
+ * @driver_private: private driver data
+ *
+ * Each output may be connected to one or more CRTCs, or may be clonable by
+ * another output if they can share a CRTC.  Each output also has a specific
+ * position in the broader display (referred to as a 'screen' though it could
+ * span multiple monitors).
+ */
+struct drm_output {
+	struct drm_device *dev;
+	struct list_head head;
+	struct drm_crtc *crtc;
+	unsigned long possible_crtcs;
+	unsigned long possible_clones;
+	bool interlace_allowed;
+	bool doublescan_allowed;
+	spinlock_t modes_lock;
+	struct list_head modes; /* list of modes on this output */
+	/*
+	  OptionInfoPtr options;
+	  XF86ConfMonitorPtr conf_monitor;
+	 */
+	int initial_x, initial_y;
+	enum drm_output_status status;
+
+	/* these are modes added by probing with DDC or the BIOS */
+	struct list_head probed_modes;
+	
+	/* xf86MonPtr MonInfo; */
+	enum subpixel_order subpixel_order;
+	int mm_width, mm_height;
+	char name[DRM_OUTPUT_LEN];
+	const struct drm_output_funcs *funcs;
+	void *driver_private;
+	/* RROutputPtr randr_output? */
+};
+
+/**
+ * struct drm_crtc_config_funcs - configure CRTCs for a given screen layout
+ * @resize: adjust CRTCs as necessary for the proposed layout
+ *
+ * Currently only a resize hook is available.  DRM will call back into the
+ * driver with a new screen width and height.  If the driver can't support
+ * the proposed size, it can return false.  Otherwise it should adjust
+ * the CRTC<->output mappings as needed and update its view of the screen.
+ */
+struct drm_crtc_config_funcs {
+	bool (*resize)(struct drm_device *dev, int width, int height);
+};
+
+/**
+ * drm_crtc_config - CRTC configuration control structure
+ *
+ */
+struct drm_crtc_config {
+	spinlock_t config_lock;
+	/* this is limited to one for now */
+	int num_fb;
+	struct list_head fb_list;
+	int num_output;
+	struct list_head output_list;
+
+	/* int compat_output? */
+	int num_crtc;
+	struct list_head crtc_list;
+
+	int min_width, min_height;
+	int max_width, max_height;
+	/* DamagePtr rotationDamage? */
+	/* DGA stuff? */
+	struct drm_crtc_config_funcs *funcs;
+};
+
+struct drm_output *drm_output_create(struct drm_device *dev,
+				     const struct drm_output_funcs *funcs,
+				     const char *name);
+void drm_output_destroy(struct drm_output *output);
+bool drm_output_rename(struct drm_output *output, const char *name);
+
+int drm_add_edid_modes(struct drm_output *output,
+			struct i2c_adapter *adapter);
+void drm_mode_probed_add(struct drm_output *output, struct drm_display_mode *mode);
+void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode);
+extern struct drm_display_mode *drm_mode_duplicate(struct drm_display_mode *mode);
+extern void drm_mode_debug_printmodeline(struct drm_device *dev,
+					 struct drm_display_mode *mode);
+extern void drm_crtc_config_init(struct drm_device *dev);
+extern void drm_crtc_config_cleanup(struct drm_device *dev);
+extern void drm_disable_unused_functions(struct drm_device *dev);
+#endif /* __DRM_CRTC_H__ */
-- 
cgit v1.2.3


From 5bffbd6e275efffbb649c20c528a11412ccf99cd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 13:34:50 +1000
Subject: initial userspace interface to get modes

---
 linux-core/drm_crtc.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 1be115d1..003946bc 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -9,6 +9,7 @@
 #include <linux/i2c.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
+#include <linux/idr.h>
 #include "drmP.h"
 #include "drm.h"
 
@@ -86,6 +87,7 @@ struct drm_display_mode {
 	/* Header */
 	struct list_head head;
 	char name[DRM_DISPLAY_MODE_LEN];
+	int mode_id;
 	enum drm_mode_status status;
 	int type;
 
@@ -392,6 +394,7 @@ struct drm_crtc_config_funcs {
  */
 struct drm_crtc_config {
 	spinlock_t config_lock;
+	struct idr mode_idr;
 	/* this is limited to one for now */
 	int num_fb;
 	struct list_head fb_list;
@@ -419,10 +422,20 @@ int drm_add_edid_modes(struct drm_output *output,
 			struct i2c_adapter *adapter);
 void drm_mode_probed_add(struct drm_output *output, struct drm_display_mode *mode);
 void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode);
-extern struct drm_display_mode *drm_mode_duplicate(struct drm_display_mode *mode);
+extern struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
+						   struct drm_display_mode *mode);
 extern void drm_mode_debug_printmodeline(struct drm_device *dev,
 					 struct drm_display_mode *mode);
 extern void drm_crtc_config_init(struct drm_device *dev);
 extern void drm_crtc_config_cleanup(struct drm_device *dev);
 extern void drm_disable_unused_functions(struct drm_device *dev);
+
+extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
+extern void drm_crtc_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
+
+/* IOCTLs */
+extern int drm_mode_getresources(struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg);
+
 #endif /* __DRM_CRTC_H__ */
+
-- 
cgit v1.2.3


From 7bb112fecadc6fe42e5828b861600691071ccd91 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 17:06:42 +1000
Subject: checkpoint commit: added getresources, crtc and output

This adds the user interfaces from Jakob and hooks them up for 3 ioctls
GetResources, GetCrtc and GetOutput.

I've made the ids for everything fbs, crtcs, outputs and modes go via idr as
per krh's suggestion on irc as it make the code nice and consistent.
---
 linux-core/drm_crtc.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 003946bc..e608b462 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -74,8 +74,6 @@ enum drm_mode_status {
 #define DRM_MODE_TYPE_CLOCK_CRTC_C (DRM_MODE_TYPE_CLOCK_C | \
 				    DRM_MODE_TYPE_CRTC_C)
 
-#define DRM_DISPLAY_MODE_LEN 32
-
 #define DRM_MODE(nm, t, c, hd, hss, hse, ht, hsk, vd, vss, vse, vt, vs, f) \
 	.name = nm, .status = 0, .type = (t), .clock = (c), \
 	.hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
@@ -173,6 +171,7 @@ enum subpixel_order {
 struct drm_framebuffer {
 	struct drm_device *dev;
 	struct list_head head;
+	int id; /* idr assigned */
 	unsigned int pitch;
 	unsigned long offset;
 	unsigned int width;
@@ -259,6 +258,8 @@ struct drm_crtc {
 	struct drm_device *dev;
 	struct list_head head;
 
+	int id; /* idr assigned */
+
 	/* framebuffer the CRTC is currently bound to */
 	struct drm_framebuffer *fb;
 
@@ -350,6 +351,7 @@ struct drm_output {
 	struct drm_device *dev;
 	struct list_head head;
 	struct drm_crtc *crtc;
+	int id; /* idr assigned */
 	unsigned long possible_crtcs;
 	unsigned long possible_clones;
 	bool interlace_allowed;
@@ -394,7 +396,7 @@ struct drm_crtc_config_funcs {
  */
 struct drm_crtc_config {
 	spinlock_t config_lock;
-	struct idr mode_idr;
+	struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, output, modes - just makes life easier */
 	/* this is limited to one for now */
 	int num_fb;
 	struct list_head fb_list;
@@ -437,5 +439,9 @@ extern void drm_crtc_mode_destroy(struct drm_device *dev, struct drm_display_mod
 extern int drm_mode_getresources(struct inode *inode, struct file *filp,
 				 unsigned int cmd, unsigned long arg);
 
+extern int drm_mode_getcrtc(struct inode *inode, struct file *filp,
+			    unsigned int cmd, unsigned long arg);
+extern int drm_mode_getoutput(struct inode *inode, struct file *filp,
+			      unsigned int cmd, unsigned long arg);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From b4094864f188a1346cc3b51bcb457beeacefbf82 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 18:01:02 +1000
Subject: checkpoint commit: implement SetCrtc so modes can in theory be set
 from user

This hooks up the userspace mode set it "seems" to work.
---
 linux-core/drm_crtc.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index e608b462..a2c552e6 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -272,7 +272,7 @@ struct drm_crtc {
 	struct drm_display_mode mode;
 
 	int x, y;
-	struct drm_display_mode desired_mode;
+	struct drm_display_mode *desired_mode;
 	int desired_x, desired_y;
 	const struct drm_crtc_funcs *funcs;
 	void *driver_private;
@@ -443,5 +443,7 @@ extern int drm_mode_getcrtc(struct inode *inode, struct file *filp,
 			    unsigned int cmd, unsigned long arg);
 extern int drm_mode_getoutput(struct inode *inode, struct file *filp,
 			      unsigned int cmd, unsigned long arg);
+extern int drm_mode_setcrtc(struct inode *inode, struct file *filp,
+			    unsigned int cmd, unsigned long arg);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From a35ba455b27b72f1ee3e1136ca6659f672ada4fa Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Sat, 7 Apr 2007 19:22:39 -0700
Subject: make drmP.h include drm_crtc.h for CRTC related stuff. fixup
 drm_crtc.c so it matches VGA and other outputs properly. make drm_crtc.c less
 verbose. add function declarations in drm_crtc.h for other files.

---
 linux-core/drm_crtc.h | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index a2c552e6..21908f0c 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -10,8 +10,6 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/idr.h>
-#include "drmP.h"
-#include "drm.h"
 
 struct drm_device;
 
@@ -79,7 +77,7 @@ enum drm_mode_status {
 	.hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
 	.htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
 	.vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
-	.vscan = (vs), .flags = (f)
+	.vscan = (vs), .flags = (f), .vrefresh = 0
 
 struct drm_display_mode {
 	/* Header */
@@ -128,7 +126,7 @@ struct drm_display_mode {
 	int private_flags;
 
 	int vrefresh;
-	float hsync;//, vrefresh;
+	float hsync;
 };
 
 /* Video mode flags */
@@ -417,13 +415,13 @@ struct drm_crtc_config {
 struct drm_output *drm_output_create(struct drm_device *dev,
 				     const struct drm_output_funcs *funcs,
 				     const char *name);
-void drm_output_destroy(struct drm_output *output);
-bool drm_output_rename(struct drm_output *output, const char *name);
+extern void drm_output_destroy(struct drm_output *output);
+extern bool drm_output_rename(struct drm_output *output, const char *name);
 
-int drm_add_edid_modes(struct drm_output *output,
+extern int drm_add_edid_modes(struct drm_output *output,
 			struct i2c_adapter *adapter);
-void drm_mode_probed_add(struct drm_output *output, struct drm_display_mode *mode);
-void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode);
+extern void drm_mode_probed_add(struct drm_output *output, struct drm_display_mode *mode);
+extern void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode);
 extern struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
 						   struct drm_display_mode *mode);
 extern void drm_mode_debug_printmodeline(struct drm_device *dev,
@@ -445,5 +443,18 @@ extern int drm_mode_getoutput(struct inode *inode, struct file *filp,
 			      unsigned int cmd, unsigned long arg);
 extern int drm_mode_setcrtc(struct inode *inode, struct file *filp,
 			    unsigned int cmd, unsigned long arg);
+extern void drm_mode_list_concat(struct list_head *head,
+				 struct list_head *new);
+extern void drm_mode_validate_size(struct drm_device *dev,
+				   struct list_head *mode_list,
+				   int maxX, int maxY, int maxPitch);
+extern void drm_mode_prune_invalid(struct drm_device *dev,
+				   struct list_head *mode_list, bool verbose);
+extern void drm_mode_sort(struct list_head *mode_list);
+extern int drm_mode_vrefresh(struct drm_display_mode *mode);
+extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
+				  int adjust_flags);
+extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
+
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From b50bda002b824efb24e18e8d514ff0ca763c15b9 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Tue, 10 Apr 2007 18:44:47 +1000
Subject: add addfb/rmfb ioctls

Originally from Jakob, cleaned up by airlied.
---
 linux-core/drm_crtc.h | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 21908f0c..36d5f316 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -178,6 +178,7 @@ struct drm_framebuffer {
 	unsigned int depth;
 	int bits_per_pixel;
 	int flags;
+        struct drm_buffer_object *bo;
 };
 struct drm_crtc;
 struct drm_output;
@@ -432,17 +433,6 @@ extern void drm_disable_unused_functions(struct drm_device *dev);
 
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern void drm_crtc_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
-
-/* IOCTLs */
-extern int drm_mode_getresources(struct inode *inode, struct file *filp,
-				 unsigned int cmd, unsigned long arg);
-
-extern int drm_mode_getcrtc(struct inode *inode, struct file *filp,
-			    unsigned int cmd, unsigned long arg);
-extern int drm_mode_getoutput(struct inode *inode, struct file *filp,
-			      unsigned int cmd, unsigned long arg);
-extern int drm_mode_setcrtc(struct inode *inode, struct file *filp,
-			    unsigned int cmd, unsigned long arg);
 extern void drm_mode_list_concat(struct list_head *head,
 				 struct list_head *new);
 extern void drm_mode_validate_size(struct drm_device *dev,
@@ -454,7 +444,20 @@ extern void drm_mode_sort(struct list_head *mode_list);
 extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
-extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 
+/* IOCTLs */
+extern int drm_mode_getresources(struct inode *inode, struct file *filp,
+				 unsigned int cmd, unsigned long arg);
+
+extern int drm_mode_getcrtc(struct inode *inode, struct file *filp,
+			    unsigned int cmd, unsigned long arg);
+extern int drm_mode_getoutput(struct inode *inode, struct file *filp,
+			      unsigned int cmd, unsigned long arg);
+extern int drm_mode_setcrtc(struct inode *inode, struct file *filp,
+			    unsigned int cmd, unsigned long arg);
+extern int drm_mode_addfb(struct inode *inode, struct file *filp,
+                          unsigned int cmd, unsigned long arg);
+extern int drm_mode_rmfb(struct inode *inode, struct file *filp,
+                         unsigned int cmd, unsigned long arg);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From ed0ebd9d3da2e5c4e8053b6e7a7d2898b184f857 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@airlied2.(none)>
Date: Tue, 10 Apr 2007 18:56:02 +1000
Subject: make crtc_config be named mode_config

X.org calls this crtc_config but this is a bad name and will confuse ppl later
(and me now :-)
---
 linux-core/drm_crtc.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 36d5f316..19d7cf51 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -377,7 +377,7 @@ struct drm_output {
 };
 
 /**
- * struct drm_crtc_config_funcs - configure CRTCs for a given screen layout
+ * struct drm_mode_config_funcs - configure CRTCs for a given screen layout
  * @resize: adjust CRTCs as necessary for the proposed layout
  *
  * Currently only a resize hook is available.  DRM will call back into the
@@ -385,15 +385,15 @@ struct drm_output {
  * the proposed size, it can return false.  Otherwise it should adjust
  * the CRTC<->output mappings as needed and update its view of the screen.
  */
-struct drm_crtc_config_funcs {
+struct drm_mode_config_funcs {
 	bool (*resize)(struct drm_device *dev, int width, int height);
 };
 
 /**
- * drm_crtc_config - CRTC configuration control structure
+ * drm_mode_config - Mode configuration control structure
  *
  */
-struct drm_crtc_config {
+struct drm_mode_config {
 	spinlock_t config_lock;
 	struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, output, modes - just makes life easier */
 	/* this is limited to one for now */
@@ -410,7 +410,7 @@ struct drm_crtc_config {
 	int max_width, max_height;
 	/* DamagePtr rotationDamage? */
 	/* DGA stuff? */
-	struct drm_crtc_config_funcs *funcs;
+	struct drm_mode_config_funcs *funcs;
 };
 
 struct drm_output *drm_output_create(struct drm_device *dev,
@@ -427,8 +427,8 @@ extern struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
 						   struct drm_display_mode *mode);
 extern void drm_mode_debug_printmodeline(struct drm_device *dev,
 					 struct drm_display_mode *mode);
-extern void drm_crtc_config_init(struct drm_device *dev);
-extern void drm_crtc_config_cleanup(struct drm_device *dev);
+extern void drm_mode_config_init(struct drm_device *dev);
+extern void drm_mode_config_cleanup(struct drm_device *dev);
 extern void drm_disable_unused_functions(struct drm_device *dev);
 
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
-- 
cgit v1.2.3


From 65f465ed5ad3caf773658bb2832785c963b987f6 Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Tue, 10 Apr 2007 14:49:49 +1000
Subject: fixup numerous issues with adding framebuffer support

This still isn't perfect but it fixes a few oopses and cleans up
some of the tabs and bugs in the original fb limit code
---
 linux-core/drm_crtc.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 19d7cf51..142e0ecb 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -178,7 +178,7 @@ struct drm_framebuffer {
 	unsigned int depth;
 	int bits_per_pixel;
 	int flags;
-        struct drm_buffer_object *bo;
+	struct drm_buffer_object *bo;
 };
 struct drm_crtc;
 struct drm_output;
@@ -456,8 +456,8 @@ extern int drm_mode_getoutput(struct inode *inode, struct file *filp,
 extern int drm_mode_setcrtc(struct inode *inode, struct file *filp,
 			    unsigned int cmd, unsigned long arg);
 extern int drm_mode_addfb(struct inode *inode, struct file *filp,
-                          unsigned int cmd, unsigned long arg);
+			  unsigned int cmd, unsigned long arg);
 extern int drm_mode_rmfb(struct inode *inode, struct file *filp,
-                         unsigned int cmd, unsigned long arg);
+			 unsigned int cmd, unsigned long arg);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 183cbd92dd016f8935f9b58ef9345fde1391173e Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 10 Apr 2007 09:47:37 -0700
Subject: Finish bringing in LVDS code, re-add to Makefile.  Needed other
 changes too:   - move EDID structures to drm_edid.h   - add EDID info
 structure to drm_output   - add a few routines to intel_display for getting
 current mode info   - add some prototypes to intel_drv.h and drm_crtc.h

---
 linux-core/drm_crtc.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 21908f0c..775d21e7 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -369,6 +369,7 @@ struct drm_output {
 	/* xf86MonPtr MonInfo; */
 	enum subpixel_order subpixel_order;
 	int mm_width, mm_height;
+	struct edid *monitor_info;
 	char name[DRM_OUTPUT_LEN];
 	const struct drm_output_funcs *funcs;
 	void *driver_private;
@@ -455,6 +456,10 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
+extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
+extern void drm_framebuffer_set_object(struct drm_device *dev,
+				       unsigned long handle);
+extern bool drm_set_desired_modes(struct drm_device *dev);
 
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 32f6a58db216f23a7c71ca9c7eda56aaa8293078 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@airlied2.(none)>
Date: Wed, 11 Apr 2007 16:33:03 +1000
Subject: add initial drm_fb framebuffer

So far I can load fbcon, once I use my miniglx to add a framebuffer.
fbcon doesn't show anything on screen but baby steps and all that.
---
 linux-core/drm_crtc.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 57bfb10b..d5d256d4 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -11,6 +11,8 @@
 #include <linux/types.h>
 #include <linux/idr.h>
 
+#include <linux/fb.h>
+
 struct drm_device;
 
 /*
@@ -179,6 +181,9 @@ struct drm_framebuffer {
 	int bits_per_pixel;
 	int flags;
 	struct drm_buffer_object *bo;
+	void *fbdev;
+	u32 pseudo_palette[17];
+	void *virtual_base;
 };
 struct drm_crtc;
 struct drm_output;
@@ -412,6 +417,7 @@ struct drm_mode_config {
 	/* DamagePtr rotationDamage? */
 	/* DGA stuff? */
 	struct drm_mode_config_funcs *funcs;
+	int fb_base;
 };
 
 struct drm_output *drm_output_create(struct drm_device *dev,
-- 
cgit v1.2.3


From 78598fdaa8b23a199880a63b79f17cfd7f14cb0f Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed, 11 Apr 2007 07:07:54 -0700
Subject: Various changes for in-kernel modesetting:   - allow
 drm_buffer_object_create to be called w/o dev_mapping   - fixup i915 init
 code to allocate memory, fb and set modes right   - pass fb to
 drm_initial_config for setup   - change some debug output to make it easier
 to spot   - fixup lvds code to use DDC probing correctly

---
 linux-core/drm_crtc.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d5d256d4..54c508c5 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -452,10 +452,13 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
-extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
+extern bool drm_initial_config(struct drm_device *dev,
+			       struct drm_framebuffer *fb, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
 				       unsigned long handle);
 extern bool drm_set_desired_modes(struct drm_device *dev);
+extern int drmfb_probe(struct drm_device *dev, struct drm_framebuffer *fb);
+extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 
 /* IOCTLs */
 extern int drm_mode_getresources(struct inode *inode, struct file *filp,
-- 
cgit v1.2.3


From a81558d8b3ee17fbf46e32b10732e22fcd997858 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 12 Apr 2007 08:45:40 +1000
Subject: add getfb ioctl

---
 linux-core/drm_crtc.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 54c508c5..c02dcedc 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -474,5 +474,7 @@ extern int drm_mode_addfb(struct inode *inode, struct file *filp,
 			  unsigned int cmd, unsigned long arg);
 extern int drm_mode_rmfb(struct inode *inode, struct file *filp,
 			 unsigned int cmd, unsigned long arg);
+extern int drm_mode_getfb(struct inode *inode, struct file *filp,
+			  unsigned int cmd, unsigned long arg);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 79aa1d54746f33c33ffbf98fb96ccbf88c3cb390 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 17 Apr 2007 18:16:38 +1000
Subject: another large overhaul of interactions with userspace...

We need to keep a list of user created fbs to nuke on master exit.
We also need to use the bo properly.
---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index c02dcedc..584788ee 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -184,6 +184,7 @@ struct drm_framebuffer {
 	void *fbdev;
 	u32 pseudo_palette[17];
 	void *virtual_base;
+	struct list_head filp_head;
 };
 struct drm_crtc;
 struct drm_output;
-- 
cgit v1.2.3


From 4e4d9cbeb3f52b605e46aad8ae1a947ca236079f Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Tue, 17 Apr 2007 10:00:37 -0700
Subject: Move initial framebuffer allocation and configuration to
 drm_initial_config, remove i915_driver_load fb related stuff.  Add a small
 helper for setting up outputs.

---
 linux-core/drm_crtc.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index c02dcedc..560c38f4 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -452,8 +452,7 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
-extern bool drm_initial_config(struct drm_device *dev,
-			       struct drm_framebuffer *fb, bool cangrow);
+extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
 				       unsigned long handle);
 extern bool drm_set_desired_modes(struct drm_device *dev);
-- 
cgit v1.2.3


From 5587961cfeff86d8368ff03867a1f0667e4a64d4 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Wed, 18 Apr 2007 11:49:42 -0700
Subject: Document main drm_crtc.c functions, and rename drm_crtc_mode_create
 to drm_mode_create to be consistent with the other functions.  Also document
 where we need locking fixes and what the locks are for.

---
 linux-core/drm_crtc.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index f8d7da26..7128afe1 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -361,7 +361,7 @@ struct drm_output {
 	unsigned long possible_clones;
 	bool interlace_allowed;
 	bool doublescan_allowed;
-	spinlock_t modes_lock;
+	spinlock_t modes_lock; /* protects modes and probed_modes lists */
 	struct list_head modes; /* list of modes on this output */
 	/*
 	  OptionInfoPtr options;
@@ -401,7 +401,7 @@ struct drm_mode_config_funcs {
  *
  */
 struct drm_mode_config {
-	spinlock_t config_lock;
+	spinlock_t config_lock; /* protects configuration and IDR */
 	struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, output, modes - just makes life easier */
 	/* this is limited to one for now */
 	int num_fb;
@@ -439,8 +439,8 @@ extern void drm_mode_config_init(struct drm_device *dev);
 extern void drm_mode_config_cleanup(struct drm_device *dev);
 extern void drm_disable_unused_functions(struct drm_device *dev);
 
-extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
-extern void drm_crtc_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
+extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
+extern void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
 extern void drm_mode_list_concat(struct list_head *head,
 				 struct list_head *new);
 extern void drm_mode_validate_size(struct drm_device *dev,
-- 
cgit v1.2.3


From 9ca4932054a5bde5dda500ea346ad101bb5c80a0 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Fri, 20 Apr 2007 16:32:58 -0700
Subject: Add a mode name generation wrapper to make name format changes
 easier.

---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 7128afe1..e5a89b17 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -437,6 +437,7 @@ extern void drm_mode_debug_printmodeline(struct drm_device *dev,
 					 struct drm_display_mode *mode);
 extern void drm_mode_config_init(struct drm_device *dev);
 extern void drm_mode_config_cleanup(struct drm_device *dev);
+extern void drm_mode_set_name(struct drm_display_mode *mode);
 extern void drm_disable_unused_functions(struct drm_device *dev);
 
 extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
-- 
cgit v1.2.3


From eb892fb09dc2e5206f2461e8b258495c7cef904a Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Fri, 20 Apr 2007 17:59:30 -0700
Subject: Add a monitor information structure separate from the EDID data for
 tracking monitor limits, etc.

---
 linux-core/drm_crtc.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index e5a89b17..e3e97ad8 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -168,6 +168,59 @@ enum subpixel_order {
 	SubPixelNone,
 };
 
+/*
+ * Describes a given display (e.g. CRT or flat panel) and its limitations.
+ */
+struct drm_display_info {
+	char name[DRM_DISPLAY_INFO_LEN];
+	/* Input info */
+	bool serration_vsync;
+	bool sync_on_green;
+	bool composite_sync;
+	bool separate_syncs;
+	bool blank_to_black;
+	unsigned char video_level;
+	bool digital;
+	/* Physical size */
+        unsigned int width_mm;
+	unsigned int height_mm;
+
+	/* Display parameters */
+	unsigned char gamma; /* FIXME: storage format */
+	bool gtf_supported;
+	bool standard_color;
+	enum {
+		monochrome,
+		rgb,
+		other,
+		unknown,
+	} display_type;
+	bool active_off_supported;
+	bool suspend_supported;
+	bool standby_supported;
+
+	/* Color info FIXME: storage format */
+	unsigned short redx, redy;
+	unsigned short greenx, greeny;
+	unsigned short bluex, bluey;
+	unsigned short whitex, whitey;
+
+	/* Clock limits FIXME: storage format */
+	unsigned int min_vfreq, max_vfreq;
+	unsigned int min_hfreq, max_hfreq;
+	unsigned int pixel_clock;
+
+	/* White point indices FIXME: storage format */
+	unsigned int wpx1, wpy1;
+	unsigned int wpgamma1;
+	unsigned int wpx2, wpy2;
+	unsigned int wpgamma2;
+
+	/* Preferred mode (if any) */
+	struct drm_display_mode *preferred_mode;
+	struct edid *raw_edid; /* if any */
+};
+
 struct drm_framebuffer {
 	struct drm_device *dev;
 	struct list_head head;
@@ -376,7 +429,7 @@ struct drm_output {
 	/* xf86MonPtr MonInfo; */
 	enum subpixel_order subpixel_order;
 	int mm_width, mm_height;
-	struct edid *monitor_info;
+	struct drm_display_info *monitor_info; /* if any */
 	char name[DRM_OUTPUT_LEN];
 	const struct drm_output_funcs *funcs;
 	void *driver_private;
-- 
cgit v1.2.3


From 97b5599982c76915b0750c6ef0a270639b02a6f2 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Fri, 20 Apr 2007 18:00:44 -0700
Subject: Oops, edid data should just be a char *, as edid.h is private to
 edid.c (we can just recombine them now).

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index e3e97ad8..149bc31f 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -218,7 +218,7 @@ struct drm_display_info {
 
 	/* Preferred mode (if any) */
 	struct drm_display_mode *preferred_mode;
-	struct edid *raw_edid; /* if any */
+	char *raw_edid; /* if any */
 };
 
 struct drm_framebuffer {
-- 
cgit v1.2.3


From ceb44021ad7755721acc3c0307c54009b666442e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Mon, 23 Apr 2007 11:42:29 +1000
Subject: drm: make mode numbers no change by comparing probed modes

The mode list sets all the output modes to UNVERIFIED, then probes a new list,
If a mode is on the new list and not on the old, it adds it to the old,
if a mode is on the new list and old, it just updates the status to the new
mode status.
If a mode is on the old list and not on the new, prune invalid modes should
remove all UNVERIFIED modes
---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 149bc31f..a15ce0cf 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -59,6 +59,7 @@ enum drm_mode_status {
     MODE_ONE_HEIGHT,    /* only one height is supported */
     MODE_ONE_SIZE,      /* only one resolution is supported */
     MODE_NO_REDUCED,    /* monitor doesn't accept reduced blanking */
+    MODE_UNVERIFIED = -3, /* mode needs to reverified */
     MODE_BAD = -2,	/* unspecified reason */
     MODE_ERROR	= -1	/* error condition */
 };
-- 
cgit v1.2.3


From 89231953d108e74ee7b0eb99494ead1dd795d640 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 1 May 2007 13:16:29 +1000
Subject: Add support for user defined modes

This allows userspace to specify modes and add them to the modesetting
system and attach modes to outputs
---
 linux-core/drm_crtc.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index a15ce0cf..12c7eef1 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -87,6 +87,7 @@ struct drm_display_mode {
 	struct list_head head;
 	char name[DRM_DISPLAY_MODE_LEN];
 	int mode_id;
+	int output_count;
 	enum drm_mode_status status;
 	int type;
 
@@ -382,6 +383,7 @@ struct drm_output_funcs {
 	void (*cleanup)(struct drm_output *output);
 };
 
+#define DRM_OUTPUT_MAX_UMODES 16
 #define DRM_OUTPUT_LEN 32
 /**
  * drm_output - central DRM output control structure
@@ -417,6 +419,7 @@ struct drm_output {
 	bool doublescan_allowed;
 	spinlock_t modes_lock; /* protects modes and probed_modes lists */
 	struct list_head modes; /* list of modes on this output */
+
 	/*
 	  OptionInfoPtr options;
 	  XF86ConfMonitorPtr conf_monitor;
@@ -434,7 +437,8 @@ struct drm_output {
 	char name[DRM_OUTPUT_LEN];
 	const struct drm_output_funcs *funcs;
 	void *driver_private;
-	/* RROutputPtr randr_output? */
+
+	u32 user_mode_ids[DRM_OUTPUT_MAX_UMODES];
 };
 
 /**
@@ -467,6 +471,7 @@ struct drm_mode_config {
 	int num_crtc;
 	struct list_head crtc_list;
 
+	struct list_head usermode_list;
 	int min_width, min_height;
 	int max_width, max_height;
 	/* DamagePtr rotationDamage? */
@@ -480,6 +485,7 @@ struct drm_output *drm_output_create(struct drm_device *dev,
 				     const char *name);
 extern void drm_output_destroy(struct drm_output *output);
 extern bool drm_output_rename(struct drm_output *output, const char *name);
+extern void drm_fb_release(struct file *filp);
 
 extern int drm_add_edid_modes(struct drm_output *output,
 			struct i2c_adapter *adapter);
@@ -507,6 +513,8 @@ extern void drm_mode_sort(struct list_head *mode_list);
 extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
+extern void drm_mode_output_list_update(struct drm_output *output);
+
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
@@ -531,5 +539,14 @@ extern int drm_mode_rmfb(struct inode *inode, struct file *filp,
 			 unsigned int cmd, unsigned long arg);
 extern int drm_mode_getfb(struct inode *inode, struct file *filp,
 			  unsigned int cmd, unsigned long arg);
+extern int drm_mode_addmode(struct inode *inode, struct file *filp,
+			    unsigned int cmd, unsigned long arg);
+extern int drm_mode_rmmode(struct inode *inode, struct file *filp,
+			   unsigned int cmd, unsigned long arg);
+extern int drm_mode_attachmode(struct inode *inode, struct file *filp,
+			       unsigned int cmd, unsigned long arg);
+extern int drm_mode_detachmode(struct inode *inode, struct file *filp,
+			       unsigned int cmd, unsigned long arg);
+
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 5ce8aaae7251e60c078eda0a21894aae0e1d7a45 Mon Sep 17 00:00:00 2001
From: root <root@localhost.(none)>
Date: Thu, 17 May 2007 12:46:36 +0100
Subject: Large changes for fbdev support.

Change from DIRECTCOLOR to TRUECOLOR, and enable
support for PSEUDOCOLOR. DIRECTCOLOR support needs more work.

Add the ability to change the mode on the fbdev device.

Support depth 8, 15, 16 and 24 (and 32).

Add a /dev/fbX device per CRTC, but there's some code which
doesn't allocate the fbX device unless the output is actually
enabled. Read the code on this as it impacts the fbcon map flags.

Pick CRTC's based on the available outputs. More work could
be done here to match modes, so cloning could be achieved on
outputs. This fits more inline with what the X code does.
---
 linux-core/drm_crtc.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 12c7eef1..fa143e6e 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -294,8 +294,8 @@ struct drm_crtc_funcs {
 	void (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode,
 			 struct drm_display_mode *adjusted_mode, int x, int y);
 	/* Set gamma on the CRTC */
-	void (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
-			  int size);
+	void (*gamma_set)(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
+			  int regno);
 	/* Driver cleanup routine */
 	void (*cleanup)(struct drm_crtc *crtc);
 };
@@ -320,7 +320,7 @@ struct drm_crtc {
 
 	int id; /* idr assigned */
 
-	/* framebuffer the CRTC is currently bound to */
+	/* framebuffer the output is currently bound to */
 	struct drm_framebuffer *fb;
 
 	bool enabled;
@@ -439,6 +439,7 @@ struct drm_output {
 	void *driver_private;
 
 	u32 user_mode_ids[DRM_OUTPUT_MAX_UMODES];
+
 };
 
 /**
@@ -498,6 +499,7 @@ extern void drm_mode_debug_printmodeline(struct drm_device *dev,
 extern void drm_mode_config_init(struct drm_device *dev);
 extern void drm_mode_config_cleanup(struct drm_device *dev);
 extern void drm_mode_set_name(struct drm_display_mode *mode);
+extern bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2);
 extern void drm_disable_unused_functions(struct drm_device *dev);
 
 extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
@@ -519,8 +521,7 @@ extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
 				       unsigned long handle);
-extern bool drm_set_desired_modes(struct drm_device *dev);
-extern int drmfb_probe(struct drm_device *dev, struct drm_framebuffer *fb);
+extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 
 /* IOCTLs */
-- 
cgit v1.2.3


From 0c33a2cd2ec81478403d39b1b92aaa4431e7cf0a Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 18 May 2007 14:16:10 +0100
Subject: Move fbo creation to the specified fb driver which gives it a chance
 to allocate the memory from whichever buffer it wants to.

---
 linux-core/drm_crtc.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index fa143e6e..8dfd2e2b 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -521,8 +521,12 @@ extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
 				       unsigned long handle);
+extern struct drm_framebuffer *drm_framebuffer_create(struct drm_device *dev);
+extern void drm_framebuffer_destroy(struct drm_framebuffer *fb);
 extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
+extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
+		       int x, int y);
 
 /* IOCTLs */
 extern int drm_mode_getresources(struct inode *inode, struct file *filp,
-- 
cgit v1.2.3


From f89458722173b364b8c3c27788b6c61889da554c Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Date: Fri, 18 May 2007 09:40:01 -0700
Subject: Add locking.  The main lock is dev->mode_config.config_lock.  It
 should be held across any operations that modify mode lists, crtc config,
 output config, etc.  It should be taken at high level entry points (currently
 just initial config and user IOCTL).

Seems to work ok on my system, but needs more testing (with lockdep) and
review from some fresh eyes.
---
 linux-core/drm_crtc.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index fa143e6e..7ca8311b 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -417,7 +417,6 @@ struct drm_output {
 	unsigned long possible_clones;
 	bool interlace_allowed;
 	bool doublescan_allowed;
-	spinlock_t modes_lock; /* protects modes and probed_modes lists */
 	struct list_head modes; /* list of modes on this output */
 
 	/*
-- 
cgit v1.2.3


From 9ccb8440f393a395941b211ee87d9addcfa6d69a Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 20 Jul 2007 11:36:57 +0200
Subject: Changed mode config spinlock to mutex

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index e8a527b0..75db5b05 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -459,7 +459,7 @@ struct drm_mode_config_funcs {
  *
  */
 struct drm_mode_config {
-	spinlock_t config_lock; /* protects configuration and IDR */
+	struct mutex mutex; /* protects configuration and IDR */
 	struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, output, modes - just makes life easier */
 	/* this is limited to one for now */
 	int num_fb;
-- 
cgit v1.2.3


From ffb89d4c3b6650551aaab06076896540a78faddf Mon Sep 17 00:00:00 2001
From: Jerome Glisse <glisse@freedesktop.org>
Date: Fri, 9 Nov 2007 15:47:24 +0100
Subject: drm: split edid handling in get_edid & add_edid_mode

This way driver can get_edid in output status detection
(using all workaround which are in get_edid) and then provide
this edid data in get_mode callback of output.
---
 linux-core/drm_crtc.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d97cd196..9dd00b3d 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -487,8 +487,9 @@ extern void drm_output_destroy(struct drm_output *output);
 extern bool drm_output_rename(struct drm_output *output, const char *name);
 extern void drm_fb_release(struct file *filp);
 
-extern int drm_add_edid_modes(struct drm_output *output,
-			struct i2c_adapter *adapter);
+extern struct edid *drm_get_edid(struct drm_output *output,
+				 struct i2c_adapter *adapter);
+extern int drm_add_edid_modes(struct drm_output *output, struct edid *edid);
 extern void drm_mode_probed_add(struct drm_output *output, struct drm_display_mode *mode);
 extern void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode);
 extern struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
-- 
cgit v1.2.3


From 2520d3fd99636e493060d51b1c3287a5faac22bf Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 15 Nov 2007 16:52:04 +1100
Subject: modes: pass type to userspace for preferred showing

---
 linux-core/drm_crtc.h | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 9dd00b3d..0ddefc86 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -64,14 +64,6 @@ enum drm_mode_status {
     MODE_ERROR	= -1	/* error condition */
 };
 
-#define DRM_MODE_TYPE_BUILTIN	(1<<0)
-#define DRM_MODE_TYPE_CLOCK_C	((1<<1) | DRM_MODE_TYPE_BUILTIN)
-#define DRM_MODE_TYPE_CRTC_C	((1<<2) | DRM_MODE_TYPE_BUILTIN)
-#define DRM_MODE_TYPE_PREFERRED	(1<<3)
-#define DRM_MODE_TYPE_DEFAULT	(1<<4)
-#define DRM_MODE_TYPE_USERDEF	(1<<5)
-#define DRM_MODE_TYPE_DRIVER	(1<<6)
-
 #define DRM_MODE_TYPE_CLOCK_CRTC_C (DRM_MODE_TYPE_CLOCK_C | \
 				    DRM_MODE_TYPE_CRTC_C)
 
-- 
cgit v1.2.3


From e0ab2034c3d87b9a1bbd86bfccd806793ce7c5b4 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jesse.barnes@intel.com>
Date: Fri, 16 Nov 2007 13:58:43 -0800
Subject: Fix connection status ABI

Userspace expects a 1 based enum for connection status so fix up the kernel
definition.
---
 linux-core/drm_crtc.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 0ddefc86..0645dd6a 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -148,9 +148,9 @@ struct drm_display_mode {
 #define DPMSModeOff 3
 
 enum drm_output_status {
-	output_status_connected,
-	output_status_disconnected,
-	output_status_unknown,
+	output_status_connected = 1,
+	output_status_disconnected = 2,
+	output_status_unknown = 3,
 };
 
 enum subpixel_order {
-- 
cgit v1.2.3


From 53b4e0cb789151164a0a43b55058319667847aaf Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 26 Nov 2007 14:05:49 +1100
Subject: drm: make fb modes use usermode add/remove interface

this stops usermode from getting a mode in the crtc it can't make sense off.
---
 linux-core/drm_crtc.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 0645dd6a..f555b6bb 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -494,6 +494,9 @@ extern void drm_mode_set_name(struct drm_display_mode *mode);
 extern bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2);
 extern void drm_disable_unused_functions(struct drm_device *dev);
 
+extern void drm_mode_addmode(struct drm_device *dev, struct drm_display_mode *user_mode);
+extern int drm_mode_rmmode(struct drm_device *dev, struct drm_display_mode *mode);
+
 extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
 extern void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
 extern void drm_mode_list_concat(struct list_head *head,
@@ -536,10 +539,10 @@ extern int drm_mode_rmfb(struct drm_device *dev,
 			 void *data, struct drm_file *file_priv);
 extern int drm_mode_getfb(struct drm_device *dev,
 			  void *data, struct drm_file *file_priv);
-extern int drm_mode_addmode(struct drm_device *dev,
-			    void *data, struct drm_file *file_priv);
-extern int drm_mode_rmmode(struct drm_device *dev,
-			   void *data, struct drm_file *file_priv);
+extern int drm_mode_addmode_ioctl(struct drm_device *dev,
+				  void *data, struct drm_file *file_priv);
+extern int drm_mode_rmmode_ioctl(struct drm_device *dev,
+				 void *data, struct drm_file *file_priv);
 extern int drm_mode_attachmode(struct drm_device *dev,
 			       void *data, struct drm_file *file_priv);
 extern int drm_mode_detachmode(struct drm_device *dev,
-- 
cgit v1.2.3


From 362f4283205a01b2a60a49838721e9fff9ae1a4c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 26 Nov 2007 14:28:48 +1100
Subject: add _ioctl to the end of two more ioctls

---
 linux-core/drm_crtc.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index f555b6bb..a9f6a135 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -543,10 +543,10 @@ extern int drm_mode_addmode_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
 extern int drm_mode_rmmode_ioctl(struct drm_device *dev,
 				 void *data, struct drm_file *file_priv);
-extern int drm_mode_attachmode(struct drm_device *dev,
-			       void *data, struct drm_file *file_priv);
-extern int drm_mode_detachmode(struct drm_device *dev,
-			       void *data, struct drm_file *file_priv);
+extern int drm_mode_attachmode_ioctl(struct drm_device *dev,
+				     void *data, struct drm_file *file_priv);
+extern int drm_mode_detachmode_ioctl(struct drm_device *dev,
+				     void *data, struct drm_file *file_priv);
 
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From f9ac54b0319b273de83a004d6cfdf46a3b9d6ced Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 26 Nov 2007 15:06:42 +1100
Subject: fb: make fb interface use user mode attach/detach for adding modes

---
 linux-core/drm_crtc.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index a9f6a135..fc97525d 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -497,6 +497,12 @@ extern void drm_disable_unused_functions(struct drm_device *dev);
 extern void drm_mode_addmode(struct drm_device *dev, struct drm_display_mode *user_mode);
 extern int drm_mode_rmmode(struct drm_device *dev, struct drm_display_mode *mode);
 
+/* for us by fb module */
+extern int drm_mode_attachmode_crtc(struct drm_device *dev,
+				    struct drm_crtc *crtc,
+				    struct drm_display_mode *mode);
+extern int drm_mode_detachmode_crtc(struct drm_device *dev, struct drm_display_mode *mode);
+
 extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
 extern void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
 extern void drm_mode_list_concat(struct list_head *head,
-- 
cgit v1.2.3


From b3af2b59a77a6916ea7151236d3da9bde6a537fc Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 27 Nov 2007 14:31:02 +1000
Subject: drm/modesetting: add initial gettable properites code.

This allow the user to retrieve a list of properties for an output.
Properties can either be 32-bit values or an enum with an associated name.
Range properties are to be supported.

This API is probably not all correct, I may make properties part of the general
resource get when I think about it some more.

So basically you can create properties and attached them to whatever outputs you want,
so it should be possible to create some generics and just attach them to every output.
---
 linux-core/drm_crtc.h | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index fc97525d..011903ce 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -233,6 +233,24 @@ struct drm_framebuffer {
 	void *virtual_base;
 	struct list_head filp_head;
 };
+
+struct drm_property_enum {
+	struct list_head head;
+	uint32_t value;
+	unsigned char name[DRM_PROP_NAME_LEN];
+};
+
+struct drm_property {
+	struct list_head head;
+	int id; /* idr assigned */
+	uint32_t flags;
+	char name[DRM_PROP_NAME_LEN];
+	uint32_t num_values;
+	uint32_t *values;
+
+	struct list_head enum_list;
+};
+
 struct drm_crtc;
 struct drm_output;
 
@@ -376,6 +394,7 @@ struct drm_output_funcs {
 };
 
 #define DRM_OUTPUT_MAX_UMODES 16
+#define DRM_OUTPUT_MAX_PROPERTY 16
 #define DRM_OUTPUT_LEN 32
 /**
  * drm_output - central DRM output control structure
@@ -431,6 +450,8 @@ struct drm_output {
 
 	u32 user_mode_ids[DRM_OUTPUT_MAX_UMODES];
 
+	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
+	u32 property_values[DRM_OUTPUT_MAX_PROPERTY];
 };
 
 /**
@@ -464,6 +485,9 @@ struct drm_mode_config {
 	struct list_head crtc_list;
 
 	struct list_head usermode_list;
+
+	struct list_head property_list;
+
 	int min_width, min_height;
 	int max_width, max_height;
 	/* DamagePtr rotationDamage? */
@@ -529,6 +553,14 @@ extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
 		       int x, int y);
 
+extern int drm_output_attach_property(struct drm_output *output,
+				      struct drm_property *property, int init_val);
+extern struct drm_property *drm_property_create(struct drm_device *dev, int flags,
+						const char *name, int num_values);
+extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
+extern int drm_property_add_enum(struct drm_property *property, int index, 
+				 uint32_t value, const char *name);
+
 /* IOCTLs */
 extern int drm_mode_getresources(struct drm_device *dev,
 				 void *data, struct drm_file *file_priv);
@@ -554,5 +586,7 @@ extern int drm_mode_attachmode_ioctl(struct drm_device *dev,
 extern int drm_mode_detachmode_ioctl(struct drm_device *dev,
 				     void *data, struct drm_file *file_priv);
 
+extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
+				      void *data, struct drm_file *file_priv);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 96df9b11ad8974d7a2a0a589114cbbb04a584f18 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Dec 2007 13:42:32 +1000
Subject: finish of mode add/remove, just have attach/detach modes

---
 linux-core/drm_crtc.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 011903ce..90d6104f 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -448,7 +448,7 @@ struct drm_output {
 	const struct drm_output_funcs *funcs;
 	void *driver_private;
 
-	u32 user_mode_ids[DRM_OUTPUT_MAX_UMODES];
+	struct list_head user_modes;
 
 	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
 	u32 property_values[DRM_OUTPUT_MAX_PROPERTY];
@@ -484,8 +484,6 @@ struct drm_mode_config {
 	int num_crtc;
 	struct list_head crtc_list;
 
-	struct list_head usermode_list;
-
 	struct list_head property_list;
 
 	int min_width, min_height;
@@ -518,9 +516,6 @@ extern void drm_mode_set_name(struct drm_display_mode *mode);
 extern bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2);
 extern void drm_disable_unused_functions(struct drm_device *dev);
 
-extern void drm_mode_addmode(struct drm_device *dev, struct drm_display_mode *user_mode);
-extern int drm_mode_rmmode(struct drm_device *dev, struct drm_display_mode *mode);
-
 /* for us by fb module */
 extern int drm_mode_attachmode_crtc(struct drm_device *dev,
 				    struct drm_crtc *crtc,
-- 
cgit v1.2.3


From 1a6c95ef711fce807659ab5e4fe480d65ac233b6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 5 Dec 2007 16:03:05 +1000
Subject: arrgggh.. make all ioctl structs 32/64-bit compatible hopefully.

This also starts to add blob property support.

someone needs to check this work for other things like ppc/x86 alignment diffs
---
 linux-core/drm_crtc.h | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 90d6104f..d028f75f 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -234,9 +234,16 @@ struct drm_framebuffer {
 	struct list_head filp_head;
 };
 
+struct drm_property_blob {
+	struct list_head head;
+	unsigned int id;
+	unsigned int length;
+	void *data;
+};
+
 struct drm_property_enum {
 	struct list_head head;
-	uint32_t value;
+	uint64_t value;
 	unsigned char name[DRM_PROP_NAME_LEN];
 };
 
@@ -246,9 +253,9 @@ struct drm_property {
 	uint32_t flags;
 	char name[DRM_PROP_NAME_LEN];
 	uint32_t num_values;
-	uint32_t *values;
+	uint64_t *values;
 
-	struct list_head enum_list;
+	struct list_head enum_blob_list;
 };
 
 struct drm_crtc;
@@ -451,7 +458,7 @@ struct drm_output {
 	struct list_head user_modes;
 
 	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
-	u32 property_values[DRM_OUTPUT_MAX_PROPERTY];
+	uint64_t property_values[DRM_OUTPUT_MAX_PROPERTY];
 };
 
 /**
@@ -492,6 +499,10 @@ struct drm_mode_config {
 	/* DGA stuff? */
 	struct drm_mode_config_funcs *funcs;
 	unsigned long fb_base;
+
+	/* pointers to standard properties */
+	struct list_head property_blob_list;
+	struct drm_property *edid_property;
 };
 
 struct drm_output *drm_output_create(struct drm_device *dev,
@@ -549,12 +560,12 @@ extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mo
 		       int x, int y);
 
 extern int drm_output_attach_property(struct drm_output *output,
-				      struct drm_property *property, int init_val);
+				      struct drm_property *property, uint64_t init_val);
 extern struct drm_property *drm_property_create(struct drm_device *dev, int flags,
 						const char *name, int num_values);
 extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
 extern int drm_property_add_enum(struct drm_property *property, int index, 
-				 uint32_t value, const char *name);
+				 uint64_t value, const char *name);
 
 /* IOCTLs */
 extern int drm_mode_getresources(struct drm_device *dev,
-- 
cgit v1.2.3


From 67f6eb1eb8d3dc5bb5fdb097655d3da326f637c1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 6 Dec 2007 10:44:51 +1000
Subject: add property blobs and edid reporting support

---
 linux-core/drm_crtc.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d028f75f..2c77d9d7 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -236,8 +236,8 @@ struct drm_framebuffer {
 
 struct drm_property_blob {
 	struct list_head head;
-	unsigned int id;
 	unsigned int length;
+	unsigned int id;
 	void *data;
 };
 
@@ -456,7 +456,7 @@ struct drm_output {
 	void *driver_private;
 
 	struct list_head user_modes;
-
+	struct drm_property_blob *edid_blob_ptr;
 	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
 	uint64_t property_values[DRM_OUTPUT_MAX_PROPERTY];
 };
@@ -547,7 +547,7 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
 extern void drm_mode_output_list_update(struct drm_output *output);
-
+extern int drm_mode_output_update_edid_property(struct drm_output *output, unsigned char *edid);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
@@ -594,5 +594,7 @@ extern int drm_mode_detachmode_ioctl(struct drm_device *dev,
 
 extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
 				      void *data, struct drm_file *file_priv);
+extern int drm_mode_getblob_ioctl(struct drm_device *dev,
+				  void *data, struct drm_file *file_priv);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 3b6786e3e6523b1ceca3645ea4c6081f170d2134 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 11 Dec 2007 14:46:51 +1000
Subject: modesetting: add dpms property and initial settable property ioctl

---
 linux-core/drm_crtc.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 2c77d9d7..ad5ecc5d 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -242,8 +242,8 @@ struct drm_property_blob {
 };
 
 struct drm_property_enum {
-	struct list_head head;
 	uint64_t value;
+	struct list_head head;
 	unsigned char name[DRM_PROP_NAME_LEN];
 };
 
@@ -396,7 +396,7 @@ struct drm_output_funcs {
 	enum drm_output_status (*detect)(struct drm_output *output);
 	int (*get_modes)(struct drm_output *output);
 	/* JJJ: type checking for properties via property value type */
-	bool (*set_property)(struct drm_output *output, int prop, void *val);
+	bool (*set_property)(struct drm_output *output, int prop, uint64_t val);
 	void (*cleanup)(struct drm_output *output);
 };
 
@@ -503,6 +503,7 @@ struct drm_mode_config {
 	/* pointers to standard properties */
 	struct list_head property_blob_list;
 	struct drm_property *edid_property;
+	struct drm_property *dpms_property;
 };
 
 struct drm_output *drm_output_create(struct drm_device *dev,
-- 
cgit v1.2.3


From f99dea7db00dd46aa96eaed3a61dff9c956fd86f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 11 Dec 2007 15:56:48 +1000
Subject: modesetting: fixup property setting and add connector property

---
 linux-core/drm_crtc.h | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index ad5ecc5d..6b6e1dbf 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -142,11 +142,26 @@ struct drm_display_mode {
 #define V_CLKDIV2	(1<<13)
 
 #define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */
+
 #define DPMSModeOn 0
 #define DPMSModeStandby 1
 #define DPMSModeSuspend 2
 #define DPMSModeOff 3
 
+#define ConnectorUnknown 0
+#define ConnectorVGA 1
+#define ConnectorDVII 2
+#define ConnectorDVID 3
+#define ConnectorDVIA 4
+#define ConnectorComposite 5
+#define ConnectorSVIDEO 6
+#define ConnectorLVDS 7
+#define ConnectorComponent 8
+#define Connector9PinDIN 9
+#define ConnectorDisplayPort 10
+#define ConnectorHDMIA 11
+#define ConnectorHDMIB 12
+
 enum drm_output_status {
 	output_status_connected = 1,
 	output_status_disconnected = 2,
@@ -396,7 +411,8 @@ struct drm_output_funcs {
 	enum drm_output_status (*detect)(struct drm_output *output);
 	int (*get_modes)(struct drm_output *output);
 	/* JJJ: type checking for properties via property value type */
-	bool (*set_property)(struct drm_output *output, int prop, uint64_t val);
+	bool (*set_property)(struct drm_output *output, struct drm_property *property,
+			     uint64_t val);
 	void (*cleanup)(struct drm_output *output);
 };
 
@@ -504,6 +520,8 @@ struct drm_mode_config {
 	struct list_head property_blob_list;
 	struct drm_property *edid_property;
 	struct drm_property *dpms_property;
+	struct drm_property *connector_type_property;
+	struct drm_property *connector_num_property;
 };
 
 struct drm_output *drm_output_create(struct drm_device *dev,
@@ -597,5 +615,7 @@ extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
 				      void *data, struct drm_file *file_priv);
 extern int drm_mode_getblob_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
+extern int drm_mode_output_property_set_ioctl(struct drm_device *dev,
+					      void *data, struct drm_file *file_priv);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From e239882b1e90cba0297118ec7dc432bea06b0bd0 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Tue, 4 Dec 2007 15:36:36 +0100
Subject: Modesetting Hotplug

---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 6b6e1dbf..ce502062 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -577,6 +577,7 @@ extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
 		       int x, int y);
+extern int drm_hotplug_stage_two(struct drm_device *dev, struct drm_output *output);
 
 extern int drm_output_attach_property(struct drm_output *output,
 				      struct drm_property *property, uint64_t init_val);
-- 
cgit v1.2.3


From b13dc383df85d75cb1ea422f4d13efc2a4a8a732 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Dec 2007 17:41:20 +1100
Subject: remove output names

---
 linux-core/drm_crtc.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 6b6e1dbf..dbb41867 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -433,7 +433,6 @@ struct drm_output_funcs {
  * @subpixel_order: for this output
  * @mm_width: displayable width of output in mm
  * @mm_height: displayable height of output in mm
- * @name: name of output (should be one of a few standard names)
  * @funcs: output control functions
  * @driver_private: private driver data
  *
@@ -447,6 +446,9 @@ struct drm_output {
 	struct list_head head;
 	struct drm_crtc *crtc;
 	int id; /* idr assigned */
+
+	int output_type;
+	int output_type_id;
 	unsigned long possible_crtcs;
 	unsigned long possible_clones;
 	bool interlace_allowed;
@@ -467,8 +469,7 @@ struct drm_output {
 	enum subpixel_order subpixel_order;
 	int mm_width, mm_height;
 	struct drm_display_info *monitor_info; /* if any */
-	char name[DRM_OUTPUT_LEN];
-	const struct drm_output_funcs *funcs;
+  	const struct drm_output_funcs *funcs;
 	void *driver_private;
 
 	struct list_head user_modes;
@@ -526,9 +527,10 @@ struct drm_mode_config {
 
 struct drm_output *drm_output_create(struct drm_device *dev,
 				     const struct drm_output_funcs *funcs,
-				     const char *name);
+				     int type);
+
+extern char *drm_get_output_name(struct drm_output *output);
 extern void drm_output_destroy(struct drm_output *output);
-extern bool drm_output_rename(struct drm_output *output, const char *name);
 extern void drm_fb_release(struct file *filp);
 
 extern struct edid *drm_get_edid(struct drm_output *output,
-- 
cgit v1.2.3


From 6d03411e5faa124bac014ebacec470ffd7cf2ce4 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Dec 2007 19:18:05 +1100
Subject: HERE BEZ HACKZ.. magic variable to make shit work

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index dbb41867..d133e0e0 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -471,7 +471,7 @@ struct drm_output {
 	struct drm_display_info *monitor_info; /* if any */
   	const struct drm_output_funcs *funcs;
 	void *driver_private;
-
+  uint32_t make_shit_work;
 	struct list_head user_modes;
 	struct drm_property_blob *edid_blob_ptr;
 	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
-- 
cgit v1.2.3


From f07942f74a08e4c65e3b5e5c46f543686ae30c2b Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@aurora.(none)>
Date: Fri, 11 Jan 2008 17:13:48 +0100
Subject: Panning now works without modeset

---
 linux-core/drm_crtc.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 54e0c000..65c3704a 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -325,6 +325,10 @@ struct drm_crtc_funcs {
 	/* Actually set the mode */
 	void (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode,
 			 struct drm_display_mode *adjusted_mode, int x, int y);
+
+	/* Move the crtc on the current fb to the given position *optional* */
+	void (*mode_set_base)(struct drm_crtc *crtc, int x, int y);
+
 	/* Set gamma on the CRTC */
 	void (*gamma_set)(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
 			  int regno);
-- 
cgit v1.2.3


From a2254c5a9670a3e865f0eb5acd46e905c9b146ce Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Mon, 28 Jan 2008 03:12:29 +0100
Subject: Added cursor support

---
 linux-core/drm_crtc.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 65c3704a..8f6a8938 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -329,6 +329,11 @@ struct drm_crtc_funcs {
 	/* Move the crtc on the current fb to the given position *optional* */
 	void (*mode_set_base)(struct drm_crtc *crtc, int x, int y);
 
+	/* cursor controls */
+	int (*cursor_set)(struct drm_crtc *crtc, struct drm_buffer_object *bo,
+			  uint32_t width, uint32_t height);
+	int (*cursor_move)(struct drm_crtc *crtc, int x, int y);
+
 	/* Set gamma on the CRTC */
 	void (*gamma_set)(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
 			  int regno);
@@ -482,6 +487,21 @@ struct drm_output {
 	uint64_t property_values[DRM_OUTPUT_MAX_PROPERTY];
 };
 
+/**
+ * struct drm_mode_set
+ *
+ * Represents a single crtc the outputs that it drives with what mode
+ * and from which framebuffer it scans out from.
+ */
+struct drm_mode_set
+{
+	struct drm_framebuffer *fb;
+	struct drm_crtc *crtc;
+
+	struct drm_output **outputs;
+	size_t num_outputs;
+};
+
 /**
  * struct drm_mode_config_funcs - configure CRTCs for a given screen layout
  * @resize: adjust CRTCs as necessary for the proposed layout
@@ -603,6 +623,8 @@ extern int drm_mode_getoutput(struct drm_device *dev,
 			      void *data, struct drm_file *file_priv);
 extern int drm_mode_setcrtc(struct drm_device *dev,
 			    void *data, struct drm_file *file_priv);
+extern int drm_mode_cursor_ioctl(struct drm_device *dev,
+				void *data, struct drm_file *file_priv);
 extern int drm_mode_addfb(struct drm_device *dev,
 			  void *data, struct drm_file *file_priv);
 extern int drm_mode_rmfb(struct drm_device *dev,
-- 
cgit v1.2.3


From c9772f8c037667ed3586337f90904e7978f8ab14 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 5 Feb 2008 09:28:51 +0000
Subject: consistency

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 8f6a8938..63324ca1 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -259,7 +259,7 @@ struct drm_property_blob {
 struct drm_property_enum {
 	uint64_t value;
 	struct list_head head;
-	unsigned char name[DRM_PROP_NAME_LEN];
+	char name[DRM_PROP_NAME_LEN];
 };
 
 struct drm_property {
-- 
cgit v1.2.3


From f2c706e24782940582b75d5286f9bbf2fe37f0cd Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 5 Feb 2008 10:11:01 +0000
Subject: Fix function declaration

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 63324ca1..3b22e886 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -592,7 +592,7 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
 extern void drm_mode_output_list_update(struct drm_output *output);
-extern int drm_mode_output_update_edid_property(struct drm_output *output, unsigned char *edid);
+extern int drm_mode_output_update_edid_property(struct drm_output *output, struct edid *edid);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
-- 
cgit v1.2.3


From 0618ac8a07d834e469cb96818a1dfee6f50662b8 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Thu, 7 Feb 2008 19:24:58 +0100
Subject: Added kernel part of hotplug ioctl

---
 linux-core/drm_crtc.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 3b22e886..db5fd34c 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -547,6 +547,9 @@ struct drm_mode_config {
 	struct drm_property *dpms_property;
 	struct drm_property *connector_type_property;
 	struct drm_property *connector_num_property;
+
+	/* hotplug */
+	uint32_t hotplug_counter;
 };
 
 struct drm_output *drm_output_create(struct drm_device *dev,
@@ -603,7 +606,7 @@ extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
 		       int x, int y);
-extern int drm_hotplug_stage_two(struct drm_device *dev, struct drm_output *output);
+extern int drm_hotplug_stage_two(struct drm_device *dev, struct drm_output *output, bool connected);
 
 extern int drm_output_attach_property(struct drm_output *output,
 				      struct drm_property *property, uint64_t init_val);
@@ -646,5 +649,8 @@ extern int drm_mode_getblob_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
 extern int drm_mode_output_property_set_ioctl(struct drm_device *dev,
 					      void *data, struct drm_file *file_priv);
+extern int drm_mode_hotplug_ioctl(struct drm_device *dev,
+				  void *data, struct drm_file *file_priv);
+
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 2b1c9cd696049d23845870329d2b61a5873f7b13 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jesse.barnes@intel.com>
Date: Fri, 15 Feb 2008 16:13:21 -0800
Subject: i915: initial (and untested) TV out support

Ported from xf86-video-intel.  Still need to tie in TV modes somehow, though
preferably w/o using the properties mechanism.
---
 linux-core/drm_crtc.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index db5fd34c..43ef95ed 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -548,6 +548,13 @@ struct drm_mode_config {
 	struct drm_property *connector_type_property;
 	struct drm_property *connector_num_property;
 
+	/* TV properties */
+	struct drm_property *tv_mode_property;
+	struct drm_property *tv_left_margin_property;
+	struct drm_property *tv_right_margin_property;
+	struct drm_property *tv_top_margin_property;
+	struct drm_property *tv_bottom_margin_property;
+
 	/* hotplug */
 	uint32_t hotplug_counter;
 };
@@ -595,7 +602,11 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
 extern void drm_mode_output_list_update(struct drm_output *output);
-extern int drm_mode_output_update_edid_property(struct drm_output *output, struct edid *edid);
+extern int drm_mode_output_update_edid_property(struct drm_output *output,
+						struct edid *edid);
+extern int drm_output_property_set_value(struct drm_output *output,
+					 struct drm_property *property,
+					 uint64_t value);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
-- 
cgit v1.2.3


From 8844245cfcc5b19caafc772fd457401ab3253a28 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 20 Feb 2008 10:51:19 +1000
Subject: drm/fb: get rid of offset from structure use bo offset

---
 linux-core/drm_crtc.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 43ef95ed..30970579 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -235,7 +235,6 @@ struct drm_framebuffer {
 	struct list_head head;
 	int id; /* idr assigned */
 	unsigned int pitch;
-	unsigned long offset;
 	unsigned int width;
 	unsigned int height;
 	/* depth can be 15 or 16 */
-- 
cgit v1.2.3


From 0d1cb1e8408d497fec66d9f31603f93800049c75 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 20 Feb 2008 13:26:40 +1000
Subject: hopefully shit works now without this...

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 30970579..d733d8ca 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -479,7 +479,7 @@ struct drm_output {
 	struct drm_display_info *monitor_info; /* if any */
   	const struct drm_output_funcs *funcs;
 	void *driver_private;
-  uint32_t make_shit_work;
+
 	struct list_head user_modes;
 	struct drm_property_blob *edid_blob_ptr;
 	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
-- 
cgit v1.2.3


From 2476cb209ebbb11edace4bbce0cfaff4e1599dca Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Fri, 22 Feb 2008 11:46:22 +0000
Subject: Implement short circuit for base change only

Allow mode to be set with fb_id set to -1, meaning set
the mode with the current fb (if we have one bound).

Allow intelfb to hook back up it's fb if modesetting
clears it (maybe temporary).

Move any crtc->fb related register changes to set_base
in intel_fb.

General intelfb cleanups.
---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d733d8ca..bbeab603 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -244,7 +244,7 @@ struct drm_framebuffer {
 	struct drm_buffer_object *bo;
 	void *fbdev;
 	u32 pseudo_palette[17];
-	void *virtual_base;
+	struct drm_bo_kmap_obj kmap;
 	struct list_head filp_head;
 };
 
-- 
cgit v1.2.3


From 5a3ce06f3a3dfa9412b9660c1e1f35d24c815dbb Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Tue, 8 Apr 2008 12:42:23 -0700
Subject: Improved DRM sysfs support

This patch ties outputs, output properties and hotplug events into the
DRM core.  Each output has a corresponding directory under the primary
DRM device (usually card0) containing dpms, edid, modes, and connection
status files.

New hotplug change events occur when outputs are added or hotplug events
are detected.
---
 linux-core/drm_crtc.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index bbeab603..ac0d2d5a 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -451,6 +451,8 @@ struct drm_output_funcs {
  */
 struct drm_output {
 	struct drm_device *dev;
+	struct device kdev;
+	struct device_attribute *attr;
 	struct list_head head;
 	struct drm_crtc *crtc;
 	int id; /* idr assigned */
@@ -563,6 +565,7 @@ struct drm_output *drm_output_create(struct drm_device *dev,
 				     int type);
 
 extern char *drm_get_output_name(struct drm_output *output);
+extern char *drm_get_dpms_name(int val);
 extern void drm_output_destroy(struct drm_output *output);
 extern void drm_fb_release(struct file *filp);
 
@@ -606,6 +609,9 @@ extern int drm_mode_output_update_edid_property(struct drm_output *output,
 extern int drm_output_property_set_value(struct drm_output *output,
 					 struct drm_property *property,
 					 uint64_t value);
+extern int drm_output_property_get_value(struct drm_output *output,
+					 struct drm_property *property,
+					 uint64_t *value);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
-- 
cgit v1.2.3


From 6c92689dcc627886c32afd4eca8f0da25bd07183 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Wed, 9 Apr 2008 14:07:55 -0700
Subject: Port pipe reservation code for load detection

TV out needs to do load detection, which means we have to find an
available pipe to use for the detection.  Port over the pipe reservation
code for this purpose.
---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index ac0d2d5a..52e5ab5c 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -622,6 +622,7 @@ extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
 		       int x, int y);
+extern bool drm_crtc_in_use(struct drm_crtc *crtc);
 extern int drm_hotplug_stage_two(struct drm_device *dev, struct drm_output *output, bool connected);
 
 extern int drm_output_attach_property(struct drm_output *output,
-- 
cgit v1.2.3


From 0a6e301e6de3421f116d1b5d8205ca4f442091e2 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Thu, 10 Apr 2008 11:23:55 -0700
Subject: Keep display info in struct display_info

Some fields had snuck into the drm_output structure.  Put them back and
fill in more stuff from the EDID block.
---
 linux-core/drm_crtc.h | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 52e5ab5c..ec5b20b0 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -199,7 +199,7 @@ struct drm_display_info {
 	bool gtf_supported;
 	bool standard_color;
 	enum {
-		monochrome,
+		monochrome = 0,
 		rgb,
 		other,
 		unknown,
@@ -225,6 +225,8 @@ struct drm_display_info {
 	unsigned int wpx2, wpy2;
 	unsigned int wpgamma2;
 
+	enum subpixel_order subpixel_order;
+
 	/* Preferred mode (if any) */
 	struct drm_display_mode *preferred_mode;
 	char *raw_edid; /* if any */
@@ -376,8 +378,6 @@ struct drm_crtc {
 	int desired_x, desired_y;
 	const struct drm_crtc_funcs *funcs;
 	void *driver_private;
-
-	/* RRCrtcPtr randr_crtc? */
 };
 
 extern struct drm_crtc *drm_crtc_create(struct drm_device *dev,
@@ -438,9 +438,6 @@ struct drm_output_funcs {
  * @initial_x: initial x position for this output
  * @initial_y: initial y position for this output
  * @status: output connected?
- * @subpixel_order: for this output
- * @mm_width: displayable width of output in mm
- * @mm_height: displayable height of output in mm
  * @funcs: output control functions
  * @driver_private: private driver data
  *
@@ -465,20 +462,13 @@ struct drm_output {
 	bool doublescan_allowed;
 	struct list_head modes; /* list of modes on this output */
 
-	/*
-	  OptionInfoPtr options;
-	  XF86ConfMonitorPtr conf_monitor;
-	 */
 	int initial_x, initial_y;
 	enum drm_output_status status;
 
 	/* these are modes added by probing with DDC or the BIOS */
 	struct list_head probed_modes;
 	
-	/* xf86MonPtr MonInfo; */
-	enum subpixel_order subpixel_order;
-	int mm_width, mm_height;
-	struct drm_display_info *monitor_info; /* if any */
+	struct drm_display_info display_info;
   	const struct drm_output_funcs *funcs;
 	void *driver_private;
 
-- 
cgit v1.2.3


From bee546ad696e3157b878dfa90e563786b5b5c7ac Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Thu, 10 Apr 2008 19:02:53 -0700
Subject: Remove structure fields & code

Cleanup some random cruft left over from the initial port.
---
 linux-core/drm_crtc.h | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index ec5b20b0..74316aa5 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -308,13 +308,10 @@ struct drm_crtc_funcs {
 	 */
 	void (*dpms)(struct drm_crtc *crtc, int mode);
 
-	/* JJJ:  Are these needed? */
 	/* Save CRTC state */
 	void (*save)(struct drm_crtc *crtc); /* suspend? */
 	/* Restore CRTC state */
 	void (*restore)(struct drm_crtc *crtc); /* resume? */
-	bool (*lock)(struct drm_crtc *crtc);
-	void (*unlock)(struct drm_crtc *crtc);
 
 	void (*prepare)(struct drm_crtc *crtc);
 	void (*commit)(struct drm_crtc *crtc);
@@ -367,10 +364,6 @@ struct drm_crtc {
 
 	bool enabled;
 
-	/* JJJ: are these needed? */
-	bool cursor_in_range;
-	bool cursor_shown;
-
 	struct drm_display_mode mode;
 
 	int x, y;
@@ -418,7 +411,6 @@ struct drm_output_funcs {
 			 struct drm_display_mode *adjusted_mode);
 	enum drm_output_status (*detect)(struct drm_output *output);
 	int (*get_modes)(struct drm_output *output);
-	/* JJJ: type checking for properties via property value type */
 	bool (*set_property)(struct drm_output *output, struct drm_property *property,
 			     uint64_t val);
 	void (*cleanup)(struct drm_output *output);
@@ -519,7 +511,6 @@ struct drm_mode_config {
 	int num_output;
 	struct list_head output_list;
 
-	/* int compat_output? */
 	int num_crtc;
 	struct list_head crtc_list;
 
@@ -527,8 +518,6 @@ struct drm_mode_config {
 
 	int min_width, min_height;
 	int max_width, max_height;
-	/* DamagePtr rotationDamage? */
-	/* DGA stuff? */
 	struct drm_mode_config_funcs *funcs;
 	unsigned long fb_base;
 
-- 
cgit v1.2.3


From 83c3acb7da1043a63d260d5443f7149b2c664b08 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Thu, 10 Apr 2008 20:30:12 -0700
Subject: Split TV property creation into its own routine

It needs to take arguments from the caller about supported TV formats,
so declare it in drm_crtc.h and export it.
---
 linux-core/drm_crtc.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 74316aa5..20b1ea06 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -611,6 +611,8 @@ extern struct drm_property *drm_property_create(struct drm_device *dev, int flag
 extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
 extern int drm_property_add_enum(struct drm_property *property, int index, 
 				 uint64_t value, const char *name);
+extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
+				     char *formats[]);
 
 /* IOCTLs */
 extern int drm_mode_getresources(struct drm_device *dev,
-- 
cgit v1.2.3


From ed072ed075ec431b0746ac1aa8bad5f687d75d8c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 8 May 2008 14:01:24 +1000
Subject: drm_mode: initial replacefb implemenation

---
 linux-core/drm_crtc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 20b1ea06..64e7e519 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -649,6 +649,7 @@ extern int drm_mode_output_property_set_ioctl(struct drm_device *dev,
 					      void *data, struct drm_file *file_priv);
 extern int drm_mode_hotplug_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
-
+extern int drm_mode_replacefb(struct drm_device *dev,
+			      void *data, struct drm_file *file_priv);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From ba36d54ad4a3ea52b338d55ca19a864283e7c9ce Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Thu, 8 May 2008 15:00:18 +0200
Subject: drm: Made set_config use drm_mode_set as a argument

---
 linux-core/drm_crtc.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 64e7e519..abe8f3f3 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -475,11 +475,17 @@ struct drm_output {
  *
  * Represents a single crtc the outputs that it drives with what mode
  * and from which framebuffer it scans out from.
+ *
+ * This is used to set modes.
  */
 struct drm_mode_set
 {
 	struct drm_framebuffer *fb;
 	struct drm_crtc *crtc;
+	struct drm_display_mode *mode;
+
+	uint32_t x;
+	uint32_t y;
 
 	struct drm_output **outputs;
 	size_t num_outputs;
-- 
cgit v1.2.3


From 7bcbc443f4f5161ab1e1a11cb6694e6d6269377c Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Thu, 8 May 2008 20:10:18 +0200
Subject: i915: Changed intel_fb to use the new drm_crtc_set_config interface

---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index abe8f3f3..1d36dcd4 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -605,6 +605,7 @@ extern struct drm_framebuffer *drm_framebuffer_create(struct drm_device *dev);
 extern void drm_framebuffer_destroy(struct drm_framebuffer *fb);
 extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
+extern int drm_crtc_set_config(struct drm_mode_set *set);
 extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
 		       int x, int y);
 extern bool drm_crtc_in_use(struct drm_crtc *crtc);
-- 
cgit v1.2.3


From b4d8cda8e6d6ea319ab7c471d6d68b8af8693cfe Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Fri, 23 May 2008 18:41:58 -0700
Subject: drm_mode_debug_printmodeline doesn't need struct drm_device *

Makes printing modelines from some routines easier.
---
 linux-core/drm_crtc.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 1d36dcd4..ae2dd173 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -561,8 +561,7 @@ extern void drm_mode_probed_add(struct drm_output *output, struct drm_display_mo
 extern void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode);
 extern struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
 						   struct drm_display_mode *mode);
-extern void drm_mode_debug_printmodeline(struct drm_device *dev,
-					 struct drm_display_mode *mode);
+extern void drm_mode_debug_printmodeline(struct drm_display_mode *mode);
 extern void drm_mode_config_init(struct drm_device *dev);
 extern void drm_mode_config_cleanup(struct drm_device *dev);
 extern void drm_mode_set_name(struct drm_display_mode *mode);
-- 
cgit v1.2.3


From df8cd54286fbae5903d8ede390ec4a11cb6c4b6c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 29 May 2008 14:02:14 +1000
Subject: modesetting: reorganise code into core and helper functions.

This splits a lot of the core modesetting code out into a file of
helper functions, that are only called from themselves and/or the driver.

The driver gets called into more often or can call these functions from itself
if it is a helper using driver.

I've broken framebuffer resize doing this but I didn't like the API for that
in any case.
---
 linux-core/drm_crtc.h | 43 +++++++++++++------------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index ae2dd173..957ecc2c 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -14,6 +14,7 @@
 #include <linux/fb.h>
 
 struct drm_device;
+struct drm_mode_set;
 
 /*
  * Note on terminology:  here, for brevity and convenience, we refer to output
@@ -313,20 +314,6 @@ struct drm_crtc_funcs {
 	/* Restore CRTC state */
 	void (*restore)(struct drm_crtc *crtc); /* resume? */
 
-	void (*prepare)(struct drm_crtc *crtc);
-	void (*commit)(struct drm_crtc *crtc);
-
-	/* Provider can fixup or change mode timings before modeset occurs */
-	bool (*mode_fixup)(struct drm_crtc *crtc,
-			   struct drm_display_mode *mode,
-			   struct drm_display_mode *adjusted_mode);
-	/* Actually set the mode */
-	void (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode,
-			 struct drm_display_mode *adjusted_mode, int x, int y);
-
-	/* Move the crtc on the current fb to the given position *optional* */
-	void (*mode_set_base)(struct drm_crtc *crtc, int x, int y);
-
 	/* cursor controls */
 	int (*cursor_set)(struct drm_crtc *crtc, struct drm_buffer_object *bo,
 			  uint32_t width, uint32_t height);
@@ -337,6 +324,8 @@ struct drm_crtc_funcs {
 			  int regno);
 	/* Driver cleanup routine */
 	void (*cleanup)(struct drm_crtc *crtc);
+
+	int (*set_config)(struct drm_mode_set *set);
 };
 
 /**
@@ -371,6 +360,9 @@ struct drm_crtc {
 	int desired_x, desired_y;
 	const struct drm_crtc_funcs *funcs;
 	void *driver_private;
+
+	/* if you are using the helper */
+	void *helper_private;
 };
 
 extern struct drm_crtc *drm_crtc_create(struct drm_device *dev,
@@ -399,21 +391,14 @@ struct drm_output_funcs {
 	void (*dpms)(struct drm_output *output, int mode);
 	void (*save)(struct drm_output *output);
 	void (*restore)(struct drm_output *output);
-	int (*mode_valid)(struct drm_output *output,
-			  struct drm_display_mode *mode);
-	bool (*mode_fixup)(struct drm_output *output,
-			   struct drm_display_mode *mode,
-			   struct drm_display_mode *adjusted_mode);
-	void (*prepare)(struct drm_output *output);
-	void (*commit)(struct drm_output *output);
-	void (*mode_set)(struct drm_output *output,
-			 struct drm_display_mode *mode,
-			 struct drm_display_mode *adjusted_mode);
 	enum drm_output_status (*detect)(struct drm_output *output);
 	int (*get_modes)(struct drm_output *output);
 	bool (*set_property)(struct drm_output *output, struct drm_property *property,
 			     uint64_t val);
 	void (*cleanup)(struct drm_output *output);
+  	int (*mode_valid)(struct drm_output *output,
+			  struct drm_display_mode *mode);
+
 };
 
 #define DRM_OUTPUT_MAX_UMODES 16
@@ -468,6 +453,8 @@ struct drm_output {
 	struct drm_property_blob *edid_blob_ptr;
 	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
 	uint64_t property_values[DRM_OUTPUT_MAX_PROPERTY];
+
+	void *helper_private;
 };
 
 /**
@@ -501,7 +488,7 @@ struct drm_mode_set
  * the CRTC<->output mappings as needed and update its view of the screen.
  */
 struct drm_mode_config_funcs {
-	bool (*resize)(struct drm_device *dev, int width, int height);
+	bool (*resize_fb)(struct drm_device *dev, struct drm_framebuffer *fb);
 };
 
 /**
@@ -597,18 +584,14 @@ extern int drm_output_property_get_value(struct drm_output *output,
 					 struct drm_property *property,
 					 uint64_t *value);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
-extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
 				       unsigned long handle);
 extern struct drm_framebuffer *drm_framebuffer_create(struct drm_device *dev);
 extern void drm_framebuffer_destroy(struct drm_framebuffer *fb);
 extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
-extern int drm_crtc_set_config(struct drm_mode_set *set);
-extern bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
-		       int x, int y);
+extern void drm_crtc_probe_output_modes(struct drm_device *dev, int maxX, int maxY);
 extern bool drm_crtc_in_use(struct drm_crtc *crtc);
-extern int drm_hotplug_stage_two(struct drm_device *dev, struct drm_output *output, bool connected);
 
 extern int drm_output_attach_property(struct drm_output *output,
 				      struct drm_property *property, uint64_t init_val);
-- 
cgit v1.2.3


From 98c5cf7f6fc51f1a8f5f90b3895009cd38dd8f22 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 11:25:41 +1000
Subject: modesetting: reorganise out crtc/outputs are allocated.

Use subclassing from the drivers to allocate the objects. This saves
two objects being allocated for each crtc/output and generally makes
exit paths cleaner.
---
 linux-core/drm_crtc.h | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 957ecc2c..b769eb7a 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -291,7 +291,7 @@ struct drm_output;
  * @mode_fixup: fixup proposed mode
  * @mode_set: set the desired mode on the CRTC
  * @gamma_set: specify color ramp for CRTC
- * @cleanup: cleanup driver private state prior to close
+ * @destroy: deinit and free object.
  *
  * The drm_crtc_funcs structure is the central CRTC management structure
  * in the DRM.  Each CRTC controls one or more outputs (note that the name
@@ -322,8 +322,8 @@ struct drm_crtc_funcs {
 	/* Set gamma on the CRTC */
 	void (*gamma_set)(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
 			  int regno);
-	/* Driver cleanup routine */
-	void (*cleanup)(struct drm_crtc *crtc);
+	/* Object destroy routine */
+	void (*destroy)(struct drm_crtc *crtc);
 
 	int (*set_config)(struct drm_mode_set *set);
 };
@@ -337,7 +337,6 @@ struct drm_crtc_funcs {
  * @desired_x: desired x for desired_mode
  * @desired_y: desired y for desired_mode
  * @funcs: CRTC control functions
- * @driver_private: arbitrary driver data
  *
  * Each CRTC may have one or more outputs associated with it.  This structure
  * allows the CRTC to be controlled.
@@ -359,15 +358,11 @@ struct drm_crtc {
 	struct drm_display_mode *desired_mode;
 	int desired_x, desired_y;
 	const struct drm_crtc_funcs *funcs;
-	void *driver_private;
 
 	/* if you are using the helper */
 	void *helper_private;
 };
 
-extern struct drm_crtc *drm_crtc_create(struct drm_device *dev,
-					const struct drm_crtc_funcs *funcs);
-
 /**
  * drm_output_funcs - control outputs on a given device
  * @init: setup this output
@@ -380,7 +375,7 @@ extern struct drm_crtc *drm_crtc_create(struct drm_device *dev,
  * @detect: is this output active?
  * @get_modes: get mode list for this output
  * @set_property: property for this output may need update
- * @cleanup: output is going away, cleanup
+ * @destroy: make object go away
  *
  * Each CRTC may have one or more outputs attached to it.  The functions
  * below allow the core DRM code to control outputs, enumerate available modes,
@@ -395,7 +390,7 @@ struct drm_output_funcs {
 	int (*get_modes)(struct drm_output *output);
 	bool (*set_property)(struct drm_output *output, struct drm_property *property,
 			     uint64_t val);
-	void (*cleanup)(struct drm_output *output);
+	void (*destroy)(struct drm_output *output);
   	int (*mode_valid)(struct drm_output *output,
 			  struct drm_display_mode *mode);
 
@@ -416,7 +411,6 @@ struct drm_output_funcs {
  * @initial_y: initial y position for this output
  * @status: output connected?
  * @funcs: output control functions
- * @driver_private: private driver data
  *
  * Each output may be connected to one or more CRTCs, or may be clonable by
  * another output if they can share a CRTC.  Each output also has a specific
@@ -447,7 +441,6 @@ struct drm_output {
 	
 	struct drm_display_info display_info;
   	const struct drm_output_funcs *funcs;
-	void *driver_private;
 
 	struct list_head user_modes;
 	struct drm_property_blob *edid_blob_ptr;
@@ -532,13 +525,21 @@ struct drm_mode_config {
 	uint32_t hotplug_counter;
 };
 
-struct drm_output *drm_output_create(struct drm_device *dev,
-				     const struct drm_output_funcs *funcs,
-				     int type);
+
+extern void drm_crtc_init(struct drm_device *dev,
+			  struct drm_crtc *crtc,
+			  const struct drm_crtc_funcs *funcs);
+extern void drm_crtc_cleanup(struct drm_crtc *crtc);
+
+void drm_output_init(struct drm_device *dev,
+		     struct drm_output *output,
+		     const struct drm_output_funcs *funcs,
+		     int output_type);
+
+void drm_output_cleanup(struct drm_output *output);
 
 extern char *drm_get_output_name(struct drm_output *output);
 extern char *drm_get_dpms_name(int val);
-extern void drm_output_destroy(struct drm_output *output);
 extern void drm_fb_release(struct file *filp);
 
 extern struct edid *drm_get_edid(struct drm_output *output,
-- 
cgit v1.2.3


From 9654c776fda55d6420a14449bf2e274839c444a6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 11:47:57 +1000
Subject: drm/modesetting: add initial encoder structures and setup functions

---
 linux-core/drm_crtc.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index b769eb7a..7765afea 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -277,6 +277,7 @@ struct drm_property {
 
 struct drm_crtc;
 struct drm_output;
+struct drm_encoder;
 
 /**
  * drm_crtc_funcs - control CRTCs for a given device
@@ -396,9 +397,29 @@ struct drm_output_funcs {
 
 };
 
+struct drm_encoder_funcs {
+	void (*destroy)(struct drm_encoder *encoder);
+};
+
 #define DRM_OUTPUT_MAX_UMODES 16
 #define DRM_OUTPUT_MAX_PROPERTY 16
 #define DRM_OUTPUT_LEN 32
+
+/**
+ * drm_encoder - central DRM encoder structure 
+ */
+struct drm_encoder {
+	struct drm_device *dev;
+	struct list_head head;
+
+	int id;
+	int encoder_type;
+	uint32_t possible_crtcs;
+	uint32_t possible_clones;
+
+	const struct drm_encoder_funcs *funcs;
+};
+
 /**
  * drm_output - central DRM output control structure
  * @crtc: CRTC this output is currently connected to, NULL if none
@@ -496,6 +517,8 @@ struct drm_mode_config {
 	struct list_head fb_list;
 	int num_output;
 	struct list_head output_list;
+	int num_encoder;
+	struct list_head encoder_list;
 
 	int num_crtc;
 	struct list_head crtc_list;
-- 
cgit v1.2.3


From 6b970f193b69a912183dcbf85b9dc51ec99aeefe Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 11:48:41 +1000
Subject: drm: remove unused init func from outputs

---
 linux-core/drm_crtc.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 7765afea..7bb779ef 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -383,7 +383,6 @@ struct drm_crtc {
  * etc.
  */
 struct drm_output_funcs {
-	void (*init)(struct drm_output *output);
 	void (*dpms)(struct drm_output *output, int mode);
 	void (*save)(struct drm_output *output);
 	void (*restore)(struct drm_output *output);
-- 
cgit v1.2.3


From 8ae82f3a2feb8b8fe56214c4c9e806bf1f87cbf8 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 12:03:36 +1000
Subject: drm: add encoder / get encoder to the modesetting resources interface

---
 linux-core/drm_crtc.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 7bb779ef..adaa49bd 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -366,7 +366,6 @@ struct drm_crtc {
 
 /**
  * drm_output_funcs - control outputs on a given device
- * @init: setup this output
  * @dpms: set power state (see drm_crtc_funcs above)
  * @save: save output state
  * @restore: restore output state
@@ -417,6 +416,7 @@ struct drm_encoder {
 	uint32_t possible_clones;
 
 	const struct drm_encoder_funcs *funcs;
+	void *helper_private;
 };
 
 /**
@@ -663,5 +663,7 @@ extern int drm_mode_hotplug_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
 extern int drm_mode_replacefb(struct drm_device *dev,
 			      void *data, struct drm_file *file_priv);
+int drm_mode_getencoder(struct drm_device *dev,
+			void *data, struct drm_file *file_priv);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From b72419a8f74bfb1d3b6a5ca1d8f6dfa3c6a84e86 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 12:19:13 +1000
Subject: drm: add encoder ids to the output handling

---
 linux-core/drm_crtc.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index adaa49bd..ed8467e3 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -402,6 +402,7 @@ struct drm_encoder_funcs {
 #define DRM_OUTPUT_MAX_UMODES 16
 #define DRM_OUTPUT_MAX_PROPERTY 16
 #define DRM_OUTPUT_LEN 32
+#define DRM_OUTPUT_MAX_ENCODER 2
 
 /**
  * drm_encoder - central DRM encoder structure 
@@ -468,6 +469,8 @@ struct drm_output {
 	uint64_t property_values[DRM_OUTPUT_MAX_PROPERTY];
 
 	void *helper_private;
+
+	u32 encoder_ids[DRM_OUTPUT_MAX_ENCODER];
 };
 
 /**
-- 
cgit v1.2.3


From 9239cf511f65a43eb578fbb6a7c5255e05db2101 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 13:31:16 +1000
Subject: drm: add encoder attach/detach

---
 linux-core/drm_crtc.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index ed8467e3..04e0d033 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -629,6 +629,11 @@ extern int drm_property_add_enum(struct drm_property *property, int index,
 extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
 				     char *formats[]);
 
+extern int drm_mode_output_attach_encoder(struct drm_output *output,
+					  struct drm_encoder *encoder);
+extern void drm_mode_output_detach_encoder(struct drm_output *output,
+					   struct drm_encoder *encoder);
+
 /* IOCTLs */
 extern int drm_mode_getresources(struct drm_device *dev,
 				 void *data, struct drm_file *file_priv);
-- 
cgit v1.2.3


From 6aeef92c0cad784a5019ea90d97ab81f4e51fdd9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 13:57:27 +1000
Subject: drm: attach an encoder.

Time to do some renaming on the connectors I think
---
 linux-core/drm_crtc.h | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 04e0d033..03c336e2 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -556,12 +556,19 @@ extern void drm_crtc_init(struct drm_device *dev,
 			  const struct drm_crtc_funcs *funcs);
 extern void drm_crtc_cleanup(struct drm_crtc *crtc);
 
-void drm_output_init(struct drm_device *dev,
-		     struct drm_output *output,
-		     const struct drm_output_funcs *funcs,
-		     int output_type);
+extern void drm_output_init(struct drm_device *dev,
+			    struct drm_output *output,
+			    const struct drm_output_funcs *funcs,
+			    int output_type);
 
-void drm_output_cleanup(struct drm_output *output);
+extern void drm_output_cleanup(struct drm_output *output);
+
+extern void drm_encoder_init(struct drm_device *dev,
+			     struct drm_encoder *encoder,
+			     const struct drm_encoder_funcs *funcs,
+			     int encoder_type);
+
+extern void drm_encoder_cleanup(struct drm_encoder *encoder);
 
 extern char *drm_get_output_name(struct drm_output *output);
 extern char *drm_get_dpms_name(int val);
-- 
cgit v1.2.3


From 9d38448ed33aaff324cc4bbe1e0878593e97d07d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 15:03:12 +1000
Subject: modesetting: the great renaming.

Okay we have crtc, encoder and connectors.

No more outputs exposed beyond driver internals

I've broken intel tv connector stuff.
Really for TV we should have one TV connector, with a sub property for the
type of signal been driven over it
---
 linux-core/drm_crtc.h | 200 +++++++++++++++++++++++++-------------------------
 1 file changed, 99 insertions(+), 101 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 03c336e2..568b6b31 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -17,10 +17,10 @@ struct drm_device;
 struct drm_mode_set;
 
 /*
- * Note on terminology:  here, for brevity and convenience, we refer to output
- * control chips as 'CRTCs'.  They can control any type of output, VGA, LVDS,
+ * Note on terminology:  here, for brevity and convenience, we refer to connector
+ * control chips as 'CRTCs'.  They can control any type of connector, VGA, LVDS,
  * DVI, etc.  And 'screen' refers to the whole of the visible display, which
- * may span multiple monitors (and therefore multiple CRTC and output
+ * may span multiple monitors (and therefore multiple CRTC and connector
  * structures).
  */
 
@@ -80,7 +80,7 @@ struct drm_display_mode {
 	struct list_head head;
 	char name[DRM_DISPLAY_MODE_LEN];
 	int mode_id;
-	int output_count;
+	int connector_count;
 	enum drm_mode_status status;
 	int type;
 
@@ -149,24 +149,24 @@ struct drm_display_mode {
 #define DPMSModeSuspend 2
 #define DPMSModeOff 3
 
-#define ConnectorUnknown 0
-#define ConnectorVGA 1
-#define ConnectorDVII 2
-#define ConnectorDVID 3
-#define ConnectorDVIA 4
-#define ConnectorComposite 5
-#define ConnectorSVIDEO 6
-#define ConnectorLVDS 7
-#define ConnectorComponent 8
-#define Connector9PinDIN 9
-#define ConnectorDisplayPort 10
-#define ConnectorHDMIA 11
-#define ConnectorHDMIB 12
-
-enum drm_output_status {
-	output_status_connected = 1,
-	output_status_disconnected = 2,
-	output_status_unknown = 3,
+#define DRM_MODE_CONNECTOR_Unknown 0
+#define DRM_MODE_CONNECTOR_VGA 1
+#define DRM_MODE_CONNECTOR_DVII 2
+#define DRM_MODE_CONNECTOR_DVID 3
+#define DRM_MODE_CONNECTOR_DVIA 4
+#define DRM_MODE_CONNECTOR_Composite 5
+#define DRM_MODE_CONNECTOR_SVIDEO 6
+#define DRM_MODE_CONNECTOR_LVDS 7
+#define DRM_MODE_CONNECTOR_Component 8
+#define DRM_MODE_CONNECTOR_9PinDIN 9
+#define DRM_MODE_CONNECTOR_DisplayPort 10
+#define DRM_MODE_CONNECTOR_HDMIA 11
+#define DRM_MODE_CONNECTOR_HDMIB 12
+
+enum drm_connector_status {
+	connector_status_connected = 1,
+	connector_status_disconnected = 2,
+	connector_status_unknown = 3,
 };
 
 enum subpixel_order {
@@ -276,7 +276,7 @@ struct drm_property {
 };
 
 struct drm_crtc;
-struct drm_output;
+struct drm_connector;
 struct drm_encoder;
 
 /**
@@ -295,9 +295,9 @@ struct drm_encoder;
  * @destroy: deinit and free object.
  *
  * The drm_crtc_funcs structure is the central CRTC management structure
- * in the DRM.  Each CRTC controls one or more outputs (note that the name
+ * in the DRM.  Each CRTC controls one or more connectors (note that the name
  * CRTC is simply historical, a CRTC may control LVDS, VGA, DVI, TV out, etc.
- * outputs, not just CRTs).
+ * connectors, not just CRTs).
  *
  * Each driver is responsible for filling out this structure at startup time,
  * in addition to providing other modesetting features, like i2c and DDC
@@ -339,7 +339,7 @@ struct drm_crtc_funcs {
  * @desired_y: desired y for desired_mode
  * @funcs: CRTC control functions
  *
- * Each CRTC may have one or more outputs associated with it.  This structure
+ * Each CRTC may have one or more connectors associated with it.  This structure
  * allows the CRTC to be controlled.
  */
 struct drm_crtc {
@@ -348,7 +348,7 @@ struct drm_crtc {
 
 	int id; /* idr assigned */
 
-	/* framebuffer the output is currently bound to */
+	/* framebuffer the connector is currently bound to */
 	struct drm_framebuffer *fb;
 
 	bool enabled;
@@ -365,32 +365,32 @@ struct drm_crtc {
 };
 
 /**
- * drm_output_funcs - control outputs on a given device
+ * drm_connector_funcs - control connectors on a given device
  * @dpms: set power state (see drm_crtc_funcs above)
- * @save: save output state
- * @restore: restore output state
- * @mode_valid: is this mode valid on the given output?
- * @mode_fixup: try to fixup proposed mode for this output
+ * @save: save connector state
+ * @restore: restore connector state
+ * @mode_valid: is this mode valid on the given connector?
+ * @mode_fixup: try to fixup proposed mode for this connector
  * @mode_set: set this mode
- * @detect: is this output active?
- * @get_modes: get mode list for this output
- * @set_property: property for this output may need update
+ * @detect: is this connector active?
+ * @get_modes: get mode list for this connector
+ * @set_property: property for this connector may need update
  * @destroy: make object go away
  *
- * Each CRTC may have one or more outputs attached to it.  The functions
- * below allow the core DRM code to control outputs, enumerate available modes,
+ * Each CRTC may have one or more connectors attached to it.  The functions
+ * below allow the core DRM code to control connectors, enumerate available modes,
  * etc.
  */
-struct drm_output_funcs {
-	void (*dpms)(struct drm_output *output, int mode);
-	void (*save)(struct drm_output *output);
-	void (*restore)(struct drm_output *output);
-	enum drm_output_status (*detect)(struct drm_output *output);
-	int (*get_modes)(struct drm_output *output);
-	bool (*set_property)(struct drm_output *output, struct drm_property *property,
+struct drm_connector_funcs {
+	void (*dpms)(struct drm_connector *connector, int mode);
+	void (*save)(struct drm_connector *connector);
+	void (*restore)(struct drm_connector *connector);
+	enum drm_connector_status (*detect)(struct drm_connector *connector);
+	int (*get_modes)(struct drm_connector *connector);
+	bool (*set_property)(struct drm_connector *connector, struct drm_property *property,
 			     uint64_t val);
-	void (*destroy)(struct drm_output *output);
-  	int (*mode_valid)(struct drm_output *output,
+	void (*destroy)(struct drm_connector *connector);
+  	int (*mode_valid)(struct drm_connector *connector,
 			  struct drm_display_mode *mode);
 
 };
@@ -399,10 +399,10 @@ struct drm_encoder_funcs {
 	void (*destroy)(struct drm_encoder *encoder);
 };
 
-#define DRM_OUTPUT_MAX_UMODES 16
-#define DRM_OUTPUT_MAX_PROPERTY 16
-#define DRM_OUTPUT_LEN 32
-#define DRM_OUTPUT_MAX_ENCODER 2
+#define DRM_CONNECTOR_MAX_UMODES 16
+#define DRM_CONNECTOR_MAX_PROPERTY 16
+#define DRM_CONNECTOR_LEN 32
+#define DRM_CONNECTOR_MAX_ENCODER 2
 
 /**
  * drm_encoder - central DRM encoder structure 
@@ -421,24 +421,24 @@ struct drm_encoder {
 };
 
 /**
- * drm_output - central DRM output control structure
- * @crtc: CRTC this output is currently connected to, NULL if none
- * @possible_crtcs: bitmap of CRTCS this output could be attached to
- * @possible_clones: bitmap of possible outputs this output could clone
- * @interlace_allowed: can this output handle interlaced modes?
- * @doublescan_allowed: can this output handle doublescan?
- * @available_modes: modes available on this output (from get_modes() + user)
- * @initial_x: initial x position for this output
- * @initial_y: initial y position for this output
- * @status: output connected?
- * @funcs: output control functions
+ * drm_connector - central DRM connector control structure
+ * @crtc: CRTC this connector is currently connected to, NULL if none
+ * @possible_crtcs: bitmap of CRTCS this connector could be attached to
+ * @possible_clones: bitmap of possible connectors this connector could clone
+ * @interlace_allowed: can this connector handle interlaced modes?
+ * @doublescan_allowed: can this connector handle doublescan?
+ * @available_modes: modes available on this connector (from get_modes() + user)
+ * @initial_x: initial x position for this connector
+ * @initial_y: initial y position for this connector
+ * @status: connector connected?
+ * @funcs: connector control functions
  *
- * Each output may be connected to one or more CRTCs, or may be clonable by
- * another output if they can share a CRTC.  Each output also has a specific
+ * Each connector may be connected to one or more CRTCs, or may be clonable by
+ * another connector if they can share a CRTC.  Each connector also has a specific
  * position in the broader display (referred to as a 'screen' though it could
  * span multiple monitors).
  */
-struct drm_output {
+struct drm_connector {
 	struct drm_device *dev;
 	struct device kdev;
 	struct device_attribute *attr;
@@ -446,37 +446,37 @@ struct drm_output {
 	struct drm_crtc *crtc;
 	int id; /* idr assigned */
 
-	int output_type;
-	int output_type_id;
+	int connector_type;
+	int connector_type_id;
 	unsigned long possible_crtcs;
 	unsigned long possible_clones;
 	bool interlace_allowed;
 	bool doublescan_allowed;
-	struct list_head modes; /* list of modes on this output */
+	struct list_head modes; /* list of modes on this connector */
 
 	int initial_x, initial_y;
-	enum drm_output_status status;
+	enum drm_connector_status status;
 
 	/* these are modes added by probing with DDC or the BIOS */
 	struct list_head probed_modes;
 	
 	struct drm_display_info display_info;
-  	const struct drm_output_funcs *funcs;
+  	const struct drm_connector_funcs *funcs;
 
 	struct list_head user_modes;
 	struct drm_property_blob *edid_blob_ptr;
-	u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
-	uint64_t property_values[DRM_OUTPUT_MAX_PROPERTY];
+	u32 property_ids[DRM_CONNECTOR_MAX_PROPERTY];
+	uint64_t property_values[DRM_CONNECTOR_MAX_PROPERTY];
 
 	void *helper_private;
 
-	u32 encoder_ids[DRM_OUTPUT_MAX_ENCODER];
+	u32 encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
 };
 
 /**
  * struct drm_mode_set
  *
- * Represents a single crtc the outputs that it drives with what mode
+ * Represents a single crtc the connectors that it drives with what mode
  * and from which framebuffer it scans out from.
  *
  * This is used to set modes.
@@ -490,8 +490,8 @@ struct drm_mode_set
 	uint32_t x;
 	uint32_t y;
 
-	struct drm_output **outputs;
-	size_t num_outputs;
+	struct drm_connector **connectors;
+	size_t num_connectors;
 };
 
 /**
@@ -501,7 +501,7 @@ struct drm_mode_set
  * Currently only a resize hook is available.  DRM will call back into the
  * driver with a new screen width and height.  If the driver can't support
  * the proposed size, it can return false.  Otherwise it should adjust
- * the CRTC<->output mappings as needed and update its view of the screen.
+ * the CRTC<->connector mappings as needed and update its view of the screen.
  */
 struct drm_mode_config_funcs {
 	bool (*resize_fb)(struct drm_device *dev, struct drm_framebuffer *fb);
@@ -513,12 +513,12 @@ struct drm_mode_config_funcs {
  */
 struct drm_mode_config {
 	struct mutex mutex; /* protects configuration and IDR */
-	struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, output, modes - just makes life easier */
+	struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */
 	/* this is limited to one for now */
 	int num_fb;
 	struct list_head fb_list;
-	int num_output;
-	struct list_head output_list;
+	int num_connector;
+	struct list_head connector_list;
 	int num_encoder;
 	struct list_head encoder_list;
 
@@ -536,8 +536,6 @@ struct drm_mode_config {
 	struct list_head property_blob_list;
 	struct drm_property *edid_property;
 	struct drm_property *dpms_property;
-	struct drm_property *connector_type_property;
-	struct drm_property *connector_num_property;
 
 	/* TV properties */
 	struct drm_property *tv_mode_property;
@@ -556,12 +554,12 @@ extern void drm_crtc_init(struct drm_device *dev,
 			  const struct drm_crtc_funcs *funcs);
 extern void drm_crtc_cleanup(struct drm_crtc *crtc);
 
-extern void drm_output_init(struct drm_device *dev,
-			    struct drm_output *output,
-			    const struct drm_output_funcs *funcs,
-			    int output_type);
+extern void drm_connector_init(struct drm_device *dev,
+			    struct drm_connector *connector,
+			    const struct drm_connector_funcs *funcs,
+			    int connector_type);
 
-extern void drm_output_cleanup(struct drm_output *output);
+extern void drm_connector_cleanup(struct drm_connector *connector);
 
 extern void drm_encoder_init(struct drm_device *dev,
 			     struct drm_encoder *encoder,
@@ -570,15 +568,15 @@ extern void drm_encoder_init(struct drm_device *dev,
 
 extern void drm_encoder_cleanup(struct drm_encoder *encoder);
 
-extern char *drm_get_output_name(struct drm_output *output);
+extern char *drm_get_connector_name(struct drm_connector *connector);
 extern char *drm_get_dpms_name(int val);
 extern void drm_fb_release(struct file *filp);
 
-extern struct edid *drm_get_edid(struct drm_output *output,
+extern struct edid *drm_get_edid(struct drm_connector *connector,
 				 struct i2c_adapter *adapter);
-extern int drm_add_edid_modes(struct drm_output *output, struct edid *edid);
-extern void drm_mode_probed_add(struct drm_output *output, struct drm_display_mode *mode);
-extern void drm_mode_remove(struct drm_output *output, struct drm_display_mode *mode);
+extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
+extern void drm_mode_probed_add(struct drm_connector *connector, struct drm_display_mode *mode);
+extern void drm_mode_remove(struct drm_connector *connector, struct drm_display_mode *mode);
 extern struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
 						   struct drm_display_mode *mode);
 extern void drm_mode_debug_printmodeline(struct drm_display_mode *mode);
@@ -607,13 +605,13 @@ extern void drm_mode_sort(struct list_head *mode_list);
 extern int drm_mode_vrefresh(struct drm_display_mode *mode);
 extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
 				  int adjust_flags);
-extern void drm_mode_output_list_update(struct drm_output *output);
-extern int drm_mode_output_update_edid_property(struct drm_output *output,
+extern void drm_mode_connector_list_update(struct drm_connector *connector);
+extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
 						struct edid *edid);
-extern int drm_output_property_set_value(struct drm_output *output,
+extern int drm_connector_property_set_value(struct drm_connector *connector,
 					 struct drm_property *property,
 					 uint64_t value);
-extern int drm_output_property_get_value(struct drm_output *output,
+extern int drm_connector_property_get_value(struct drm_connector *connector,
 					 struct drm_property *property,
 					 uint64_t *value);
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
@@ -623,10 +621,10 @@ extern struct drm_framebuffer *drm_framebuffer_create(struct drm_device *dev);
 extern void drm_framebuffer_destroy(struct drm_framebuffer *fb);
 extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
-extern void drm_crtc_probe_output_modes(struct drm_device *dev, int maxX, int maxY);
+extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY);
 extern bool drm_crtc_in_use(struct drm_crtc *crtc);
 
-extern int drm_output_attach_property(struct drm_output *output,
+extern int drm_connector_attach_property(struct drm_connector *connector,
 				      struct drm_property *property, uint64_t init_val);
 extern struct drm_property *drm_property_create(struct drm_device *dev, int flags,
 						const char *name, int num_values);
@@ -636,9 +634,9 @@ extern int drm_property_add_enum(struct drm_property *property, int index,
 extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
 				     char *formats[]);
 
-extern int drm_mode_output_attach_encoder(struct drm_output *output,
+extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
 					  struct drm_encoder *encoder);
-extern void drm_mode_output_detach_encoder(struct drm_output *output,
+extern void drm_mode_connector_detach_encoder(struct drm_connector *connector,
 					   struct drm_encoder *encoder);
 
 /* IOCTLs */
@@ -647,7 +645,7 @@ extern int drm_mode_getresources(struct drm_device *dev,
 
 extern int drm_mode_getcrtc(struct drm_device *dev,
 			    void *data, struct drm_file *file_priv);
-extern int drm_mode_getoutput(struct drm_device *dev,
+extern int drm_mode_getconnector(struct drm_device *dev,
 			      void *data, struct drm_file *file_priv);
 extern int drm_mode_setcrtc(struct drm_device *dev,
 			    void *data, struct drm_file *file_priv);
@@ -672,7 +670,7 @@ extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
 				      void *data, struct drm_file *file_priv);
 extern int drm_mode_getblob_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
-extern int drm_mode_output_property_set_ioctl(struct drm_device *dev,
+extern int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
 					      void *data, struct drm_file *file_priv);
 extern int drm_mode_hotplug_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
-- 
cgit v1.2.3


From 5d47185eb69d73dd7e6ee3ddde4d0c7642c2d5b7 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 15:32:58 +1000
Subject: drm: switch possible crtc/clones over to encoders

---
 linux-core/drm_crtc.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 568b6b31..09886c15 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -423,8 +423,6 @@ struct drm_encoder {
 /**
  * drm_connector - central DRM connector control structure
  * @crtc: CRTC this connector is currently connected to, NULL if none
- * @possible_crtcs: bitmap of CRTCS this connector could be attached to
- * @possible_clones: bitmap of possible connectors this connector could clone
  * @interlace_allowed: can this connector handle interlaced modes?
  * @doublescan_allowed: can this connector handle doublescan?
  * @available_modes: modes available on this connector (from get_modes() + user)
@@ -448,8 +446,6 @@ struct drm_connector {
 
 	int connector_type;
 	int connector_type_id;
-	unsigned long possible_crtcs;
-	unsigned long possible_clones;
 	bool interlace_allowed;
 	bool doublescan_allowed;
 	struct list_head modes; /* list of modes on this connector */
@@ -470,7 +466,9 @@ struct drm_connector {
 
 	void *helper_private;
 
-	u32 encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
+	uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
+	uint32_t force_encoder_id;
+	uint32_t current_encoder_id;
 };
 
 /**
-- 
cgit v1.2.3


From e439e74776b215d70d8e34e8aa9cea22179dcbc6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 10:05:54 +1000
Subject: drm/modesetting: another re-org of some internals.

Move dpms into the helper functions.
Move crtc into the encoder.
Move disable unused functions into the helper.
---
 linux-core/drm_crtc.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 09886c15..14aa5038 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -304,12 +304,6 @@ struct drm_encoder;
  * bus accessors.
  */
 struct drm_crtc_funcs {
-	/*
-	 * Control power levels on the CRTC.  If the mode passed in is
-	 * unsupported, the provider must use the next lowest power level.
-	 */
-	void (*dpms)(struct drm_crtc *crtc, int mode);
-
 	/* Save CRTC state */
 	void (*save)(struct drm_crtc *crtc); /* suspend? */
 	/* Restore CRTC state */
@@ -416,6 +410,7 @@ struct drm_encoder {
 	uint32_t possible_crtcs;
 	uint32_t possible_clones;
 
+	struct drm_crtc *crtc;
 	const struct drm_encoder_funcs *funcs;
 	void *helper_private;
 };
@@ -441,7 +436,6 @@ struct drm_connector {
 	struct device kdev;
 	struct device_attribute *attr;
 	struct list_head head;
-	struct drm_crtc *crtc;
 	int id; /* idr assigned */
 
 	int connector_type;
@@ -468,7 +462,7 @@ struct drm_connector {
 
 	uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
 	uint32_t force_encoder_id;
-	uint32_t current_encoder_id;
+	struct drm_encoder *encoder; /* currently active encoder */
 };
 
 /**
@@ -582,7 +576,6 @@ extern void drm_mode_config_init(struct drm_device *dev);
 extern void drm_mode_config_cleanup(struct drm_device *dev);
 extern void drm_mode_set_name(struct drm_display_mode *mode);
 extern bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2);
-extern void drm_disable_unused_functions(struct drm_device *dev);
 
 /* for us by fb module */
 extern int drm_mode_attachmode_crtc(struct drm_device *dev,
@@ -631,6 +624,7 @@ extern int drm_property_add_enum(struct drm_property *property, int index,
 				 uint64_t value, const char *name);
 extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
 				     char *formats[]);
+extern char *drm_get_encoder_name(struct drm_encoder *encoder);
 
 extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
 					  struct drm_encoder *encoder);
-- 
cgit v1.2.3


From 0dd000b578adec6ff101c957bce7dc9a32b76713 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 11:12:28 +1000
Subject: drm/modesetting: move some connector functions to helper.

Migrated the output mode collection into the helper.
---
 linux-core/drm_crtc.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 14aa5038..6dbc88a4 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -380,13 +380,10 @@ struct drm_connector_funcs {
 	void (*save)(struct drm_connector *connector);
 	void (*restore)(struct drm_connector *connector);
 	enum drm_connector_status (*detect)(struct drm_connector *connector);
-	int (*get_modes)(struct drm_connector *connector);
+	void (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height);
 	bool (*set_property)(struct drm_connector *connector, struct drm_property *property,
 			     uint64_t val);
 	void (*destroy)(struct drm_connector *connector);
-  	int (*mode_valid)(struct drm_connector *connector,
-			  struct drm_display_mode *mode);
-
 };
 
 struct drm_encoder_funcs {
-- 
cgit v1.2.3


From 46c78a2223802b9105a87b7125fd4872ab69c4ca Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 11:44:35 +1000
Subject: drm/modesetting: add best encoder finding for modesetting

This asks the driver to suggest the best encoder for the connector
during the pick crtcs stage.

Need to also do this during mode setting stages
---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 6dbc88a4..390ab2d3 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -624,7 +624,7 @@ extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
 extern char *drm_get_encoder_name(struct drm_encoder *encoder);
 
 extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
-					  struct drm_encoder *encoder);
+					     struct drm_encoder *encoder);
 extern void drm_mode_connector_detach_encoder(struct drm_connector *connector,
 					   struct drm_encoder *encoder);
 
-- 
cgit v1.2.3


From 4e7b24639808e5e1e2c05143028db1a3bc2812e9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 14:04:41 +1000
Subject: drm: add functions to get/set gamma ramps

---
 linux-core/drm_crtc.h | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 390ab2d3..151d1732 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -315,8 +315,8 @@ struct drm_crtc_funcs {
 	int (*cursor_move)(struct drm_crtc *crtc, int x, int y);
 
 	/* Set gamma on the CRTC */
-	void (*gamma_set)(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
-			  int regno);
+	void (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
+			  uint32_t size);
 	/* Object destroy routine */
 	void (*destroy)(struct drm_crtc *crtc);
 
@@ -354,6 +354,10 @@ struct drm_crtc {
 	int desired_x, desired_y;
 	const struct drm_crtc_funcs *funcs;
 
+	/* CRTC gamma size for reporting to userspace */
+	uint32_t gamma_size;
+	uint16_t *gamma_store;
+
 	/* if you are using the helper */
 	void *helper_private;
 };
@@ -627,7 +631,8 @@ extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
 					     struct drm_encoder *encoder);
 extern void drm_mode_connector_detach_encoder(struct drm_connector *connector,
 					   struct drm_encoder *encoder);
-
+extern bool drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
+					 int gamma_size);
 /* IOCTLs */
 extern int drm_mode_getresources(struct drm_device *dev,
 				 void *data, struct drm_file *file_priv);
@@ -665,7 +670,11 @@ extern int drm_mode_hotplug_ioctl(struct drm_device *dev,
 				  void *data, struct drm_file *file_priv);
 extern int drm_mode_replacefb(struct drm_device *dev,
 			      void *data, struct drm_file *file_priv);
-int drm_mode_getencoder(struct drm_device *dev,
-			void *data, struct drm_file *file_priv);
+extern int drm_mode_getencoder(struct drm_device *dev,
+			       void *data, struct drm_file *file_priv);
+extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+				    void *data, struct drm_file *file_priv);
+extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
+				    void *data, struct drm_file *file_priv);
 #endif /* __DRM_CRTC_H__ */
 
-- 
cgit v1.2.3


From 50d3e5bd020d0b6877a5fef441408f16e31121cd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 16:19:21 +1000
Subject: drm/modesetting: redo object handles around a core object.

handle crtc/encoders/connectors/fb/mode/property/blob using this system.
---
 linux-core/drm_crtc.h | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 151d1732..3c11dfc6 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -16,6 +16,20 @@
 struct drm_device;
 struct drm_mode_set;
 
+
+#define DRM_MODE_OBJECT_CRTC 0xcccccccc
+#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0
+#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0
+#define DRM_MODE_OBJECT_MODE 0xdededede
+#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0
+#define DRM_MODE_OBJECT_FB 0xfbfbfbfb
+#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb
+
+struct drm_mode_object {
+	uint32_t id;
+	uint32_t type;
+};
+
 /*
  * Note on terminology:  here, for brevity and convenience, we refer to connector
  * control chips as 'CRTCs'.  They can control any type of connector, VGA, LVDS,
@@ -78,8 +92,10 @@ enum drm_mode_status {
 struct drm_display_mode {
 	/* Header */
 	struct list_head head;
+	struct drm_mode_object base;
+
 	char name[DRM_DISPLAY_MODE_LEN];
-	int mode_id;
+
 	int connector_count;
 	enum drm_mode_status status;
 	int type;
@@ -178,6 +194,7 @@ enum subpixel_order {
 	SubPixelNone,
 };
 
+
 /*
  * Describes a given display (e.g. CRT or flat panel) and its limitations.
  */
@@ -236,7 +253,7 @@ struct drm_display_info {
 struct drm_framebuffer {
 	struct drm_device *dev;
 	struct list_head head;
-	int id; /* idr assigned */
+	struct drm_mode_object base;
 	unsigned int pitch;
 	unsigned int width;
 	unsigned int height;
@@ -252,9 +269,9 @@ struct drm_framebuffer {
 };
 
 struct drm_property_blob {
+	struct drm_mode_object base;
 	struct list_head head;
 	unsigned int length;
-	unsigned int id;
 	void *data;
 };
 
@@ -266,7 +283,7 @@ struct drm_property_enum {
 
 struct drm_property {
 	struct list_head head;
-	int id; /* idr assigned */
+	struct drm_mode_object base;
 	uint32_t flags;
 	char name[DRM_PROP_NAME_LEN];
 	uint32_t num_values;
@@ -340,7 +357,7 @@ struct drm_crtc {
 	struct drm_device *dev;
 	struct list_head head;
 
-	int id; /* idr assigned */
+	struct drm_mode_object base;
 
 	/* framebuffer the connector is currently bound to */
 	struct drm_framebuffer *fb;
@@ -362,6 +379,7 @@ struct drm_crtc {
 	void *helper_private;
 };
 
+
 /**
  * drm_connector_funcs - control connectors on a given device
  * @dpms: set power state (see drm_crtc_funcs above)
@@ -406,7 +424,7 @@ struct drm_encoder {
 	struct drm_device *dev;
 	struct list_head head;
 
-	int id;
+	struct drm_mode_object base;
 	int encoder_type;
 	uint32_t possible_crtcs;
 	uint32_t possible_clones;
@@ -437,7 +455,8 @@ struct drm_connector {
 	struct device kdev;
 	struct device_attribute *attr;
 	struct list_head head;
-	int id; /* idr assigned */
+
+	struct drm_mode_object base;
 
 	int connector_type;
 	int connector_type_id;
@@ -541,6 +560,14 @@ struct drm_mode_config {
 	uint32_t hotplug_counter;
 };
 
+#define obj_to_crtc(x) container_of(x, struct drm_crtc, base)
+#define obj_to_connector(x) container_of(x, struct drm_connector, base)
+#define obj_to_encoder(x) container_of(x, struct drm_encoder, base)
+#define obj_to_mode(x) container_of(x, struct drm_display_mode, base)
+#define obj_to_fb(x) container_of(x, struct drm_framebuffer, base)
+#define obj_to_property(x) container_of(x, struct drm_property, base)
+#define obj_to_blob(x) container_of(x, struct drm_property_blob, base)
+
 
 extern void drm_crtc_init(struct drm_device *dev,
 			  struct drm_crtc *crtc,
-- 
cgit v1.2.3


From 149b17311ad5f117e8f53a7a8cc032e369b95ed2 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 16:45:44 +1000
Subject: drm: initial mode object groups.

This creates a default group attached to the legacy drm minor nodes.

It covers all the objects in the set. make set resources only return
objects for this set. Need to fix up other functions to only work on
objects in their allowed set.
---
 linux-core/drm_crtc.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 3c11dfc6..01cf9af7 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -519,6 +519,15 @@ struct drm_mode_config_funcs {
 	bool (*resize_fb)(struct drm_device *dev, struct drm_framebuffer *fb);
 };
 
+struct drm_mode_group {
+	uint32_t num_crtcs;
+	uint32_t num_encoders;
+	uint32_t num_connectors;
+
+	/* list of object IDs for this group */
+	uint32_t *id_list;
+};
+
 /**
  * drm_mode_config - Mode configuration control structure
  *
@@ -591,7 +600,7 @@ extern void drm_encoder_cleanup(struct drm_encoder *encoder);
 extern char *drm_get_connector_name(struct drm_connector *connector);
 extern char *drm_get_dpms_name(int val);
 extern void drm_fb_release(struct file *filp);
-
+extern int drm_mode_group_init_legacy_group(struct drm_device *dev, struct drm_mode_group *group);
 extern struct edid *drm_get_edid(struct drm_connector *connector,
 				 struct i2c_adapter *adapter);
 extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
-- 
cgit v1.2.3


From 76a44f14d6339e5bc0c936ef4a360f6c152511bd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 Jun 2008 11:59:28 +1000
Subject: drm/modesetting: overhaul the fb create/delete.

Move TTM code into the driver
---
 linux-core/drm_crtc.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 01cf9af7..5c2d0b3c 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -15,6 +15,7 @@
 
 struct drm_device;
 struct drm_mode_set;
+struct drm_framebuffer;
 
 
 #define DRM_MODE_OBJECT_CRTC 0xcccccccc
@@ -250,10 +251,15 @@ struct drm_display_info {
 	char *raw_edid; /* if any */
 };
 
+struct drm_framebuffer_funcs {
+	void (*destroy)(struct drm_framebuffer *framebuffer);
+};
+
 struct drm_framebuffer {
 	struct drm_device *dev;
 	struct list_head head;
 	struct drm_mode_object base;
+	const struct drm_framebuffer_funcs *funcs;
 	unsigned int pitch;
 	unsigned int width;
 	unsigned int height;
@@ -261,11 +267,10 @@ struct drm_framebuffer {
 	unsigned int depth;
 	int bits_per_pixel;
 	int flags;
-	struct drm_buffer_object *bo;
 	void *fbdev;
 	u32 pseudo_palette[17];
-	struct drm_bo_kmap_obj kmap;
 	struct list_head filp_head;
+	uint32_t mm_handle;
 };
 
 struct drm_property_blob {
@@ -517,6 +522,7 @@ struct drm_mode_set
  */
 struct drm_mode_config_funcs {
 	bool (*resize_fb)(struct drm_device *dev, struct drm_framebuffer *fb);
+	struct drm_framebuffer *(*fb_create)(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd *mode_cmd);
 };
 
 struct drm_mode_group {
@@ -645,8 +651,9 @@ extern int drm_connector_property_get_value(struct drm_connector *connector,
 extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
 extern void drm_framebuffer_set_object(struct drm_device *dev,
 				       unsigned long handle);
-extern struct drm_framebuffer *drm_framebuffer_create(struct drm_device *dev);
-extern void drm_framebuffer_destroy(struct drm_framebuffer *fb);
+extern struct drm_framebuffer *drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,
+						    const struct drm_framebuffer_funcs *funcs);
+extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb);
 extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
 extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
 extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY);
-- 
cgit v1.2.3


From fd27591c6cadd2a868f4110b8993a86c37837d3e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 Jun 2008 13:00:31 +1000
Subject: drm/modesetting: pass object handle to driver !bo

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 5c2d0b3c..c92c59bf 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -332,7 +332,7 @@ struct drm_crtc_funcs {
 	void (*restore)(struct drm_crtc *crtc); /* resume? */
 
 	/* cursor controls */
-	int (*cursor_set)(struct drm_crtc *crtc, struct drm_buffer_object *bo,
+	int (*cursor_set)(struct drm_crtc *crtc, uint32_t buffer_handle,
 			  uint32_t width, uint32_t height);
 	int (*cursor_move)(struct drm_crtc *crtc, int x, int y);
 
-- 
cgit v1.2.3


From 382aa3ceeb79165a9bdddc8f944de131c8cbf2dd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 Jun 2008 13:49:43 +1000
Subject: drm: introduce generation counter to interface.

Idea being if you want to add new crtc/output/encoder dynamically later,
you just increase the generation counter and userspace should re-read
all the resources
---
 linux-core/drm_crtc.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index c92c59bf..f3953692 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -554,6 +554,9 @@ struct drm_mode_config {
 
 	struct list_head property_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;
-- 
cgit v1.2.3


From 967bd219116a4f20aec828b890a225d2f92afd0b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Jun 2008 11:11:22 +1000
Subject: modesetting: initial attempt at debonging fb

---
 linux-core/drm_crtc.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index f3953692..da05ff27 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -500,6 +500,8 @@ struct drm_connector {
  */
 struct drm_mode_set
 {
+	struct list_head head;
+
 	struct drm_framebuffer *fb;
 	struct drm_crtc *crtc;
 	struct drm_display_mode *mode;
-- 
cgit v1.2.3


From f73e54bbf0b97a8f5184ede64d4f263020d623ee Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Jun 2008 13:40:08 +1000
Subject: drm: modesetting unify the hotplug init paths a lot.

remove fb callbacks, just probe into the driver to sort it out
---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index da05ff27..c1d89ee8 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -525,6 +525,7 @@ struct drm_mode_set
 struct drm_mode_config_funcs {
 	bool (*resize_fb)(struct drm_device *dev, struct drm_framebuffer *fb);
 	struct drm_framebuffer *(*fb_create)(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd *mode_cmd);
+	void (*fb_changed)(struct drm_device *dev);
 };
 
 struct drm_mode_group {
-- 
cgit v1.2.3


From efcf066eff690887ace33c0f1192168a31115805 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Jun 2008 15:21:07 +1000
Subject: drm/modesetting: attempt to make fb code more sane

---
 linux-core/drm_crtc.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index c1d89ee8..043b4a57 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -498,8 +498,7 @@ struct drm_connector {
  *
  * This is used to set modes.
  */
-struct drm_mode_set
-{
+struct drm_mode_set {
 	struct list_head head;
 
 	struct drm_framebuffer *fb;
@@ -557,6 +556,9 @@ struct drm_mode_config {
 
 	struct list_head property_list;
 
+	/* in-kernel framebuffers - hung of filp_head in drm_framebuffer */
+	struct list_head fb_kernel_list;
+
 	/* currently in use generation id */
 	int current_generation;
 
-- 
cgit v1.2.3


From 6d4ffd12cd8d3713067adf5fa3bdcb023b0745f1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Fri, 6 Jun 2008 16:24:27 +1000
Subject: drm: fix up fb resize again

---
 linux-core/drm_crtc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 043b4a57..5f5f195a 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -522,9 +522,9 @@ struct drm_mode_set {
  * the CRTC<->connector mappings as needed and update its view of the screen.
  */
 struct drm_mode_config_funcs {
-	bool (*resize_fb)(struct drm_device *dev, struct drm_framebuffer *fb);
+	int (*resize_fb)(struct drm_device *dev, struct drm_file *file_priv, struct drm_framebuffer *fb, struct drm_mode_fb_cmd *mode_cmd);
 	struct drm_framebuffer *(*fb_create)(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd *mode_cmd);
-	void (*fb_changed)(struct drm_device *dev);
+	int (*fb_changed)(struct drm_device *dev);
 };
 
 struct drm_mode_group {
-- 
cgit v1.2.3


From c987e76d953b6aecbfb69058fc4c387aa3fb33c9 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Mon, 9 Jun 2008 16:20:45 -0700
Subject: Add EDID quirk handling

Port over EDID quirks from X.Org so we can handle more monitors.  This meant
adding size info to the drm_display_mode struct, but other than that the
changes were isolated to the DRM EDID handling code (as they should be).
---
 linux-core/drm_crtc.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 5f5f195a..2b577b93 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -115,6 +115,10 @@ struct drm_display_mode {
 	int vscan;
 	unsigned int flags;
 
+	/* Addressable image size (may be 0 for projectors, etc.) */
+	int width_mm;
+	int height_mm;
+
 	/* Actual mode we give to hw */
 	int clock_index;
 	int synth_clock;
@@ -246,8 +250,6 @@ struct drm_display_info {
 
 	enum subpixel_order subpixel_order;
 
-	/* Preferred mode (if any) */
-	struct drm_display_mode *preferred_mode;
 	char *raw_edid; /* if any */
 };
 
-- 
cgit v1.2.3


From 473a1997ace1a9fb545d0457549e50d17eb36175 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Sun, 22 Jun 2008 16:29:00 +0200
Subject: NV50: Initial import of kernel modesetting.

---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 2b577b93..d6fa4cca 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -619,6 +619,7 @@ extern void drm_fb_release(struct file *filp);
 extern int drm_mode_group_init_legacy_group(struct drm_device *dev, struct drm_mode_group *group);
 extern struct edid *drm_get_edid(struct drm_connector *connector,
 				 struct i2c_adapter *adapter);
+extern unsigned char *drm_do_probe_ddc_edid(struct i2c_adapter *adapter);
 extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
 extern void drm_mode_probed_add(struct drm_connector *connector, struct drm_display_mode *mode);
 extern void drm_mode_remove(struct drm_connector *connector, struct drm_display_mode *mode);
-- 
cgit v1.2.3


From 13943fe5823c45759091c1a1f487a4abe377421e Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Thu, 26 Jun 2008 21:28:29 +0200
Subject: modesetting-101: Make dpms property optional + misc cleanup.

- intel_crt seems the only one to provide it, so init it there.
---
 linux-core/drm_crtc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d6fa4cca..b94e91a1 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -677,7 +677,8 @@ extern struct drm_property *drm_property_create(struct drm_device *dev, int flag
 extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
 extern int drm_property_add_enum(struct drm_property *property, int index, 
 				 uint64_t value, const char *name);
-extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
+extern bool drm_mode_create_dpms_property(struct drm_device *dev);
+extern bool drm_mode_create_tv_properties(struct drm_device *dev, int num_formats,
 				     char *formats[]);
 extern char *drm_get_encoder_name(struct drm_encoder *encoder);
 
-- 
cgit v1.2.3


From 087e3f577d795bcd007619514bb2977eede70c16 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Thu, 26 Jun 2008 23:12:04 +0200
Subject: Revert "modesetting-101: Make dpms property optional + misc cleanup."

This reverts commit 13943fe5823c45759091c1a1f487a4abe377421e.
---
 linux-core/drm_crtc.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index b94e91a1..d6fa4cca 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -677,8 +677,7 @@ extern struct drm_property *drm_property_create(struct drm_device *dev, int flag
 extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
 extern int drm_property_add_enum(struct drm_property *property, int index, 
 				 uint64_t value, const char *name);
-extern bool drm_mode_create_dpms_property(struct drm_device *dev);
-extern bool drm_mode_create_tv_properties(struct drm_device *dev, int num_formats,
+extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
 				     char *formats[]);
 extern char *drm_get_encoder_name(struct drm_encoder *encoder);
 
-- 
cgit v1.2.3


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: modesetting: rip out all of the generation code.

not needed, hotplug will work just as well hopefully.
---
 linux-core/drm_crtc.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'linux-core/drm_crtc.h')

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;
-- 
cgit v1.2.3


From b29578103f57a8d684b4a3a79f220e6cc626605e Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Fri, 4 Jul 2008 17:17:11 +0200
Subject: [modesetting-101] Add subconnector and select_subconnector
 properties.

- These facilitate DVI-I and tv-out that can drive multiple types of signals.
---
 linux-core/drm_crtc.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 65ff3f29..caceb650 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -170,6 +170,14 @@ struct drm_display_mode {
 #define DPMSModeSuspend 2
 #define DPMSModeOff 3
 
+#define DRM_MODE_SUBCONNECTOR_Automatic 0
+#define DRM_MODE_SUBCONNECTOR_Unknown 0
+#define DRM_MODE_SUBCONNECTOR_DVID 3
+#define DRM_MODE_SUBCONNECTOR_DVIA 4
+#define DRM_MODE_SUBCONNECTOR_Composite 5
+#define DRM_MODE_SUBCONNECTOR_SVIDEO 6
+#define DRM_MODE_SUBCONNECTOR_Component 8
+
 #define DRM_MODE_CONNECTOR_Unknown 0
 #define DRM_MODE_CONNECTOR_VGA 1
 #define DRM_MODE_CONNECTOR_DVII 2
@@ -571,7 +579,13 @@ struct drm_mode_config {
 	struct drm_property *edid_property;
 	struct drm_property *dpms_property;
 
+	/* optional properties */
+	struct drm_property *dvi_i_subconnector_property;
+	struct drm_property *dvi_i_select_subconnector_property;
+
 	/* TV properties */
+	struct drm_property *tv_subconnector_property;
+	struct drm_property *tv_select_subconnector_property;
 	struct drm_property *tv_mode_property;
 	struct drm_property *tv_left_margin_property;
 	struct drm_property *tv_right_margin_property;
@@ -612,6 +626,8 @@ extern void drm_encoder_cleanup(struct drm_encoder *encoder);
 
 extern char *drm_get_connector_name(struct drm_connector *connector);
 extern char *drm_get_dpms_name(int val);
+extern char *drm_get_select_subconnector_name(int val);
+extern char *drm_get_subconnector_name(int val);
 extern void drm_fb_release(struct file *filp);
 extern int drm_mode_group_init_legacy_group(struct drm_device *dev, struct drm_mode_group *group);
 extern struct edid *drm_get_edid(struct drm_connector *connector,
@@ -674,7 +690,8 @@ extern struct drm_property *drm_property_create(struct drm_device *dev, int flag
 extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
 extern int drm_property_add_enum(struct drm_property *property, int index, 
 				 uint64_t value, const char *name);
-extern bool drm_create_tv_properties(struct drm_device *dev, int num_formats,
+extern int drm_mode_create_dvi_i_properties(struct drm_device *dev);
+extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats,
 				     char *formats[]);
 extern char *drm_get_encoder_name(struct drm_encoder *encoder);
 
-- 
cgit v1.2.3


From c9915d695dad8e4f75b4f551f9f78ff3d64dc666 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Fri, 4 Jul 2008 17:28:04 +0200
Subject: modesetting-101: Move some defines used for enumeration into the
 public header.

- Otherwise userspace has no idea of the meaning.
---
 linux-core/drm_crtc.h | 47 ++---------------------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index caceb650..d4bb8794 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -90,6 +90,8 @@ enum drm_mode_status {
 	.vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
 	.vscan = (vs), .flags = (f), .vrefresh = 0
 
+#define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */
+
 struct drm_display_mode {
 	/* Header */
 	struct list_head head;
@@ -147,51 +149,6 @@ struct drm_display_mode {
 	float hsync;
 };
 
-/* Video mode flags */
-#define V_PHSYNC	(1<<0)
-#define V_NHSYNC	(1<<1)
-#define V_PVSYNC	(1<<2)
-#define V_NVSYNC	(1<<3)
-#define V_INTERLACE	(1<<4)
-#define V_DBLSCAN	(1<<5)
-#define V_CSYNC		(1<<6)
-#define V_PCSYNC	(1<<7)
-#define V_NCSYNC	(1<<8)
-#define V_HSKEW		(1<<9) /* hskew provided */
-#define V_BCAST		(1<<10)
-#define V_PIXMUX	(1<<11)
-#define V_DBLCLK	(1<<12)
-#define V_CLKDIV2	(1<<13)
-
-#define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */
-
-#define DPMSModeOn 0
-#define DPMSModeStandby 1
-#define DPMSModeSuspend 2
-#define DPMSModeOff 3
-
-#define DRM_MODE_SUBCONNECTOR_Automatic 0
-#define DRM_MODE_SUBCONNECTOR_Unknown 0
-#define DRM_MODE_SUBCONNECTOR_DVID 3
-#define DRM_MODE_SUBCONNECTOR_DVIA 4
-#define DRM_MODE_SUBCONNECTOR_Composite 5
-#define DRM_MODE_SUBCONNECTOR_SVIDEO 6
-#define DRM_MODE_SUBCONNECTOR_Component 8
-
-#define DRM_MODE_CONNECTOR_Unknown 0
-#define DRM_MODE_CONNECTOR_VGA 1
-#define DRM_MODE_CONNECTOR_DVII 2
-#define DRM_MODE_CONNECTOR_DVID 3
-#define DRM_MODE_CONNECTOR_DVIA 4
-#define DRM_MODE_CONNECTOR_Composite 5
-#define DRM_MODE_CONNECTOR_SVIDEO 6
-#define DRM_MODE_CONNECTOR_LVDS 7
-#define DRM_MODE_CONNECTOR_Component 8
-#define DRM_MODE_CONNECTOR_9PinDIN 9
-#define DRM_MODE_CONNECTOR_DisplayPort 10
-#define DRM_MODE_CONNECTOR_HDMIA 11
-#define DRM_MODE_CONNECTOR_HDMIB 12
-
 enum drm_connector_status {
 	connector_status_connected = 1,
 	connector_status_disconnected = 2,
-- 
cgit v1.2.3


From 65803e53a696347e38d7f6c2c8dc186c6764ff03 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Sun, 20 Jul 2008 13:49:18 +0200
Subject: modesetting-101: implement optional scaling and dithering properties

---
 linux-core/drm_crtc.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d4bb8794..d88c6149 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -536,7 +536,7 @@ struct drm_mode_config {
 	struct drm_property *edid_property;
 	struct drm_property *dpms_property;
 
-	/* optional properties */
+	/* DVI-I properties */
 	struct drm_property *dvi_i_subconnector_property;
 	struct drm_property *dvi_i_select_subconnector_property;
 
@@ -549,6 +549,10 @@ struct drm_mode_config {
 	struct drm_property *tv_top_margin_property;
 	struct drm_property *tv_bottom_margin_property;
 
+	/* Optional properties */
+	struct drm_property *scaling_mode_property;
+	struct drm_property *dithering_mode_property;
+
 	/* hotplug */
 	uint32_t hotplug_counter;
 };
@@ -650,6 +654,8 @@ extern int drm_property_add_enum(struct drm_property *property, int index,
 extern int drm_mode_create_dvi_i_properties(struct drm_device *dev);
 extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats,
 				     char *formats[]);
+extern int drm_mode_create_scaling_mode_property(struct drm_device *dev);
+extern int drm_mode_create_dithering_property(struct drm_device *dev);
 extern char *drm_get_encoder_name(struct drm_encoder *encoder);
 
 extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
-- 
cgit v1.2.3


From 3ef1d05001a9e28ed52536de7e020323d8d34d83 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Sun, 20 Jul 2008 14:51:22 +0200
Subject: modesetting-101: set_property should return an int, not a bool

---
 linux-core/drm_crtc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index d88c6149..117b7213 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -375,7 +375,7 @@ struct drm_connector_funcs {
 	void (*restore)(struct drm_connector *connector);
 	enum drm_connector_status (*detect)(struct drm_connector *connector);
 	void (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height);
-	bool (*set_property)(struct drm_connector *connector, struct drm_property *property,
+	int (*set_property)(struct drm_connector *connector, struct drm_property *property,
 			     uint64_t val);
 	void (*destroy)(struct drm_connector *connector);
 };
-- 
cgit v1.2.3


From 11d30750873260fe19498d90831f07079dfad5d8 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sat, 26 Jul 2008 08:41:01 +1000
Subject: modesetting: pass file_priv into cursor set functions

---
 linux-core/drm_crtc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 117b7213..bfccdeb5 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -299,8 +299,8 @@ struct drm_crtc_funcs {
 	void (*restore)(struct drm_crtc *crtc); /* resume? */
 
 	/* cursor controls */
-	int (*cursor_set)(struct drm_crtc *crtc, uint32_t buffer_handle,
-			  uint32_t width, uint32_t height);
+	int (*cursor_set)(struct drm_crtc *crtc, struct drm_file *file_priv,
+			  uint32_t handle, uint32_t width, uint32_t height);
 	int (*cursor_move)(struct drm_crtc *crtc, int x, int y);
 
 	/* Set gamma on the CRTC */
-- 
cgit v1.2.3


From df9871064e8b564d9ae2e56d561b64434fd004af Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sat, 26 Jul 2008 08:56:23 +1000
Subject: radeon: add initial atombios modesetting and GEM -> TTM translation
 layer.

This is an initial import of the atom bios parser with modesetting support
for r500 hw using atombios. It also includes a simple memory manager
layer that translates a radeon GEM style interface onto TTM internally.

So far this memory manager has only been used for pinned object allocation
for the DDX to test modesetting.
---
 linux-core/drm_crtc.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index bfccdeb5..3a3a09aa 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -664,6 +664,7 @@ extern void drm_mode_connector_detach_encoder(struct drm_connector *connector,
 					   struct drm_encoder *encoder);
 extern bool drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
 					 int gamma_size);
+extern void *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type);
 /* IOCTLs */
 extern int drm_mode_getresources(struct drm_device *dev,
 				 void *data, struct drm_file *file_priv);
-- 
cgit v1.2.3


From 23cb67dfbabe8c76ffd86b6c01abacc027d0fb72 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Aug 2008 16:18:09 +1000
Subject: drm: port X crtc picking algorithm.

This mimics the X.org from ajax with less options
---
 linux-core/drm_crtc.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 3a3a09aa..5f63dc2e 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -604,6 +604,8 @@ extern void drm_mode_config_init(struct drm_device *dev);
 extern void drm_mode_config_cleanup(struct drm_device *dev);
 extern void drm_mode_set_name(struct drm_display_mode *mode);
 extern bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2);
+extern int drm_mode_width(struct drm_display_mode *mode);
+extern int drm_mode_height(struct drm_display_mode *mode);
 
 /* for us by fb module */
 extern int drm_mode_attachmode_crtc(struct drm_device *dev,
-- 
cgit v1.2.3


From 5fdfbee22acb8eaaa834457c30e6f68883ab1353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Tue, 23 Sep 2008 16:47:34 +1000
Subject: Store the buffer object backing the fb as a void pointer, not a
 handle.

This lets us defer handle creation until userspace acutally asks for
one, at which point we also have a drm_file to associate it with.
---
 linux-core/drm_crtc.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 5f63dc2e..6a73a71b 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -220,6 +220,9 @@ struct drm_display_info {
 
 struct drm_framebuffer_funcs {
 	void (*destroy)(struct drm_framebuffer *framebuffer);
+	int (*create_handle)(struct drm_framebuffer *fb,
+			     struct drm_file *file_priv,
+			     unsigned int *handle);
 };
 
 struct drm_framebuffer {
@@ -237,7 +240,7 @@ struct drm_framebuffer {
 	void *fbdev;
 	u32 pseudo_palette[17];
 	struct list_head filp_head;
-	uint32_t mm_handle;
+	void *mm_private;
 };
 
 struct drm_property_blob {
-- 
cgit v1.2.3


From 563e7e5930a8d628b33cb1f7a9aaea251f2fc50b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Nov 2008 09:36:03 +1000
Subject: radeon/drm: fixup ref counting in on fb objs

---
 linux-core/drm_crtc.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linux-core/drm_crtc.h')

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 6a73a71b..13fba4f2 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -240,7 +240,6 @@ struct drm_framebuffer {
 	void *fbdev;
 	u32 pseudo_palette[17];
 	struct list_head filp_head;
-	void *mm_private;
 };
 
 struct drm_property_blob {
-- 
cgit v1.2.3