dri-devel March 2014

dri-devel@lists.freedesktop.org

144 participants
926 discussions

[PATCH RFC] drm: Make the drm_vma_manager authentication mechanism a bit more versatile
by Thomas Hellstrom 19 Mar '14

19 Mar '14

By handing the authentication mechanism tokens in the form of const void pointers instead of struct file pointers, drivers are free to provide whatever file pointers they find appropriate. The pointers are never dereferenced in the drm_vma_manager so that shouldn't be a problem. As an example, the vmwgfx driver would like to provide struct ttm_object_file pointers. Signed-off-by: Thomas Hellstrom <thellstrom(a)vmware.com> --- drivers/gpu/drm/drm_vma_manager.c | 22 +++++++++++----------- include/drm/drm_vma_manager.h | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/drm_vma_manager.c b/drivers/gpu/drm/drm_vma_manager.c index 63b4712..93676c1 100644 --- a/drivers/gpu/drm/drm_vma_manager.c +++ b/drivers/gpu/drm/drm_vma_manager.c @@ -291,24 +291,24 @@ EXPORT_SYMBOL(drm_vma_offset_remove); /** * drm_vma_node_allow - Add open-file to list of allowed users * @node: Node to modify - * @filp: Open file to add + * @filp: Authentication token (typically pointer to open file) to add * - * Add @filp to the list of allowed open-files for this node. If @filp is - * already on this list, the ref-count is incremented. + * Add @filp to the list of allowed authentication tokens for this node. + * If @filp is already on this list, the ref-count is incremented. * * The list of allowed-users is preserved across drm_vma_offset_add() and * drm_vma_offset_remove() calls. You may even call it if the node is currently * not added to any offset-manager. * - * You must remove all open-files the same number of times as you added them - * before destroying the node. Otherwise, you will leak memory. + * You must remove all authentication tokens the same number of times as you + * added them before destroying the node. Otherwise, you will leak memory. * * This is locked against concurrent access internally. * * RETURNS: * 0 on success, negative error code on internal failure (out-of-mem) */ -int drm_vma_node_allow(struct drm_vma_offset_node *node, struct file *filp) +int drm_vma_node_allow(struct drm_vma_offset_node *node, const void *filp) { struct rb_node **iter; struct rb_node *parent = NULL; @@ -360,7 +360,7 @@ EXPORT_SYMBOL(drm_vma_node_allow); /** * drm_vma_node_revoke - Remove open-file from list of allowed users * @node: Node to modify - * @filp: Open file to remove + * @filp: Authentication token to remove * * Decrement the ref-count of @filp in the list of allowed open-files on @node. * If the ref-count drops to zero, remove @filp from the list. You must call @@ -370,7 +370,7 @@ EXPORT_SYMBOL(drm_vma_node_allow); * * If @filp is not on the list, nothing is done. */ -void drm_vma_node_revoke(struct drm_vma_offset_node *node, struct file *filp) +void drm_vma_node_revoke(struct drm_vma_offset_node *node, const void *filp) { struct drm_vma_offset_file *entry; struct rb_node *iter; @@ -400,10 +400,10 @@ EXPORT_SYMBOL(drm_vma_node_revoke); /** * drm_vma_node_is_allowed - Check whether an open-file is granted access * @node: Node to check - * @filp: Open-file to check for + * @filp: Authentication token to check for * * Search the list in @node whether @filp is currently on the list of allowed - * open-files (see drm_vma_node_allow()). + * authentication tokens (see drm_vma_node_allow()). * * This is locked against concurrent access internally. * @@ -411,7 +411,7 @@ EXPORT_SYMBOL(drm_vma_node_revoke); * true iff @filp is on the list */ bool drm_vma_node_is_allowed(struct drm_vma_offset_node *node, - struct file *filp) + const void *filp) { struct drm_vma_offset_file *entry; struct rb_node *iter; diff --git a/include/drm/drm_vma_manager.h b/include/drm/drm_vma_manager.h index c18a593..d7ff1e5 100644 --- a/include/drm/drm_vma_manager.h +++ b/include/drm/drm_vma_manager.h @@ -33,7 +33,7 @@ struct drm_vma_offset_file { struct rb_node vm_rb; - struct file *vm_filp; + const void *vm_filp; unsigned long vm_count; }; @@ -65,10 +65,10 @@ int drm_vma_offset_add(struct drm_vma_offset_manager *mgr, void drm_vma_offset_remove(struct drm_vma_offset_manager *mgr, struct drm_vma_offset_node *node); -int drm_vma_node_allow(struct drm_vma_offset_node *node, struct file *filp); -void drm_vma_node_revoke(struct drm_vma_offset_node *node, struct file *filp); +int drm_vma_node_allow(struct drm_vma_offset_node *node, const void *filp); +void drm_vma_node_revoke(struct drm_vma_offset_node *node, const void *filp); bool drm_vma_node_is_allowed(struct drm_vma_offset_node *node, - struct file *filp); + const void *filp); /** * drm_vma_offset_exact_lookup() - Look up node by exact address @@ -239,7 +239,7 @@ static inline void drm_vma_node_unmap(struct drm_vma_offset_node *node, /** * drm_vma_node_verify_access() - Access verification helper for TTM * @node: Offset node - * @filp: Open-file + * @filp: Authentication token. Typically pointer to open file * * This checks whether @filp is granted access to @node. It is the same as * drm_vma_node_is_allowed() but suitable as drop-in helper for TTM @@ -249,7 +249,7 @@ static inline void drm_vma_node_unmap(struct drm_vma_offset_node *node, * 0 if access is granted, -EACCES otherwise. */ static inline int drm_vma_node_verify_access(struct drm_vma_offset_node *node, - struct file *filp) + const void *filp) { return drm_vma_node_is_allowed(node, filp) ? 0 : -EACCES; } -- 1.7.10.4

3 2

[PATCH] drm: add FOURCC formats for compute dma_buf interop.
by Gwenole Beauchesne 19 Mar '14

19 Mar '14

This is a follow-up to: http://lists.freedesktop.org/archives/mesa-dev/2014-March/055742.html Add formats meant to convey a "compute" dimension when a DRM fourcc format is needed for dma_buf interop (EGL, OpenCL). Intended FOURCC format: ('T',<num_elements>,<type>,<size_element>). - <num_elements>: number of elements in the tuple. Range: [0..3]. - <type>: type of each element. Values: {'_','I','U','F'}, respectively for normalized to [0..1] range, signed integers, unsigned integers, floating-point. - <size_element>: size of the element. Values: {1, 2, 4, 8}. All entities are represented in native-endian byte-order in memory. For example, 'T2F4' format would represent the (float, float) tuple where elements are stored in little-endian byte-order on x86. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne(a)intel.com> --- include/drm/drm_fourcc.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h index 85facb0..26a2ca8 100644 --- a/include/drm/drm_fourcc.h +++ b/include/drm/drm_fourcc.h @@ -127,4 +127,82 @@ #define DRM_FORMAT_YUV444 fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */ #define DRM_FORMAT_YVU444 fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */ +/** + * \defgroup api_drm_tuples Compute formats (tuples) + * + * The following formats are not meant for display. Rather, they are + * meant to convey a "compute" dimension when a DRM fourcc format is + * needed for dma_buf interop (EGL, OpenCL). + * + * Intended FOURCC format: ('T',<num_elements>,<type>,<size_element>). + * - <num_elements>: number of elements in the tuple. Range: [0..3]. + * - <type>: type of each element. Values: {'_','I','U','F'}, + * respectively for normalized to [0..1] range, signed integers, + * unsigned integers, floating-point. + * - <size_element>: size of the element. Values: {1, 2, 4, 8}. + * + * All entities are represented in native-endian byte-order in memory. + * For example, 'T2F4' format would represent the (float, float) tuple + * where elements are stored in little-endian byte-order on x86. + * + * @{ + */ + +/** Type of a tuple element */ +enum { + DRM_FORMAT_TUPLE_TYPE_UNORM = '_', /**< Unsigned integer value normalized to [0..1] range */ + DRM_FORMAT_TUPLE_TYPE_SINT = 'I', /**< Signed integer value */ + DRM_FORMAT_TUPLE_TYPE_UINT = 'U', /**< Unsigned integer value */ + DRM_FORMAT_TUPLE_TYPE_FLOAT = 'F', /**< Floating-point value */ +}; + +/** Generates a FOURCC value for a tuple */ +#define DRM_FORMAT_TUPLE(num_elements, type, size) \ + fourcc_code('T', '0'+(num_elements), DRM_FORMAT_TUPLE_TYPE_##type, '0'+(size)) + +/** @name Unsigned integers normalized to [0..1] range */ +/**@{*/ +#define DRM_FORMAT_T1_1 DRM_FORMAT_TUPLE(1, UNORM, 1) /** (X), 8-bit integers normalized to [0..1] range */ +#define DRM_FORMAT_T2_1 DRM_FORMAT_TUPLE(2, UNORM, 1) /** (X, Y), 8-bit integers normalized to [0..1] range */ +#define DRM_FORMAT_T4_1 DRM_FORMAT_TUPLE(4, UNORM, 1) /** (X, Y, Z, W), 8-bit integers normalized to [0..1] range */ +#define DRM_FORMAT_T1_2 DRM_FORMAT_TUPLE(1, UNORM, 2) /** (X), 16-bit integers normalized to [0..1] range */ +#define DRM_FORMAT_T2_2 DRM_FORMAT_TUPLE(2, UNORM, 2) /** (X, Y), 16-bit integers normalized to [0..1] range */ +#define DRM_FORMAT_T4_2 DRM_FORMAT_TUPLE(4, UNORM, 2) /** (X, Y, Z, W), 16-bit integers normalized to [0..1] range */ +/**@}*/ + +/** @name Signed integer values */ +/**@{*/ +#define DRM_FORMAT_T1I1 DRM_FORMAT_TUPLE(1, SINT, 1) /** (X), 8-bit signed integer */ +#define DRM_FORMAT_T2I1 DRM_FORMAT_TUPLE(2, SINT, 1) /** (X, Y), 8-bit signed integer */ +#define DRM_FORMAT_T4I1 DRM_FORMAT_TUPLE(4, SINT, 1) /** (X, Y, Z, W), 8-bit signed integer */ +#define DRM_FORMAT_T1I2 DRM_FORMAT_TUPLE(1, SINT, 2) /** (X), 16-bit signed integer */ +#define DRM_FORMAT_T2I2 DRM_FORMAT_TUPLE(2, SINT, 2) /** (X, Y), 16-bit signed integer */ +#define DRM_FORMAT_T4I2 DRM_FORMAT_TUPLE(4, SINT, 2) /** (X, Y, Z, W), 16-bit signed integer */ +#define DRM_FORMAT_T1I4 DRM_FORMAT_TUPLE(1, SINT, 4) /** (X), 32-bit signed integer */ +#define DRM_FORMAT_T2I4 DRM_FORMAT_TUPLE(2, SINT, 4) /** (X, Y), 32-bit signed integer */ +#define DRM_FORMAT_T4I4 DRM_FORMAT_TUPLE(4, SINT, 4) /** (X, Y, Z, W), 32-bit signed integer */ +/**@}*/ + +/** @name Unsigned integer values */ +/**@{*/ +#define DRM_FORMAT_T1U1 DRM_FORMAT_TUPLE(1, UINT, 1) /** (X), 8-bit unsigned integer */ +#define DRM_FORMAT_T2U1 DRM_FORMAT_TUPLE(2, UINT, 1) /** (X, Y), 8-bit unsigned integer */ +#define DRM_FORMAT_T4U1 DRM_FORMAT_TUPLE(4, UINT, 1) /** (X, Y, Z, W), 8-bit unsigned integer */ +#define DRM_FORMAT_T1U2 DRM_FORMAT_TUPLE(1, UINT, 2) /** (X), 16-bit unsigned integer */ +#define DRM_FORMAT_T2U2 DRM_FORMAT_TUPLE(2, UINT, 2) /** (X, Y), 16-bit unsigned integer */ +#define DRM_FORMAT_T4U2 DRM_FORMAT_TUPLE(4, UINT, 2) /** (X, Y, Z, W), 16-bit unsigned integer */ +#define DRM_FORMAT_T1U4 DRM_FORMAT_TUPLE(1, UINT, 4) /** (X), 32-bit unsigned integer */ +#define DRM_FORMAT_T2U4 DRM_FORMAT_TUPLE(2, UINT, 4) /** (X, Y), 32-bit unsigned integer */ +#define DRM_FORMAT_T4U4 DRM_FORMAT_TUPLE(4, UINT, 4) /** (X, Y, Z, W), 32-bit unsigned integer */ +/**@}*/ + +/** @name Floating-point values */ +/**@{*/ +#define DRM_FORMAT_T1F4 DRM_FORMAT_TUPLE(1, FLOAT, 4) /** (X), 32-bit floating-point */ +#define DRM_FORMAT_T2F4 DRM_FORMAT_TUPLE(2, FLOAT, 4) /** (X, Y), 32-bit floating-point */ +#define DRM_FORMAT_T4F4 DRM_FORMAT_TUPLE(4, FLOAT, 4) /** (X, Y, Z, W), 32-bit floating-point */ +/**@}*/ + +/**@}*/ + #endif /* DRM_FOURCC_H */ -- 1.7.9.5

2 5

How to support various hardware blocks in drm driver
by Inki Dae 19 Mar '14

19 Mar '14

Hello all, The purpose of this email is for discussion to how we could support various hardware blocks such as LVDS bridges, Image Enhancement chips and parallel panels in drm driver. Now we have drm_panel framework for controlling parallel panels, and drm_bridge for controlling LVDS bridge devices. However, drm_panel has only some callbacks, enable, disable and get_modes, and drm_bridge has some callbacks only for bridge devices so these seems like only for their devices. However, some SoC could have other type of hardware blocks. i.e. Image Enhancement blocks. So it seems that these frameworks don't cover all hardware blocks that can be placed between Display controller and LCD Panel device. Below shows various hardware pipe lines for Exynos SoC, Display Controller-----LCD Panel Display Controller-----LVDS Bridge-----LCD Panel Display Controller-----MIP DSI-----MIPI TO LVDS Bridge-----LCD Panel Display Controller-----Image Enhancement chip-----LCD Panel Display Controller-----Image Enhancement chip-----LVDS Bridge-----LCD Panel Display Controller-----Image Enhancement chip-----MIP DSI-----MIPI TO LVDS Bridge-----LCD Panel ... As you know, these hardware blocks should be probed without the probe order issue, and also these hardware blocks should be controlled by crtc and connector drivers. However, it seems that there is no any good way for this yet. So I think we would need a common framework, and for this, we could integrate these two frameworks, drm_panel and drm_bridge to one integrated framework. This integrated framework could be used commonly for other hardware blocks. Below is just pseudo structure for this, enum { DRM_HW_BLOCK_PANEL, DRM_HW_BLOCK_BRIDGE, DRM_HW_BLOCK_ENHANCE, }; struct drm_hw_block { unsigned int type; struct device *dev; struct drm_device *drm; /* Used commonly. */ int (*disable)(struct drm_hw_block *block); int (*enable)(struct drm_hw_block *block); /* For parallel panels. */ struct drm_connector *connector; int (*get_modes)(struct drm_hw_block *block); /* For LVDS bridge devices. */ void (*mode_fixup)(struct drm_hw_block *block); void (*mode_set)(struct drm_hw_block *block); .... /* For Image Enhancement devices. */ .... struct list_head list; }; Of course, we could separate above callbacks to each structure like below, struct drm_panel_funcs { ... }; struct drm_bridge_funcs { ... }; struct drm_enhance_funcs { ... }; struct drm_hw_block { unsigned int type; ... struct drm_panel_funcs *panel_funcs; struct drm_bridge_funcs *bridge_funcs; struct drm_enhance_funcs *enhance_funcs; ... }; And then what we should consider is how dt of these blocks should be bound, and how crtc and connector drivers should control these blocks. Below is my idea based on super device concept[1] and video interface concept[2], In case of below hardware pipeline: Display Controller-----Image Enhancement chip-----MIP DSI-----MIPI TO LVDS Bridge-----LCD Panel 1. Bind dt of crtc, connector and block devices, and probe their drivers without the probe order issue using below super node and component framework, exynos-drm { crtcs = <&display_controller>; connectors = <&mip_dsi>; blocks = <&image_enhancement>, <&lvds>; }; In this pipeline, LCD Panel is a client of MIPI DSI driver so LCD Panel will be controlled by mipi dsi driver internally. In case of not using MIPI DSI device, connector could be panel like below, Display Controller-----Image Enhancement chip-----LCD Panel exynos-drm { crtc = <&display_controller>; connectors = <&panel>; blocks = <&image_enhancement> }; 2. Attach block drivers to their corresponding crtc and connector drivers using below video interface nodes so that crtc and connector drivers can control these block drivers using drm_hw_block object. panel { ... port { ... panel_0: endpoint { remote-endpoint=<&lvds_bridge_1>; }; }; }; lvds-bridge { ... port@1 { ... lvds_bridge_0: endpoint { remote-endpoint=<&mipi_dsi_1>; }; port@2 { lvds_bridge_1: endpoint { remote-endpoint=<&panel_0>; }; }; }; mipi-dsi { ... port@1 { ... mipi_dsi_0: endpoint { remote-endpoint=<&image_enhancement_1>; }; }; port@2 { ... mipi_dsi_1: endpoint { remote-endpoint=<&lvds_bridge_0>; }; }; }; image_enhancement { port@1 { image_enhancement_0: endpoint { remote-endpoint=<&display_controller_0>; }; }; port@2 { image_enhancement_1: endpoint { remote-endpoint=<&mipi_dsi_0>; }; }; }; display-controller { port { display_controller_0: endpoint { remote-endpoint=<&image_enhancement_0>; }; }; }; With above video interface nodes, display controller driver could get a drm_hw_block object for controlling image enhancement device, and mipi dsi driver could get a drm_hw_block object for controlling lvds bridge device. That is just my idea so maybe there are my missing points, and I'm not sure that other SoC drivers have better solutions so If there is any better solution, could you please share your idea? If not so, please give me your opinions. I think this time would be a opportunity that we could extend the block device support more with a little change. Thanks, Inki Dae [1] http://lists.freedesktop.org/archives/dri-devel/2014-January/051249.html [2] Documentation/devicetree/bindings/media/video-interfaces.txt

5 18

[PATCHv2 0/8] Doc/DT: DT bindings for various display components
by Tomi Valkeinen 19 Mar '14

19 Mar '14

Hi, This is v2 of the series adding DT bindings for various display components. The v1 can be found from [1]. The changes for v2: * abbreviated endpoint format dropped (nacked) * MIPI DPI panel dropped (missing backlight handling, delayed to 3.16) * dvi-connector: add properties for analog/digital/dual-link * hdmi-connector: add connector type * split 'gpios' property to named gpios * use 'clocks' properties for OMAP DSS components * removed 'simple-bus' from OMAP DSS Core's compatible strings [1] http://article.gmane.org/gmane.linux.drivers.devicetree/63885 Tomi Tomi Valkeinen (8): Doc/DT: Add DT binding documentation for OMAP DSS Doc/DT: Add DT binding documentation for Analog TV Connector Doc/DT: Add DT binding documentation for DVI Connector Doc/DT: Add DT binding documentation for HDMI Connector Doc/DT: Add DT binding documentation for MIPI DSI CM Panel Doc/DT: Add DT binding documentation for Sony acx565akm panel Doc/DT: Add DT binding documentation for TFP410 encoder Doc/DT: Add DT binding documentation for tpd12s015 encoder .../bindings/video/analog-tv-connector.txt | 25 +++ .../devicetree/bindings/video/dvi-connector.txt | 35 ++++ .../devicetree/bindings/video/hdmi-connector.txt | 28 +++ .../devicetree/bindings/video/panel-dsi-cm.txt | 29 +++ .../devicetree/bindings/video/sony,acx565akm.txt | 30 +++ .../devicetree/bindings/video/ti,omap-dss.txt | 211 +++++++++++++++++++++ .../devicetree/bindings/video/ti,omap2-dss.txt | 54 ++++++ .../devicetree/bindings/video/ti,omap3-dss.txt | 83 ++++++++ .../devicetree/bindings/video/ti,omap4-dss.txt | 111 +++++++++++ .../devicetree/bindings/video/ti,tfp410.txt | 41 ++++ .../devicetree/bindings/video/ti,tpd12s015.txt | 44 +++++ 11 files changed, 691 insertions(+) create mode 100644 Documentation/devicetree/bindings/video/analog-tv-connector.txt create mode 100644 Documentation/devicetree/bindings/video/dvi-connector.txt create mode 100644 Documentation/devicetree/bindings/video/hdmi-connector.txt create mode 100644 Documentation/devicetree/bindings/video/panel-dsi-cm.txt create mode 100644 Documentation/devicetree/bindings/video/sony,acx565akm.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap2-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap3-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,omap4-dss.txt create mode 100644 Documentation/devicetree/bindings/video/ti,tfp410.txt create mode 100644 Documentation/devicetree/bindings/video/ti,tpd12s015.txt -- 1.8.3.2

4 17

[RFC PATCH] drm: improve various bridge devices support
by Inki Dae 19 Mar '14

19 Mar '14

This patch integrates existing drm_panel and drm_bridge frameworks to one integrated framework, drm_hw_block. For this, I had already sent a email to make a discussion[1] about how we could support all bridges, one bridge between crtc and encoder, and another bridge between encoder and panel. Now existing drm_panel could be used only for real panel, and drm_bridge only for lvds bridge devices between encoder and panel. However, some embedded SoC have bridge devices of other type between crtc and encoder, i.e. Image Enhancer chip. So the existing encoder driver couldn't control such bridge commonly using existing drm_bridge because only drm_encoder has drm_bridge. Below shows how encoder driver could control bridge device using existing drm_bridge. display controller ----- bridge1 ----- mipi dsi ----- bridge2 ----- panel | /|\ /|\ |---------------| | controlled by drm_bridge | | | |---------------------------| controlled by drm_panel In the other hands, drm_panel has no any dependency of drm_encoder, and its infrastructure could be used by crtc driver with a little change. So this integrated framework basically uses existing infrastructure of drm_panel, and just adds drm_lvds structure to it for backward compatibility. And then, we could add a new bridge type, i.e. drm_enhancer in the near future. So this patch is just ready for that. As a result, if we add drm_enhancer, crtc driver could control a bridge device between crtc and encoder like below. display controller ----- bridge1 ----- mipi dsi ----- bridge2 ----- panel | /|\ | /|\ /|\ |--------------------| |---------------| | controlled by drm_enhancer controlled by drm_lvds | | | |--------------------------| controlled by drm_panel [1] http://www.spinics.net/lists/dri-devel/msg55555.html Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- drivers/gpu/drm/Kconfig | 4 ++ drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_hw_block.c | 104 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_panel.c | 100 ------------------------------- drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/panel/Kconfig | 1 + drivers/gpu/drm/panel/panel-simple.c | 37 ++++++------ drivers/gpu/drm/tegra/drm.h | 2 +- drivers/gpu/drm/tegra/dsi.c | 10 ++-- drivers/gpu/drm/tegra/output.c | 22 +++---- include/drm/drm_hw_block.h | 107 ++++++++++++++++++++++++++++++++++ include/drm/drm_panel.h | 82 -------------------------- 12 files changed, 254 insertions(+), 218 deletions(-) create mode 100644 drivers/gpu/drm/drm_hw_block.c delete mode 100644 drivers/gpu/drm/drm_panel.c create mode 100644 include/drm/drm_hw_block.h delete mode 100644 include/drm/drm_panel.h diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 8e7fa4d..020a0f2 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -24,6 +24,10 @@ config DRM_MIPI_DSI bool depends on DRM +config DRM_HW_BLOCK + bool + depends on DRM + config DRM_USB tristate depends on DRM diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 292a79d..a943663 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -18,7 +18,7 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o drm-$(CONFIG_PCI) += ati_pcigart.o -drm-$(CONFIG_DRM_PANEL) += drm_panel.o +drm-$(CONFIG_DRM_HW_BLOCK) += drm_hw_block.o drm-usb-y := drm_usb.o diff --git a/drivers/gpu/drm/drm_hw_block.c b/drivers/gpu/drm/drm_hw_block.c new file mode 100644 index 0000000..e7bb1fc --- /dev/null +++ b/drivers/gpu/drm/drm_hw_block.c @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2013, NVIDIA Corporation. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include <linux/err.h> +#include <linux/module.h> + +#include <drm/drm_crtc.h> +#include <drm/drm_hw_block.h> + +static DEFINE_MUTEX(hw_block_lock); +static LIST_HEAD(hw_block_list); + +void drm_hw_block_init(struct drm_hw_block *block) +{ + INIT_LIST_HEAD(&block->list); +} +EXPORT_SYMBOL(drm_hw_block_init); + +int drm_hw_block_add(struct drm_hw_block *block) +{ + mutex_lock(&hw_block_lock); + list_add_tail(&block->list, &hw_block_list); + mutex_unlock(&hw_block_lock); + + return 0; +} +EXPORT_SYMBOL(drm_hw_block_add); + +void drm_hw_block_remove(struct drm_hw_block *block) +{ + mutex_lock(&hw_block_lock); + list_del_init(&block->list); + mutex_unlock(&hw_block_lock); +} +EXPORT_SYMBOL(drm_hw_block_remove); + +int drm_hw_block_attach(struct drm_hw_block *block, + struct drm_connector *connector) +{ + if (block->type == DRM_HW_BLOCK_PANEL) { + if (block->connector) + return -EBUSY; + + block->connector = connector; + } + + block->drm = connector->dev; + + return 0; +} +EXPORT_SYMBOL(drm_hw_block_attach); + +int drm_hw_block_detach(struct drm_hw_block *block) +{ + block->connector = NULL; + block->drm = NULL; + + return 0; +} +EXPORT_SYMBOL(drm_hw_block_detach); + +#ifdef CONFIG_OF +struct drm_hw_block *of_drm_find_hw_block(struct device_node *np) +{ + struct drm_hw_block *block; + + mutex_lock(&hw_block_lock); + + list_for_each_entry(block, &hw_block_list, list) { + if (block->dev->of_node == np) { + mutex_unlock(&hw_block_lock); + return block; + } + } + + mutex_unlock(&hw_block_lock); + return NULL; +} +EXPORT_SYMBOL(of_drm_find_hw_block); +#endif + +MODULE_AUTHOR("Thierry Reding <treding(a)nvidia.com>"); +MODULE_DESCRIPTION("DRM panel infrastructure"); +MODULE_LICENSE("GPL and additional rights"); diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c deleted file mode 100644 index 2ef988e..0000000 --- a/drivers/gpu/drm/drm_panel.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2013, NVIDIA Corporation. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sub license, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include <linux/err.h> -#include <linux/module.h> - -#include <drm/drm_crtc.h> -#include <drm/drm_panel.h> - -static DEFINE_MUTEX(panel_lock); -static LIST_HEAD(panel_list); - -void drm_panel_init(struct drm_panel *panel) -{ - INIT_LIST_HEAD(&panel->list); -} -EXPORT_SYMBOL(drm_panel_init); - -int drm_panel_add(struct drm_panel *panel) -{ - mutex_lock(&panel_lock); - list_add_tail(&panel->list, &panel_list); - mutex_unlock(&panel_lock); - - return 0; -} -EXPORT_SYMBOL(drm_panel_add); - -void drm_panel_remove(struct drm_panel *panel) -{ - mutex_lock(&panel_lock); - list_del_init(&panel->list); - mutex_unlock(&panel_lock); -} -EXPORT_SYMBOL(drm_panel_remove); - -int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector) -{ - if (panel->connector) - return -EBUSY; - - panel->connector = connector; - panel->drm = connector->dev; - - return 0; -} -EXPORT_SYMBOL(drm_panel_attach); - -int drm_panel_detach(struct drm_panel *panel) -{ - panel->connector = NULL; - panel->drm = NULL; - - return 0; -} -EXPORT_SYMBOL(drm_panel_detach); - -#ifdef CONFIG_OF -struct drm_panel *of_drm_find_panel(struct device_node *np) -{ - struct drm_panel *panel; - - mutex_lock(&panel_lock); - - list_for_each_entry(panel, &panel_list, list) { - if (panel->dev->of_node == np) { - mutex_unlock(&panel_lock); - return panel; - } - } - - mutex_unlock(&panel_lock); - return NULL; -} -EXPORT_SYMBOL(of_drm_find_panel); -#endif - -MODULE_AUTHOR("Thierry Reding <treding(a)nvidia.com>"); -MODULE_DESCRIPTION("DRM panel infrastructure"); -MODULE_LICENSE("GPL and additional rights"); diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index f227f54..4dbdd7a 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -8,6 +8,7 @@ config DRM_EXYNOS select FB_CFB_IMAGEBLIT select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE select VIDEOMODE_HELPERS + select DRM_PANEL help Choose this option if you have a Samsung SoC EXYNOS chipset. If M is selected the module will be called exynosdrm. diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 3e0f13d..db471a0 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -1,6 +1,7 @@ config DRM_PANEL bool depends on DRM + select DRM_HW_BLOCK help Panel registration and lookup framework. diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 3e611af..f304f66 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -32,7 +32,7 @@ #include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> -#include <drm/drm_panel.h> +#include <drm/drm_hw_block.h> struct panel_desc { const struct drm_display_mode *modes; @@ -48,7 +48,7 @@ struct panel_desc { #define GPIO_ACTIVE_LOW (1 << 0) struct panel_simple { - struct drm_panel base; + struct drm_hw_block base; bool enabled; const struct panel_desc *desc; @@ -61,9 +61,9 @@ struct panel_simple { int enable_gpio; }; -static inline struct panel_simple *to_panel_simple(struct drm_panel *panel) +static inline struct panel_simple *to_panel_simple(struct drm_hw_block *block) { - return container_of(panel, struct panel_simple, base); + return container_of(block, struct panel_simple, base); } static int panel_simple_get_fixed_modes(struct panel_simple *panel) @@ -98,9 +98,9 @@ static int panel_simple_get_fixed_modes(struct panel_simple *panel) return num; } -static int panel_simple_disable(struct drm_panel *panel) +static int panel_simple_disable(struct drm_hw_block *block) { - struct panel_simple *p = to_panel_simple(panel); + struct panel_simple *p = to_panel_simple(block); if (!p->enabled) return 0; @@ -123,9 +123,9 @@ static int panel_simple_disable(struct drm_panel *panel) return 0; } -static int panel_simple_enable(struct drm_panel *panel) +static int panel_simple_enable(struct drm_hw_block *block) { - struct panel_simple *p = to_panel_simple(panel); + struct panel_simple *p = to_panel_simple(block); int err; if (p->enabled) @@ -133,7 +133,7 @@ static int panel_simple_enable(struct drm_panel *panel) err = regulator_enable(p->supply); if (err < 0) { - dev_err(panel->dev, "failed to enable supply: %d\n", err); + dev_err(block->dev, "failed to enable supply: %d\n", err); return err; } @@ -154,16 +154,16 @@ static int panel_simple_enable(struct drm_panel *panel) return 0; } -static int panel_simple_get_modes(struct drm_panel *panel) +static int panel_simple_get_modes(struct drm_hw_block *block) { - struct panel_simple *p = to_panel_simple(panel); + struct panel_simple *p = to_panel_simple(block); int num = 0; /* probe EDID if a DDC bus is available */ if (p->ddc) { - struct edid *edid = drm_get_edid(panel->connector, p->ddc); + struct edid *edid = drm_get_edid(block->connector, p->ddc); if (edid) { - num += drm_add_edid_modes(panel->connector, edid); + num += drm_add_edid_modes(block->connector, edid); kfree(edid); } } @@ -246,11 +246,12 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) } } - drm_panel_init(&panel->base); + panel->base.type = DRM_HW_BLOCK_PANEL; + drm_hw_block_init(&panel->base); panel->base.dev = dev; - panel->base.funcs = &panel_simple_funcs; + panel->base.panel_funcs = &panel_simple_funcs; - err = drm_panel_add(&panel->base); + err = drm_hw_block_add(&panel->base); if (err < 0) goto free_ddc; @@ -275,8 +276,8 @@ static int panel_simple_remove(struct device *dev) { struct panel_simple *panel = dev_get_drvdata(dev); - drm_panel_detach(&panel->base); - drm_panel_remove(&panel->base); + drm_hw_block_detach(&panel->base); + drm_hw_block_remove(&panel->base); panel_simple_disable(&panel->base); diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index bf1cac7..a8ec39f 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -194,7 +194,7 @@ struct tegra_output { const struct tegra_output_ops *ops; enum tegra_output_type type; - struct drm_panel *panel; + struct drm_hw_block *block; struct i2c_adapter *ddc; const struct edid *edid; unsigned int hpd_irq; diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index d452faab..012a1ba 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -29,7 +29,7 @@ #include <linux/reset.h> #include <drm/drm_mipi_dsi.h> -#include <drm/drm_panel.h> +#include <drm/drm_hw_block.h> #include <video/mipi_display.h> @@ -792,8 +792,8 @@ static int tegra_dsi_host_attach(struct mipi_dsi_host *host, dsi->format = device->format; dsi->lanes = device->lanes; - output->panel = of_drm_find_panel(device->dev.of_node); - if (output->panel) { + output->block = of_drm_find_hw_block(device->dev.of_node); + if (output->block) { if (output->connector.dev) drm_helper_hpd_irq_event(output->connector.dev); } @@ -807,11 +807,11 @@ static int tegra_dsi_host_detach(struct mipi_dsi_host *host, struct tegra_dsi *dsi = host_to_tegra(host); struct tegra_output *output = &dsi->output; - if (output->panel && &device->dev == output->panel->dev) { + if (output->block && &device->dev == output->block->dev) { if (output->connector.dev) drm_helper_hpd_irq_event(output->connector.dev); - output->panel = NULL; + output->block = NULL; } return 0; diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index f1b5030..c2e0740 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -9,7 +9,7 @@ #include <linux/of_gpio.h> -#include <drm/drm_panel.h> +#include <drm/drm_hw_block.h> #include "drm.h" static int tegra_connector_get_modes(struct drm_connector *connector) @@ -18,8 +18,8 @@ static int tegra_connector_get_modes(struct drm_connector *connector) struct edid *edid = NULL; int err = 0; - if (output->panel) { - err = output->panel->funcs->get_modes(output->panel); + if (output->block) { + err = output->block->panel_funcs->get_modes(output->block); if (err > 0) return err; } @@ -79,7 +79,7 @@ tegra_connector_detect(struct drm_connector *connector, bool force) else status = connector_status_connected; } else { - if (!output->panel) + if (!output->block) status = connector_status_disconnected; else status = connector_status_connected; @@ -128,14 +128,14 @@ static const struct drm_encoder_funcs encoder_funcs = { static void tegra_encoder_dpms(struct drm_encoder *encoder, int mode) { struct tegra_output *output = encoder_to_output(encoder); - struct drm_panel *panel = output->panel; + struct drm_hw_block *block = output->block; if (mode != DRM_MODE_DPMS_ON) { - drm_panel_disable(panel); + drm_hw_block_disable(block); tegra_output_disable(output); } else { tegra_output_enable(output); - drm_panel_enable(panel); + drm_hw_block_enable(block); } } @@ -195,8 +195,8 @@ int tegra_output_probe(struct tegra_output *output) panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { - output->panel = of_drm_find_panel(panel); - if (!output->panel) + output->block = of_drm_find_hw_block(panel); + if (!output->block) return -EPROBE_DEFER; of_node_put(panel); @@ -300,8 +300,8 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output) drm_connector_helper_add(&output->connector, &connector_helper_funcs); output->connector.dpms = DRM_MODE_DPMS_OFF; - if (output->panel) - drm_panel_attach(output->panel, &output->connector); + if (output->block) + drm_hw_block_attach(output->block, &output->connector); drm_encoder_init(drm, &output->encoder, &encoder_funcs, encoder); drm_encoder_helper_add(&output->encoder, &encoder_helper_funcs); diff --git a/include/drm/drm_hw_block.h b/include/drm/drm_hw_block.h new file mode 100644 index 0000000..966c9b3 --- /dev/null +++ b/include/drm/drm_hw_block.h @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2013, NVIDIA Corporation. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef __DRM_HW_BLOCK_H__ +#define __DRM_HW_BLOCK_H__ + +#include <linux/list.h> + +struct drm_connector; +struct drm_device; +struct drm_hw_block; +struct drm_display_mode; + +enum drm_block_type { + DRM_HW_BLOCK_PANEL, + DRM_HW_BLOCK_LVDS, + /* TODO. add other bridge type types if needed. */ +}; +struct drm_panel_funcs { + int (*disable)(struct drm_hw_block *block); + int (*enable)(struct drm_hw_block *block); + int (*get_modes)(struct drm_hw_block *block); +}; + +struct drm_lvds_funcs { + bool (*mode_fixup)(struct drm_hw_block *bridge, + const struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode); + int (*disable)(struct drm_hw_block *block); + int (*enable)(struct drm_hw_block *block); + void (*mode_set)(struct drm_hw_block *block, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode); + void (*pre_enable)(struct drm_hw_block *block); + void (*destroy)(struct drm_hw_block *block); +}; + +struct drm_hw_block { + enum drm_block_type type; + struct device *dev; + struct drm_device *drm; + + struct drm_connector *connector; + + const struct drm_panel_funcs *panel_funcs; + const struct drm_lvds_funcs *lvds_funcs; + + /* TODO. Add callbacks for other bridge types if needed. */ + + struct list_head list; +}; + +static inline int drm_hw_block_disable(struct drm_hw_block *block) +{ + if (block && block->panel_funcs && block->panel_funcs->disable) + return block->panel_funcs->disable(block); + + return block ? -ENOSYS : -EINVAL; +} + +static inline int drm_hw_block_enable(struct drm_hw_block *block) +{ + if (block && block->panel_funcs && block->panel_funcs->enable) + return block->panel_funcs->enable(block); + + return block ? -ENOSYS : -EINVAL; +} + +void drm_hw_block_init(struct drm_hw_block *block); + +int drm_hw_block_add(struct drm_hw_block *block); +void drm_hw_block_remove(struct drm_hw_block *block); + +int drm_hw_block_attach(struct drm_hw_block *block, + struct drm_connector *connector); +int drm_hw_block_detach(struct drm_hw_block *block); + +#ifdef CONFIG_OF +struct drm_hw_block *of_drm_find_hw_block(struct device_node *np); +#else +static inline struct drm_hw_block *of_drm_find_hw_block(struct device_node *np) +{ + return NULL; +} +#endif + +#endif diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h deleted file mode 100644 index c2ab77a..0000000 --- a/include/drm/drm_panel.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2013, NVIDIA Corporation. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sub license, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef __DRM_PANEL_H__ -#define __DRM_PANEL_H__ - -#include <linux/list.h> - -struct drm_connector; -struct drm_device; -struct drm_panel; - -struct drm_panel_funcs { - int (*disable)(struct drm_panel *panel); - int (*enable)(struct drm_panel *panel); - int (*get_modes)(struct drm_panel *panel); -}; - -struct drm_panel { - struct drm_device *drm; - struct drm_connector *connector; - struct device *dev; - - const struct drm_panel_funcs *funcs; - - struct list_head list; -}; - -static inline int drm_panel_disable(struct drm_panel *panel) -{ - if (panel && panel->funcs && panel->funcs->disable) - return panel->funcs->disable(panel); - - return panel ? -ENOSYS : -EINVAL; -} - -static inline int drm_panel_enable(struct drm_panel *panel) -{ - if (panel && panel->funcs && panel->funcs->enable) - return panel->funcs->enable(panel); - - return panel ? -ENOSYS : -EINVAL; -} - -void drm_panel_init(struct drm_panel *panel); - -int drm_panel_add(struct drm_panel *panel); -void drm_panel_remove(struct drm_panel *panel); - -int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector); -int drm_panel_detach(struct drm_panel *panel); - -#ifdef CONFIG_OF -struct drm_panel *of_drm_find_panel(struct device_node *np); -#else -static inline struct drm_panel *of_drm_find_panel(struct device_node *np) -{ - return NULL; -} -#endif - -#endif -- 1.7.9.5

1 1

linux-next: build failure after merge of the drm-intel tree
by Stephen Rothwell 19 Mar '14

19 Mar '14

Hi all, After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/trace/define_trace.h:90:0, from drivers/gpu/drm/i915/i915_trace.h:520, from drivers/gpu/drm/i915/i915_trace_points.c:12: drivers/gpu/drm/i915/./i915_trace.h: In function 'ftrace_raw_event_i915_gem_evict_vm': drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function) __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ drivers/gpu/drm/i915/./i915_trace.h:246:22: note: each undeclared identifier is reported only once for each function it appears in __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ In file included from include/trace/define_trace.h:90:0, from drivers/gpu/drm/i915/i915_trace.h:520, from drivers/gpu/drm/i915/i915_trace_points.c:12: drivers/gpu/drm/i915/./i915_trace.h: In function 'perf_trace_i915_gem_evict_vm': drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function) __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:708:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers from ring buffer in evict event"). I have used the drm-intel tree from next-20140318 for today. -- Cheers, Stephen Rothwell <sfr(a)canb.auug.org.au>

4 3

[PATCH 3/4] acer-wmi: Stop selecting VIDEO_OUTPUT_CONTROL
by Jean Delvare 19 Mar '14

19 Mar '14

ACPI_VIDEO no longer depends on VIDEO_OUTPUT_CONTROL, so drivers which want to select ACPI_VIDEO no longer have to select VIDEO_OUTPUT_CONTROL. Signed-off-by: Jean Delvare <jdelvare(a)suse.de> Cc: "Lee, Chun-Yi" <jlee(a)suse.com> Cc: Matthew Garrett <matthew.garrett(a)nebula.com> --- drivers/platform/x86/Kconfig | 2 -- 1 file changed, 2 deletions(-) --- linux-3.14-rc7.orig/drivers/platform/x86/Kconfig 2014-03-17 14:23:31.511815259 +0100 +++ linux-3.14-rc7/drivers/platform/x86/Kconfig 2014-03-17 14:24:32.100155709 +0100 @@ -27,8 +27,6 @@ config ACER_WMI depends on ACPI_WMI select INPUT_SPARSEKMAP # Acer WMI depends on ACPI_VIDEO when ACPI is enabled - # but for select to work, need to select ACPI_VIDEO's dependencies, ick - select VIDEO_OUTPUT_CONTROL if ACPI select ACPI_VIDEO if ACPI ---help--- This is a driver for newer Acer (and Wistron) laptops. It adds -- Jean Delvare SUSE L3 Support

2 1

[RFCv4 00/14] Atomic/nuclear modeset/pageflip
by Rob Clark 18 Mar '14

18 Mar '14

Previous Revision: http://lists.freedesktop.org/archives/dri-devel/2013-November/049363.html Changes since previous: + convert new properties over to DRM_MODE_PROP_EXTENDED_TYPE, so we aren't consuming one new bit per property type (as suggested by, I think, Ville) + Fixed usage of ww_ctx, split things out into 'struct drm_modeset_lock' to make things easier when we start making locking even more fine grained (ie. per-plane locks, etc) + Handle connector_ids changes better. In legacy setcrtc path, we implicitly update other CRTCs that are having their connector stolen, whereas in atomic ioctl there is no implicit connector stealing (ie. this is an error if user does not also remove the connector from it's current CRTC. --------------------------------------------------------------------- Description from original RFC (with updated links): This patchset is the merging of Ville's atomic modeset ioctl, and the drm_{crtc,plane}_state stuff from my original nuclear pageflip RFC. It is currently working on msm with an updated version of Ville's glplane test app (removing cursor properties and atomic event): https://github.com/robclark/glplane the libdrm bits can be found here: https://github.com/robclark/libdrm/commits/atomic The msm part is on top of msm-next, the complete branch can be found: http://cgit.freedesktop.org/~robclark/linux/log/?h=global-thermonuclear-war… Compared to my earlier nuclear pageflip RFC, there is now a set of drm_atomic helpers which do most of the non-hw-specific work for the different drivers. Unlike the crtc helpers, it is intended that the atomic helpers can be used piecemeal by the drivers, either using all or overriding parts as needed. A naive driver, with no special constraints or hw support for atomic updates may simply add the following to their driver struct: .atomic_begin = drm_atomic_helper_begin, .atomic_set_event = drm_atomic_helper_set_event, .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, .atomic_end = drm_atomic_helper_end, .atomic_helpers = &drm_atomic_helper_funcs, In addition, if you're plane/crtc doesn't already have it's own custom properties, then add to your plane/crtc_funcs: .set_property = drm_atomic_helper_{plane,crtc}_set_property, A driver which can have (for example) conflicting modes across multiple crtcs (for example, bandwidth limitations or clock/pll configuration restrictions), can wrap drm_atomic_helper_check() with their own driver specific .atomic_check() function. A driver which can support true atomic updates can wrap drm_atomic_helper_commit(). A driver with custom properties should override the appropriate get_state(), check_state(), and commit_state() functions in .atomic_helpers if it uses the drm-atomic-helpers. Otherwise it is free to use &drm_atomic_helper_funcs as-is. Rob Clark (11): drm: add atomic fxns drm: convert crtc to ww_mutex drm: add object property type drm: add signed-range property type drm: helpers to find mode objects drm: split propvals out and blob property support drm: convert plane to properties/state drm: convert crtc to properties/state drm: push locking down into restore_fbdev_mode drm/msm: add atomic support HACK: drm: allow FB's in drm_mode_object_find Ville Syrjälä (3): drm: Allow drm_mode_object_find() to look up an object of any type drm: Refactor object property check code drm: Atomic modeset ioctl drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/ast/ast_drv.c | 6 + drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_mode.c | 1 + drivers/gpu/drm/cirrus/cirrus_drv.c | 6 + drivers/gpu/drm/cirrus/cirrus_drv.h | 1 + drivers/gpu/drm/cirrus/cirrus_mode.c | 1 + drivers/gpu/drm/drm_atomic_helper.c | 696 ++++++++++++ drivers/gpu/drm/drm_crtc.c | 1630 +++++++++++++++++++-------- drivers/gpu/drm/drm_drv.c | 1 + drivers/gpu/drm/drm_fb_cma_helper.c | 9 +- drivers/gpu/drm/drm_fb_helper.c | 28 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 15 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 7 + drivers/gpu/drm/exynos/exynos_drm_encoder.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_plane.c | 19 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 4 +- drivers/gpu/drm/gma500/cdv_intel_display.c | 1 + drivers/gpu/drm/gma500/cdv_intel_dp.c | 7 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 7 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 10 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- drivers/gpu/drm/gma500/psb_drv.c | 11 +- drivers/gpu/drm/gma500/psb_drv.h | 1 + drivers/gpu/drm/gma500/psb_intel_display.c | 1 + drivers/gpu/drm/gma500/psb_intel_drv.h | 4 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 10 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 23 +- drivers/gpu/drm/i2c/ch7006_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 8 + drivers/gpu/drm/i915/intel_crt.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 20 +- drivers/gpu/drm/i915/intel_dp.c | 7 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_fbdev.c | 6 +- drivers/gpu/drm/i915/intel_hdmi.c | 7 +- drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 23 +- drivers/gpu/drm/i915/intel_sprite.c | 21 +- drivers/gpu/drm/i915/intel_tv.c | 11 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 7 + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 + drivers/gpu/drm/mgag200/mgag200_mode.c | 1 + drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 69 +- drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 6 + drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 1 + drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 23 +- drivers/gpu/drm/msm/msm_atomic.c | 149 +++ drivers/gpu/drm/msm/msm_drv.c | 33 +- drivers/gpu/drm/msm/msm_drv.h | 9 + drivers/gpu/drm/msm/msm_gem.c | 24 +- drivers/gpu/drm/msm/msm_gem.h | 13 + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 1 + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 12 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 7 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 7 + drivers/gpu/drm/nouveau/nouveau_drm.h | 1 + drivers/gpu/drm/nouveau/nv50_display.c | 1 + drivers/gpu/drm/omapdrm/omap_crtc.c | 31 +- drivers/gpu/drm/omapdrm/omap_drv.c | 16 +- drivers/gpu/drm/omapdrm/omap_drv.h | 5 +- drivers/gpu/drm/omapdrm/omap_plane.c | 37 +- drivers/gpu/drm/qxl/qxl_display.c | 6 +- drivers/gpu/drm/qxl/qxl_drv.c | 9 + drivers/gpu/drm/radeon/radeon_connectors.c | 9 +- drivers/gpu/drm/radeon/radeon_display.c | 2 + drivers/gpu/drm/radeon/radeon_drv.c | 9 + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 7 + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 3 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 12 +- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 8 +- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 7 + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 6 +- drivers/gpu/drm/tegra/dc.c | 16 +- drivers/gpu/drm/tegra/fb.c | 7 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 3 +- drivers/gpu/drm/udl/udl_connector.c | 6 +- drivers/gpu/drm/udl/udl_drv.c | 8 + drivers/gpu/drm/udl/udl_modeset.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 + include/drm/drmP.h | 88 +- include/drm/drm_atomic_helper.h | 193 ++++ include/drm/drm_crtc.h | 341 +++++- include/drm/drm_fb_helper.h | 3 +- include/uapi/drm/drm.h | 12 + include/uapi/drm/drm_mode.h | 38 + 99 files changed, 3166 insertions(+), 767 deletions(-) create mode 100644 drivers/gpu/drm/drm_atomic_helper.c create mode 100644 drivers/gpu/drm/msm/msm_atomic.c create mode 100644 include/drm/drm_atomic_helper.h -- 1.8.4.2

3 31

[PATCH] Remove GART aperture from iomem_resource
by Bjorn Helgaas 18 Mar '14

18 Mar '14

This is a fix for a regression exposed by an AGP patch I merged in v3.14-rc1. Assuming nobody complains, I'd like to ask Linus to pull it ASAP, before v3.14 releases. I think it's correct, but I'd sure appreciate it if an AGP expert could check this out and confirm my belief that the GART aperture I'm removing is actually *bus* addresses, not CPU addresses (though they happen to be identical in many systems). --- Bjorn Helgaas (1): Revert "[PATCH] Insert GART region into resource map" arch/x86/kernel/aperture_64.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)

1 1

[RFC patch] PCI: Extend boot_vga sysfs attribute lookup to fix X on MBA+EFI
by Bruno Prémont 18 Mar '14

18 Mar '14

On a MacBookAir2,1, booting to Linux with EFI though having no efifb built-in Xorg refuses to start with "no devices detected" because for the only VGA device available (NVidia Geforce 9400M) the sysfs attribute boot_vga is zero (instead of expected 1). When CONFIG_FB_EFI is selected, efifb does provide its own vga_default_device() to report the PCI device matching global screen_info as determined during efifb setup. Otherwise there is just a dummy or VGA_ARB's vga_default_device() that does not provide the right information. On the other hand, boot_vga_show() falls back to poking PCI resources to flag a PCI device as boot_vga if vga_default_device() returned no PCI device (NULL). To complement this PCI resource poking, this patch copies the validation code used to determine which PCI device to report as default VGA device by efifb into boot_vga_show(). Signed-off-by: Bruno Prémont <bonbons(a)linux-vserver.org> --- Would it make sense to kill the corresponding code from efifb as it covers only a single case? The other EFI capable system I have (AMD Ilano based, Gigabyte mainboard does report boot_vga=1, possibly through the resources poking and there Xorg starts properly without efifb built in. Selecting CONFIG_X86_SYSFB (combined with CONFIG_FB_SIMPLE) does not help by itself, patching that one instead of PCI's boot_vga attribute directly would still not cover the case when neither of them is enabled. drivers/pci/pci-sysfs.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 7128cfd..91cac71 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -28,6 +28,7 @@ #include <linux/pci-aspm.h> #include <linux/slab.h> #include <linux/vgaarb.h> +#include <linux/screen_info.h> #include <linux/pm_runtime.h> #include "pci.h" @@ -540,6 +541,26 @@ boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf) if (vga_dev) return sprintf(buf, "%u\n", (pdev == vga_dev)); + if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) { + resource_size_t start, end; + int i; + + for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { + if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM)) + continue; + + start = pci_resource_start(pdev, i); + end = pci_resource_end(pdev, i); + + if (!start || !end) + continue; + + if (screen_info.lfb_base >= start && + (screen_info.lfb_base + screen_info.lfb_size) < end) + return sprintf(buf, "1\n"); + } + } + return sprintf(buf, "%u\n", !!(pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW));

3 10

← Newer
1
...
73
74
75
76
77
78
79
...
93
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2014