diff options
author | Dave Airlie <airlied@redhat.com> | 2016-06-08 22:20:11 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-06-08 22:20:11 -0400 |
commit | 3c85f20a289d044f303f473ee6ab7502303fc3b0 (patch) | |
tree | 016657e9d62b77a3c7f237e58346bd6a7ab8cc6e /drivers/gpu/drm/omapdrm/omap_fb.c | |
parent | 76c6dccf34413ca460372fde027bedcdc2f59f86 (diff) | |
parent | 492a426a2fc531774356e05f1ad87ab49e80156c (diff) |
Merge tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
omapdrm changes for 4.8
* Update MAINTAINERS file for omapdrm and tilcdc
* PLL refactoring to allow versatile use of the PLL clocks
* Public omapdss header refactoring to separate omapfb and omapdrm
* Gamma table support
* Support reset GPIO and vcc regulator in omapdrm's panel-dpi
* Minor cleanups
* tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (69 commits)
drm/omapdrm: Implement gamma_lut atomic crtc properties
drm/omapdrm: Workaround for errata i734 (LCD1 Gamma) in DSS dispc
drm/omapdrm: Add gamma table support to DSS dispc
drm: drm_helper_crtc_enable_color_mgmt() => drm_crtc_enable_color_mgmt()
drm/omap: rename panel/encoder Kconfig names
drm: omapdrm: add DSI mapping
drm: omapdrm: Remove unused omap_framebuffer_bo function
drm: omapdrm: Remove unused omap_gem_tiled_size function
drm: omapdrm: panel-lgphilips-lb035q02: Remove unused backlight GPIO
drm/omap: panel-dpi: implement support for a vcc regulator
drm/omap: panel-dpi: make (limited) use of a reset gpio
devicetree/bindings: add reset-gpios and vcc-supply for panel-dpi
MAINTAINERS: Add maintainer for TI LCDC DRM driver
MAINTAINERS: Add maintainer for OMAP DRM driver
drm/omap: fix pitch round-up
drm/omap: remove align_pitch()
drm/omap: remove unnecessary pitch round-up
drm/omap: remove unneeded gpio includes
drm/omap: Remove the video/omapdss.h and move it's content to local header file
[media] omap_vout: Switch to use the video/omapfb_dss.h header file
...
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fb.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fb.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index 664ccf97bc11..983c8cf2441c 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c | |||
@@ -312,14 +312,6 @@ void omap_framebuffer_unpin(struct drm_framebuffer *fb) | |||
312 | mutex_unlock(&omap_fb->lock); | 312 | mutex_unlock(&omap_fb->lock); |
313 | } | 313 | } |
314 | 314 | ||
315 | struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p) | ||
316 | { | ||
317 | struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb); | ||
318 | if (p >= drm_format_num_planes(fb->pixel_format)) | ||
319 | return NULL; | ||
320 | return omap_fb->planes[p].bo; | ||
321 | } | ||
322 | |||
323 | /* iterate thru all the connectors, returning ones that are attached | 315 | /* iterate thru all the connectors, returning ones that are attached |
324 | * to the same fb.. | 316 | * to the same fb.. |
325 | */ | 317 | */ |