Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is the main drm pull request for 3.10.

  Wierd bits:
   - OMAP drm changes required OMAP dss changes, in drivers/video, so I
     took them in here.
   - one more fbcon fix for font handover
   - VT switch avoidance in pm code
   - scatterlist helpers for gpu drivers - have acks from akpm

  Highlights:
   - qxl kms driver - driver for the spice qxl virtual GPU

  Nouveau:
   - fermi/kepler VRAM compression
   - GK110/nvf0 modesetting support.

  Tegra:
   - host1x core merged with 2D engine support

  i915:
   - vt switchless resume
   - more valleyview support
   - vblank fixes
   - modesetting pipe config rework

  radeon:
   - UVD engine support
   - SI chip tiling support
   - GPU registers initialisation from golden values.

  exynos:
   - device tree changes
   - fimc block support

  Otherwise:
   - bunches of fixes all over the place."

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (513 commits)
  qxl: update to new idr interfaces.
  drm/nouveau: fix build with nv50->nvc0
  drm/radeon: fix handling of v6 power tables
  drm/radeon: clarify family checks in pm table parsing
  drm/radeon: consolidate UVD clock programming
  drm/radeon: fix UPLL_REF_DIV_MASK definition
  radeon: add bo tracking debugfs
  drm/radeon: add new richland pci ids
  drm/radeon: add some new SI PCI ids
  drm/radeon: fix scratch reg handling for UVD fence
  drm/radeon: allocate SA bo in the requested domain
  drm/radeon: fix possible segfault when parsing pm tables
  drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
  OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found
  OMAPDSS: VENC: Add error handling for venc_probe_pdata
  OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata
  OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata
  OMAPDSS: DSI: Add error handling for dsi_probe_pdata
  OMAPDSS: SDI: Add error handling for sdi_probe_pdata
  OMAPDSS: DPI: Add error handling for dpi_probe_pdata
  ...

1 files changed, 253 insertions, 0 deletions

diff --git a/include/trace/events/host1x.h b/include/trace/events/host1x.h
new file mode 100644
index 000000000000..94db6a2c3540
--- /dev/null
+++ b/include/trace/events/host1x.h
@@ -0,0 +1,253 @@
+/*
+ * include/trace/events/host1x.h
+ *
+ * host1x event logging to ftrace.
+ *
+ * Copyright (c) 2010-2013, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM host1x
+
+#if !defined(_TRACE_HOST1X_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_HOST1X_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+DECLARE_EVENT_CLASS(host1x,
+        TP_PROTO(const char *name),
+        TP_ARGS(name),
+        TP_STRUCT__entry(__field(const char *, name)),
+        TP_fast_assign(__entry->name = name;),
+        TP_printk("name=%s", __entry->name)
+);
+
+DEFINE_EVENT(host1x, host1x_channel_open,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+
+DEFINE_EVENT(host1x, host1x_channel_release,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+
+DEFINE_EVENT(host1x, host1x_cdma_begin,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+
+DEFINE_EVENT(host1x, host1x_cdma_end,
+        TP_PROTO(const char *name),
+        TP_ARGS(name)
+);
+
+TRACE_EVENT(host1x_cdma_push,
+        TP_PROTO(const char *name, u32 op1, u32 op2),
+
+        TP_ARGS(name, op1, op2),
+
+        TP_STRUCT__entry(
+                __field(const char *, name)
+                __field(u32, op1)
+                __field(u32, op2)
+        ),
+
+        TP_fast_assign(
+                __entry->name = name;
+                __entry->op1 = op1;
+                __entry->op2 = op2;
+        ),
+
+        TP_printk("name=%s, op1=%08x, op2=%08x",
+                __entry->name, __entry->op1, __entry->op2)
+);
+
+TRACE_EVENT(host1x_cdma_push_gather,
+        TP_PROTO(const char *name, u32 mem_id,
+                        u32 words, u32 offset, void *cmdbuf),
+
+        TP_ARGS(name, mem_id, words, offset, cmdbuf),
+
+        TP_STRUCT__entry(
+                __field(const char *, name)
+                __field(u32, mem_id)
+                __field(u32, words)
+                __field(u32, offset)
+                __field(bool, cmdbuf)
+                __dynamic_array(u32, cmdbuf, words)
+        ),
+
+        TP_fast_assign(
+                if (cmdbuf) {
+                        memcpy(__get_dynamic_array(cmdbuf), cmdbuf+offset,
+                                        words * sizeof(u32));
+                }
+                __entry->cmdbuf = cmdbuf;
+                __entry->name = name;
+                __entry->mem_id = mem_id;
+                __entry->words = words;
+                __entry->offset = offset;
+        ),
+
+        TP_printk("name=%s, mem_id=%08x, words=%u, offset=%d, contents=[%s]",
+          __entry->name, __entry->mem_id,
+          __entry->words, __entry->offset,
+          __print_hex(__get_dynamic_array(cmdbuf),
+                  __entry->cmdbuf ? __entry->words * 4 : 0))
+);
+
+TRACE_EVENT(host1x_channel_submit,
+        TP_PROTO(const char *name, u32 cmdbufs, u32 relocs, u32 waitchks,
+                        u32 syncpt_id, u32 syncpt_incrs),
+
+        TP_ARGS(name, cmdbufs, relocs, waitchks, syncpt_id, syncpt_incrs),
+
+        TP_STRUCT__entry(
+                __field(const char *, name)
+                __field(u32, cmdbufs)
+                __field(u32, relocs)
+                __field(u32, waitchks)
+                __field(u32, syncpt_id)
+                __field(u32, syncpt_incrs)
+        ),
+
+        TP_fast_assign(
+                __entry->name = name;
+                __entry->cmdbufs = cmdbufs;
+                __entry->relocs = relocs;
+                __entry->waitchks = waitchks;
+                __entry->syncpt_id = syncpt_id;
+                __entry->syncpt_incrs = syncpt_incrs;
+        ),
+
+        TP_printk("name=%s, cmdbufs=%u, relocs=%u, waitchks=%d,"
+                "syncpt_id=%u, syncpt_incrs=%u",
+          __entry->name, __entry->cmdbufs, __entry->relocs, __entry->waitchks,
+          __entry->syncpt_id, __entry->syncpt_incrs)
+);
+
+TRACE_EVENT(host1x_channel_submitted,
+        TP_PROTO(const char *name, u32 syncpt_base, u32 syncpt_max),
+
+        TP_ARGS(name, syncpt_base, syncpt_max),
+
+        TP_STRUCT__entry(
+                __field(const char *, name)
+                __field(u32, syncpt_base)
+                __field(u32, syncpt_max)
+        ),
+
+        TP_fast_assign(
+                __entry->name = name;
+                __entry->syncpt_base = syncpt_base;
+                __entry->syncpt_max = syncpt_max;
+        ),
+
+        TP_printk("name=%s, syncpt_base=%d, syncpt_max=%d",
+                __entry->name, __entry->syncpt_base, __entry->syncpt_max)
+);
+
+TRACE_EVENT(host1x_channel_submit_complete,
+        TP_PROTO(const char *name, int count, u32 thresh),
+
+        TP_ARGS(name, count, thresh),
+
+        TP_STRUCT__entry(
+                __field(const char *, name)
+                __field(int, count)
+                __field(u32, thresh)
+        ),
+
+        TP_fast_assign(
+                __entry->name = name;
+                __entry->count = count;
+                __entry->thresh = thresh;
+        ),
+
+        TP_printk("name=%s, count=%d, thresh=%d",
+                __entry->name, __entry->count, __entry->thresh)
+);
+
+TRACE_EVENT(host1x_wait_cdma,
+        TP_PROTO(const char *name, u32 eventid),
+
+        TP_ARGS(name, eventid),
+
+        TP_STRUCT__entry(
+                __field(const char *, name)
+                __field(u32, eventid)
+        ),
+
+        TP_fast_assign(
+                __entry->name = name;
+                __entry->eventid = eventid;
+        ),
+
+        TP_printk("name=%s, event=%d", __entry->name, __entry->eventid)
+);
+
+TRACE_EVENT(host1x_syncpt_load_min,
+        TP_PROTO(u32 id, u32 val),
+
+        TP_ARGS(id, val),
+
+        TP_STRUCT__entry(
+                __field(u32, id)
+                __field(u32, val)
+        ),
+
+        TP_fast_assign(
+                __entry->id = id;
+                __entry->val = val;
+        ),
+
+        TP_printk("id=%d, val=%d", __entry->id, __entry->val)
+);
+
+TRACE_EVENT(host1x_syncpt_wait_check,
+        TP_PROTO(void *mem_id, u32 offset, u32 syncpt_id, u32 thresh, u32 min),
+
+        TP_ARGS(mem_id, offset, syncpt_id, thresh, min),
+
+        TP_STRUCT__entry(
+                __field(void *, mem_id)
+                __field(u32, offset)
+                __field(u32, syncpt_id)
+                __field(u32, thresh)
+                __field(u32, min)
+        ),
+
+        TP_fast_assign(
+                __entry->mem_id = mem_id;
+                __entry->offset = offset;
+                __entry->syncpt_id = syncpt_id;
+                __entry->thresh = thresh;
+                __entry->min = min;
+        ),
+
+        TP_printk("mem_id=%p, offset=%05x, id=%d, thresh=%d, current=%d",
+                __entry->mem_id, __entry->offset,
+                __entry->syncpt_id, __entry->thresh,
+                __entry->min)
+);
+
+#endif /*  _TRACE_HOST1X_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>