---

yaml --- r: 358188 b: refs/heads/master c: 8bb0daf h: refs/heads/master v: v3
git-mirror · Feb 16, 2013 · b39c10c · b39c10c
1 parent 79504e1
commit b39c10c
Show file tree

Hide file tree

Showing 29 changed files with 42 additions and 51 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4462f246c8821f625f45bce52c7ca7e0207dffe
+refs/heads/master: 8bb0daffb0b8e45188066255b4203446eae181f1
diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig
@@ -215,3 +215,5 @@ source "drivers/gpu/drm/cirrus/Kconfig"
 source "drivers/gpu/drm/shmobile/Kconfig"
 
 source "drivers/gpu/drm/tegra/Kconfig"
+
+source "drivers/gpu/drm/omapdrm/Kconfig"
diff --git a/trunk/drivers/gpu/drm/Makefile b/trunk/drivers/gpu/drm/Makefile
@@ -50,4 +50,5 @@ obj-$(CONFIG_DRM_UDL) += udl/
 obj-$(CONFIG_DRM_AST) += ast/
 obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
 obj-$(CONFIG_DRM_TEGRA) += tegra/
+obj-$(CONFIG_DRM_OMAP)	+= omapdrm/
 obj-y			+= i2c/
diff --git a/trunk/drivers/staging/omapdrm/Kconfig → trunk/drivers/gpu/drm/omapdrm/Kconfig b/trunk/drivers/staging/omapdrm/Kconfig → trunk/drivers/gpu/drm/omapdrm/Kconfig
diff --git a/trunk/drivers/staging/omapdrm/Makefile → trunk/drivers/gpu/drm/omapdrm/Makefile b/trunk/drivers/staging/omapdrm/Makefile → trunk/drivers/gpu/drm/omapdrm/Makefile
diff --git a/trunk/drivers/gpu/drm/omapdrm/TODO b/trunk/drivers/gpu/drm/omapdrm/TODO
@@ -0,0 +1,23 @@
+TODO
+. Where should we do eviction (detatch_pages())?  We aren't necessarily
+  accessing the pages via a GART, so maybe we need some other threshold
+  to put a cap on the # of pages that can be pin'd.
+  . Use mm_shrinker to trigger unpinning pages.
+  . This is mainly theoretical since most of these devices don't actually
+    have swap or harddrive.
+. GEM/shmem backed pages can have existing mappings (kernel linear map,
+  etc..), which isn't really ideal.
+. Revisit GEM sync object infrastructure.. TTM has some framework for this
+  already.  Possibly this could be refactored out and made more common?
+  There should be some way to do this with less wheel-reinvention.
+  . This can be handled by the dma-buf fence/reservation stuff when it
+    lands
+
+Userspace:
+. git://anongit.freedesktop.org/xorg/driver/xf86-video-omap
+
+Currently tested on
+. OMAP3530 beagleboard
+. OMAP4430 pandaboard
+. OMAP4460 pandaboard
+. OMAP5432 uEVM
diff --git a/.../drivers/staging/omapdrm/omap_connector.c → .../drivers/gpu/drm/omapdrm/omap_connector.c b/.../drivers/staging/omapdrm/omap_connector.c → .../drivers/gpu/drm/omapdrm/omap_connector.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_connector.c
+ * drivers/gpu/drm/omapdrm/omap_connector.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>

diff --git a/trunk/drivers/staging/omapdrm/omap_crtc.c → trunk/drivers/gpu/drm/omapdrm/omap_crtc.c b/trunk/drivers/staging/omapdrm/omap_crtc.c → trunk/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_crtc.c
+ * drivers/gpu/drm/omapdrm/omap_crtc.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>

diff --git a/trunk/drivers/staging/omapdrm/omap_debugfs.c → trunk/drivers/gpu/drm/omapdrm/omap_debugfs.c b/trunk/drivers/staging/omapdrm/omap_debugfs.c → trunk/drivers/gpu/drm/omapdrm/omap_debugfs.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_debugfs.c
+ * drivers/gpu/drm/omapdrm/omap_debugfs.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob.clark@linaro.org>

diff --git a/...k/drivers/staging/omapdrm/omap_dmm_priv.h → ...k/drivers/gpu/drm/omapdrm/omap_dmm_priv.h b/...k/drivers/staging/omapdrm/omap_dmm_priv.h → ...k/drivers/gpu/drm/omapdrm/omap_dmm_priv.h
diff --git a/.../drivers/staging/omapdrm/omap_dmm_tiler.c → .../drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/.../drivers/staging/omapdrm/omap_dmm_tiler.c → .../drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
diff --git a/.../drivers/staging/omapdrm/omap_dmm_tiler.h → .../drivers/gpu/drm/omapdrm/omap_dmm_tiler.h b/.../drivers/staging/omapdrm/omap_dmm_tiler.h → .../drivers/gpu/drm/omapdrm/omap_dmm_tiler.h
diff --git a/trunk/drivers/staging/omapdrm/omap_drv.c → trunk/drivers/gpu/drm/omapdrm/omap_drv.c b/trunk/drivers/staging/omapdrm/omap_drv.c → trunk/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_drv.c
+ * drivers/gpu/drm/omapdrm/omap_drv.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>

diff --git a/trunk/drivers/staging/omapdrm/omap_drv.h → trunk/drivers/gpu/drm/omapdrm/omap_drv.h b/trunk/drivers/staging/omapdrm/omap_drv.h → trunk/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_drv.h
+ * drivers/gpu/drm/omapdrm/omap_drv.h
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>
@@ -25,8 +25,8 @@
 #include <linux/types.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/omap_drm.h>
 #include <linux/platform_data/omap_drm.h>
-#include "omap_drm.h"
 
 
 #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)

diff --git a/trunk/drivers/staging/omapdrm/omap_encoder.c → trunk/drivers/gpu/drm/omapdrm/omap_encoder.c b/trunk/drivers/staging/omapdrm/omap_encoder.c → trunk/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_encoder.c
+ * drivers/gpu/drm/omapdrm/omap_encoder.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>

diff --git a/trunk/drivers/staging/omapdrm/omap_fb.c → trunk/drivers/gpu/drm/omapdrm/omap_fb.c b/trunk/drivers/staging/omapdrm/omap_fb.c → trunk/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_fb.c
+ * drivers/gpu/drm/omapdrm/omap_fb.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>

diff --git a/trunk/drivers/staging/omapdrm/omap_fbdev.c → trunk/drivers/gpu/drm/omapdrm/omap_fbdev.c b/trunk/drivers/staging/omapdrm/omap_fbdev.c → trunk/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_fbdev.c
+ * drivers/gpu/drm/omapdrm/omap_fbdev.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>

diff --git a/trunk/drivers/staging/omapdrm/omap_gem.c → trunk/drivers/gpu/drm/omapdrm/omap_gem.c b/trunk/drivers/staging/omapdrm/omap_gem.c → trunk/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_gem.c
+ * drivers/gpu/drm/omapdrm/omap_gem.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob.clark@linaro.org>

diff --git a/...drivers/staging/omapdrm/omap_gem_dmabuf.c → ...drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/...drivers/staging/omapdrm/omap_gem_dmabuf.c → ...drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_gem_dmabuf.c
+ * drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob.clark@linaro.org>

diff --git a/...rivers/staging/omapdrm/omap_gem_helpers.c → ...rivers/gpu/drm/omapdrm/omap_gem_helpers.c b/...rivers/staging/omapdrm/omap_gem_helpers.c → ...rivers/gpu/drm/omapdrm/omap_gem_helpers.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_gem_helpers.c
+ * drivers/gpu/drm/omapdrm/omap_gem_helpers.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob.clark@linaro.org>

diff --git a/trunk/drivers/staging/omapdrm/omap_irq.c → trunk/drivers/gpu/drm/omapdrm/omap_irq.c b/trunk/drivers/staging/omapdrm/omap_irq.c → trunk/drivers/gpu/drm/omapdrm/omap_irq.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_irq.c
+ * drivers/gpu/drm/omapdrm/omap_irq.c
  *
  * Copyright (C) 2012 Texas Instruments
  * Author: Rob Clark <rob.clark@linaro.org>

diff --git a/trunk/drivers/staging/omapdrm/omap_plane.c → trunk/drivers/gpu/drm/omapdrm/omap_plane.c b/trunk/drivers/staging/omapdrm/omap_plane.c → trunk/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -1,5 +1,5 @@
 /*
- * drivers/staging/omapdrm/omap_plane.c
+ * drivers/gpu/drm/omapdrm/omap_plane.c
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob.clark@linaro.org>

diff --git a/trunk/drivers/staging/omapdrm/tcm-sita.c → trunk/drivers/gpu/drm/omapdrm/tcm-sita.c b/trunk/drivers/staging/omapdrm/tcm-sita.c → trunk/drivers/gpu/drm/omapdrm/tcm-sita.c
diff --git a/trunk/drivers/staging/omapdrm/tcm-sita.h → trunk/drivers/gpu/drm/omapdrm/tcm-sita.h b/trunk/drivers/staging/omapdrm/tcm-sita.h → trunk/drivers/gpu/drm/omapdrm/tcm-sita.h
diff --git a/trunk/drivers/staging/omapdrm/tcm.h → trunk/drivers/gpu/drm/omapdrm/tcm.h b/trunk/drivers/staging/omapdrm/tcm.h → trunk/drivers/gpu/drm/omapdrm/tcm.h
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -114,8 +114,6 @@ source "drivers/staging/media/Kconfig"
 
 source "drivers/staging/net/Kconfig"
 
-source "drivers/staging/omapdrm/Kconfig"
-
 source "drivers/staging/android/Kconfig"
 
 source "drivers/staging/ozwpan/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_SPEAKUP)		+= speakup/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/
 obj-$(CONFIG_MFD_NVEC)		+= nvec/
-obj-$(CONFIG_DRM_OMAP)		+= omapdrm/
 obj-$(CONFIG_ANDROID)		+= android/
 obj-$(CONFIG_USB_WPAN_HCD)	+= ozwpan/
 obj-$(CONFIG_USB_G_CCG)		+= ccg/

diff --git a/trunk/drivers/staging/omapdrm/TODO b/trunk/drivers/staging/omapdrm/TODO
diff --git a/trunk/drivers/staging/omapdrm/omap_drm.h → trunk/include/uapi/drm/omap_drm.h b/trunk/drivers/staging/omapdrm/omap_drm.h → trunk/include/uapi/drm/omap_drm.h
@@ -1,5 +1,5 @@
 /*
- * include/drm/omap_drm.h
+ * include/uapi/drm/omap_drm.h
  *
  * Copyright (C) 2011 Texas Instruments
  * Author: Rob Clark <rob@ti.com>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -215,3 +215,5 @@ source "drivers/gpu/drm/cirrus/Kconfig"
		source "drivers/gpu/drm/shmobile/Kconfig"

		source "drivers/gpu/drm/tegra/Kconfig"

		source "drivers/gpu/drm/omapdrm/Kconfig"