Commit 8e26875e authored by Dave Airlie's avatar Dave Airlie
Browse files

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

* 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/omap: remove fbdev debug enter/leave hooks
  omapdrm: simplify locking in the fb debugfs file
  omapdrm: only take crtc->mutex in crtc callbacks
  drm/omap: move out of staging
  staging/omapdrm: Use kmemdup rather than duplicating its implementation
  staging: omapdrm/omap_gem_dmabuf.c: fix memory leakage
  drm/omap: Add OMAP5 support
  drm/omap: Add PM capabilities
parents 3314fdf8 8e44770f

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/staging/omapdrm/TODO→drivers/gpu/drm/omapdrm/TODO

+23 −0
Original line number Diff line number Diff line 
TODO

. add video decode/encode support (via syslink3 + codec-engine)

  . NOTE: with dmabuf this probably could be split into different driver

    so perhaps this TODO doesn't belong here

. where should we do eviction (detatch_pages())?  We aren't necessarily

. 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.  (It is mostly only

  of interest in case you have a swap partition/file.. which a lot of

  these devices do not.. but it doesn't hurt for the driver to do the

  right thing anyways.)

  . Use mm_shrinker to trigger unpinning pages.  Need to figure out how

    to handle next issue first (I think?)

  . Note TTM already has some mm_shrinker stuff..  maybe an argument to

    move to TTM?  Or maybe something that could be factored out in common?

  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.

. Solve PM sequencing on resume.  DMM/TILER must be reloaded before any

  access is made from any component in the system.  Which means on suspend

  CRTC's should be disabled, and on resume the LUT should be reprogrammed

  before CRTC's are re-enabled, to prevent DSS from trying to DMA from a

  buffer mapped in DMM/TILER before LUT is reloaded.

  . This can be handled by the dma-buf fence/reservation stuff when it

    lands



Userspace:

. git://github.com/robclark/xf86-video-omap.git

. git://anongit.freedesktop.org/xorg/driver/xf86-video-omap



Currently tested on

. OMAP3530 beagleboard

. OMAP4430 pandaboard

. OMAP4460 pandaboard

. OMAP5432 uEVM

CRA Git | Maintained and supported by SUSTech CRA and CCSE