1 files changed, 39 insertions, 51 deletions

diff --git a/src/mainboard/intel/wtm2/i915io.h b/src/mainboard/intel/wtm2/i915io.h
index 2277188b6a..52842adb45 100644
--- a/src/mainboard/intel/wtm2/i915io.h
+++ b/src/mainboard/intel/wtm2/i915io.h
@@ -18,71 +18,59 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "i915_reg.h"
-#include "drm_dp_helper.h"
+#include <northbridge/intel/haswell/i915_reg.h>
+#include <northbridge/intel/haswell/drm_dp_helper.h>
 
 /* things that are, strangely, not defined anywhere? */
-#define PCH_PP_UNLOCK 0xabcd0000
-#define WMx_LP_SR_EN (1<<31)
+#define PCH_PP_UNLOCK	0xabcd0000
+#define WMx_LP_SR_EN	(1<<31)
+#define PRB0_TAIL	0x02030
+#define PRB0_HEAD	0x02034
+#define PRB0_START	0x02038
+#define PRB0_CTL	0x0203c
 
-/* Google Link-specific defines */
+
+/* mainboard-specific defines */
+/* how many bytes do we need for the framebuffer?
+ * Well, this gets messy. To get an exact answer, we have
+ * to ask the panel, but we'd rather zero the memory
+ * and set up the gtt while the panel powers up. So,
+ * we take a reasonable guess, secure in the knowledge that the
+ * MRC has to overestimate the number of bytes used.
+ * 8 MiB is a very safe guess. There may be a better way later, but
+ * fact is, the initial framebuffer is only very temporary. And taking
+ * a little long is ok; this is done much faster than the AUX
+ * channel is ready for IO.
+ */
+#define FRAME_BUFFER_BYTES (8*MiB)
 /* how many 4096-byte pages do we need for the framebuffer?
- * There are 32 bits per pixel, or 4 bytes,
- * which means 1024 pixels per page.
- * HencetThere are 4250 GTTs on Link:
- * 2650 (X) * 1700 (Y) pixels / 1024 pixels per page.
+ * There are hard ways to get this, and easy ways:
+ * there are FRAME_BUFFER_BYTES/4096 pages, since pages are 4096
+ * on this chip.
  */
-#define FRAME_BUFFER_PAGES ((2560*1700)/1024)
-#define FRAME_BUFFER_BYTES (FRAME_BUFFER_PAGES*4096)
+#define FRAME_BUFFER_PAGES (FRAME_BUFFER_BYTES/(4096))
 
-/* One-letter commands for code not mean to be ready for humans.
- * The code was generated by a set of programs/scripts.
- * M print out a kernel message
- * R read a register. We do these mainly to ensure that if hardware wanted
- * the register read, it was read; also, in debug, we can see what was expected
- * and what was found. This has proven *very* useful to get this debugged.
- * The udelay, if non-zero, will make sure there is a
- * udelay() call with the value.
- * The count is from the kernel and tells us how many times this read was done.
- * Also useful for debugging and the state
- * machine uses the info to drive a poll.
- * W Write a register
- * V set verbosity. It's a bit mask.
- *   0 -> nothing
- *   1 -> print kernel messages
- *   2 -> print IO ops
- *   4 -> print the number of times we spin on a register in a poll
- *   8 -> restore whatever the previous verbosity level was
- *   		(only one deep stack)
- *
- * Again, this is not really meant for human consumption. There is not a poll
- * operator as such because, sometimes, there is a read/write/read where the
- * second read is a poll, and this chipset is so touchy I'm reluctant to move
- * things around and/or delete too many reads.
- */
-#define M 1
-#define R 2
-#define W 4
-#define V 8
-#define I 16
-#define P 32
 
-struct iodef {
-	unsigned char op;
-	unsigned int count;
-	const char *msg;
-	unsigned long addr;
-	unsigned long data;
-	unsigned long udelay;
+/* debug enums. These are for printks that, due to their place in the
+ * middle of graphics device IO, might change timing.  Use with care
+ * or not at all.
+ */
+enum {
+	vio = 2, /* dump every IO */
+	vspin = 4, /* print # of times we spun on a register value */
 };
 
 /* i915.c */
 unsigned long io_i915_READ32(unsigned long addr);
 void io_i915_WRITE32(unsigned long val, unsigned long addr);
+int vbe_mode_info_valid(void);
+void fill_lb_framebuffer(struct lb_framebuffer *framebuffer);
 
 /* intel_dp.c */
 u32 pack_aux(u32 *src, int src_bytes);
-void unpack_aux(u32 src, u32 *dst, int dst_bytes);
+void unpack_aux(u32 src, u8 *dst, int dst_bytes);
 int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes,
-	u32 *recv, int recv_size);
+	u8 *recv, int recv_size);
 
+/* i915io.c */
+void graphics_register_reset(u32 aux_ctl, u32 aux_data, int verbose);