mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
core: - add user def flag to cmd line modes - dma_fence_wait added might_sleep - dma-fence lockdep annotations - indefinite fences are bad documentation - gem CMA functions used in more drivers - struct mutex removal - more drm_ debug macro usage - set/drop master api fixes - fix for drm/mm hole size comparison - drm/mm remove invalid entry optimization - optimise drm/mm hole handling - VRR debugfs added - uncompressed AFBC modifier support - multiple display id blocks in EDID - multiple driver sg handling fixes - __drm_atomic_helper_crtc_reset in all drivers - managed vram helpers ttm: - ttm_mem_reg handling cleanup - remove bo offset field - drop CMA memtype flag - drop mappable flag xilinx: - New Xilinx ZynqMP DisplayPort Subsystem driver nouveau: - add CRC support - start using NVIDIA published class header files - convert all push buffer emission to new macros - Proper push buffer space management for EVO/NVD channels. - firmware loading fixes - 2MiB system memory pages support on Pascal and newer vkms: - larget cursor support i915: - Rocketlake platform enablement - Early DG1 enablement - Numerous GEM refactorings - DP MST fixes - FBC, PSR, Cursor, Color, Gamma fixes - TGL, RKL, EHL workaround updates - TGL 8K display support fixes - SDVO/HDMI/DVI fixes amdgpu: - Initial support for Sienna Cichlid GPU - Initial support for Navy Flounder GPU - SI UVD/VCE support - expose rotation property - Add support for unique id on Arcturus - Enable runtime PM on vega10 boards that support BACO - Skip BAR resizing if the bios already did id - Major swSMU code cleanup - Fixes for DCN bandwidth calculations amdkfd: - Track SDMA usage per process - SMI events interface radeon: - Default to on chip GART for AGP boards on all arches - Runtime PM reference count fixes msm: - headers regenerated causing churn - a650/a640 display and GPU enablement - dpu dither support for 6bpc panels - dpu cursor fix - dsi/mdp5 enablement for sdm630/sdm636/sdm66 tegra: - video capture prep support - reflection support mediatek: - convert mtk_dsi to bridge API meson: - FBC support sun4i: - iommu support rockchip: - register locking fix - per-pixel alpha support PX30 VOP - mgag200: - ported to simple and shmem helpers - device init cleanups - use managed pci functions - dropped hw cursor support ast: - use managed pci functions - use managed VRAM helpers - rework cursor support malidp: - dev_groups support hibmc: - refactor hibmc_drv_vdac: vc4: - create TXP CRTC imx: - error path fixes and cleanups etnaviv: - clock handling and error handling cleanups - use pin_user_pages -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJfK1atAAoJEAx081l5xIa+vDkQAJvl/mjbEA7fDy8Ysa0cgPLI 8nI4Bo/MaxkyRfUcP8+f/n3QQrRME37C0xa/Mn6SG1oFAdlovPwDqmDr5kjhkrMI geo8oJb2Q+AsrJr+ejpuF+iq0FxWi64bLbwJFJ2nBet+lHTMzoPceWeq3gG1Vvfl h6PV4B/9TjrnbhcKLIQSEmJ0kZp9uMkDBF/iynVn4+AKAkG1rQNjigdTH48IFPoz 28KuqG0B4NWu648zYXhjsN0kD3Dxjv3YOH+FsoWQpQa9icCTySYbySsQ7l0/XvA3 4BPtP3rWMhU46FHTBkWF72WQR4F0B4wm5DJJKMeG4vb1mXakOqAKcAq7JAbka+wL PBIiU+AcAKRSiwHmYDuDWtDoSpvYncuo0p3IvNP5hhih+7hqCnLIULDWS+V8AUzW 39usS/DXsVKk/HGYIYC89cRwsqWYD4c7edzOBdPQxW4LNYCD2gXezLJ5TeeR2lih y9JIVnPiluWleOovs4W3BoZNRuLc1rHBO6COToXjlme/48Z+sRHBAoge6UZurqRN jr+e60cS7n/DOeJQuNf4UHZnK48Pc24+3kVfMHlX+OKn8VuKPGr+USkeHV/NYL/B USiKCAxkkZM0dxerSb1/Ra9kGnchf0QBpA6Fsem8kV61Z4GVc+K6xJWg7KXB6n/3 7ZyalUKLwlOCz9sYsCCe =Yvtd -----END PGP SIGNATURE----- Merge tag 'drm-next-2020-08-06' of git://anongit.freedesktop.org/drm/drm Pull drm updates from Dave Airlie: "New xilinx displayport driver, AMD support for two new GPUs (more header files), i915 initial support for RocketLake and some work on their DG1 (discrete chip). The core also grew some lockdep annotations to try and constrain what drivers do with dma-fences, and added some documentation on why the idea of indefinite fences doesn't work. The long list is below. I do have some fixes trees outstanding, but I'll follow up with those later. core: - add user def flag to cmd line modes - dma_fence_wait added might_sleep - dma-fence lockdep annotations - indefinite fences are bad documentation - gem CMA functions used in more drivers - struct mutex removal - more drm_ debug macro usage - set/drop master api fixes - fix for drm/mm hole size comparison - drm/mm remove invalid entry optimization - optimise drm/mm hole handling - VRR debugfs added - uncompressed AFBC modifier support - multiple display id blocks in EDID - multiple driver sg handling fixes - __drm_atomic_helper_crtc_reset in all drivers - managed vram helpers ttm: - ttm_mem_reg handling cleanup - remove bo offset field - drop CMA memtype flag - drop mappable flag xilinx: - New Xilinx ZynqMP DisplayPort Subsystem driver nouveau: - add CRC support - start using NVIDIA published class header files - convert all push buffer emission to new macros - Proper push buffer space management for EVO/NVD channels. - firmware loading fixes - 2MiB system memory pages support on Pascal and newer vkms: - larger cursor support i915: - Rocketlake platform enablement - Early DG1 enablement - Numerous GEM refactorings - DP MST fixes - FBC, PSR, Cursor, Color, Gamma fixes - TGL, RKL, EHL workaround updates - TGL 8K display support fixes - SDVO/HDMI/DVI fixes amdgpu: - Initial support for Sienna Cichlid GPU - Initial support for Navy Flounder GPU - SI UVD/VCE support - expose rotation property - Add support for unique id on Arcturus - Enable runtime PM on vega10 boards that support BACO - Skip BAR resizing if the bios already did id - Major swSMU code cleanup - Fixes for DCN bandwidth calculations amdkfd: - Track SDMA usage per process - SMI events interface radeon: - Default to on chip GART for AGP boards on all arches - Runtime PM reference count fixes msm: - headers regenerated causing churn - a650/a640 display and GPU enablement - dpu dither support for 6bpc panels - dpu cursor fix - dsi/mdp5 enablement for sdm630/sdm636/sdm66 tegra: - video capture prep support - reflection support mediatek: - convert mtk_dsi to bridge API meson: - FBC support sun4i: - iommu support rockchip: - register locking fix - per-pixel alpha support PX30 VOP mgag200: - ported to simple and shmem helpers - device init cleanups - use managed pci functions - dropped hw cursor support ast: - use managed pci functions - use managed VRAM helpers - rework cursor support malidp: - dev_groups support hibmc: - refactor hibmc_drv_vdac: vc4: - create TXP CRTC imx: - error path fixes and cleanups etnaviv: - clock handling and error handling cleanups - use pin_user_pages" * tag 'drm-next-2020-08-06' of git://anongit.freedesktop.org/drm/drm: (1747 commits) drm/msm: use kthread_create_worker instead of kthread_run drm/msm/mdp5: Add MDP5 configuration for SDM636/660 drm/msm/dsi: Add DSI configuration for SDM660 drm/msm/mdp5: Add MDP5 configuration for SDM630 drm/msm/dsi: Add phy configuration for SDM630/636/660 drm/msm/a6xx: add A640/A650 hwcg drm/msm/a6xx: hwcg tables in gpulist drm/msm/dpu: add SM8250 to hw catalog drm/msm/dpu: add SM8150 to hw catalog drm/msm/dpu: intf timing path for displayport drm/msm/dpu: set missing flush bits for INTF_2 and INTF_3 drm/msm/dpu: don't use INTF_INPUT_CTRL feature on sdm845 drm/msm/dpu: move some sspp caps to dpu_caps drm/msm/dpu: update UBWC config for sm8150 and sm8250 drm/msm/dpu: use right setup_blend_config for sm8150 and sm8250 drm/msm/a6xx: set ubwc config for A640 and A650 drm/msm/adreno: un-open-code some packets drm/msm: sync generated headers drm/msm/a6xx: add build_bw_table for A640/A650 drm/msm/a6xx: fix crashstate capture for A650 ...
399 lines
11 KiB
C
399 lines
11 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#include <linux/component.h>
|
|
#include <linux/export.h>
|
|
#include <linux/list.h>
|
|
#include <linux/of_graph.h>
|
|
|
|
#include <drm/drm_bridge.h>
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_device.h>
|
|
#include <drm/drm_encoder.h>
|
|
#include <drm/drm_of.h>
|
|
#include <drm/drm_panel.h>
|
|
|
|
/**
|
|
* DOC: overview
|
|
*
|
|
* A set of helper functions to aid DRM drivers in parsing standard DT
|
|
* properties.
|
|
*/
|
|
|
|
static void drm_release_of(struct device *dev, void *data)
|
|
{
|
|
of_node_put(data);
|
|
}
|
|
|
|
/**
|
|
* drm_of_crtc_port_mask - find the mask of a registered CRTC by port OF node
|
|
* @dev: DRM device
|
|
* @port: port OF node
|
|
*
|
|
* Given a port OF node, return the possible mask of the corresponding
|
|
* CRTC within a device's list of CRTCs. Returns zero if not found.
|
|
*/
|
|
uint32_t drm_of_crtc_port_mask(struct drm_device *dev,
|
|
struct device_node *port)
|
|
{
|
|
unsigned int index = 0;
|
|
struct drm_crtc *tmp;
|
|
|
|
drm_for_each_crtc(tmp, dev) {
|
|
if (tmp->port == port)
|
|
return 1 << index;
|
|
|
|
index++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(drm_of_crtc_port_mask);
|
|
|
|
/**
|
|
* drm_of_find_possible_crtcs - find the possible CRTCs for an encoder port
|
|
* @dev: DRM device
|
|
* @port: encoder port to scan for endpoints
|
|
*
|
|
* Scan all endpoints attached to a port, locate their attached CRTCs,
|
|
* and generate the DRM mask of CRTCs which may be attached to this
|
|
* encoder.
|
|
*
|
|
* See Documentation/devicetree/bindings/graph.txt for the bindings.
|
|
*/
|
|
uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
|
|
struct device_node *port)
|
|
{
|
|
struct device_node *remote_port, *ep;
|
|
uint32_t possible_crtcs = 0;
|
|
|
|
for_each_endpoint_of_node(port, ep) {
|
|
remote_port = of_graph_get_remote_port(ep);
|
|
if (!remote_port) {
|
|
of_node_put(ep);
|
|
return 0;
|
|
}
|
|
|
|
possible_crtcs |= drm_of_crtc_port_mask(dev, remote_port);
|
|
|
|
of_node_put(remote_port);
|
|
}
|
|
|
|
return possible_crtcs;
|
|
}
|
|
EXPORT_SYMBOL(drm_of_find_possible_crtcs);
|
|
|
|
/**
|
|
* drm_of_component_match_add - Add a component helper OF node match rule
|
|
* @master: master device
|
|
* @matchptr: component match pointer
|
|
* @compare: compare function used for matching component
|
|
* @node: of_node
|
|
*/
|
|
void drm_of_component_match_add(struct device *master,
|
|
struct component_match **matchptr,
|
|
int (*compare)(struct device *, void *),
|
|
struct device_node *node)
|
|
{
|
|
of_node_get(node);
|
|
component_match_add_release(master, matchptr, drm_release_of,
|
|
compare, node);
|
|
}
|
|
EXPORT_SYMBOL_GPL(drm_of_component_match_add);
|
|
|
|
/**
|
|
* drm_of_component_probe - Generic probe function for a component based master
|
|
* @dev: master device containing the OF node
|
|
* @compare_of: compare function used for matching components
|
|
* @m_ops: component master ops to be used
|
|
*
|
|
* Parse the platform device OF node and bind all the components associated
|
|
* with the master. Interface ports are added before the encoders in order to
|
|
* satisfy their .bind requirements
|
|
* See Documentation/devicetree/bindings/graph.txt for the bindings.
|
|
*
|
|
* Returns zero if successful, or one of the standard error codes if it fails.
|
|
*/
|
|
int drm_of_component_probe(struct device *dev,
|
|
int (*compare_of)(struct device *, void *),
|
|
const struct component_master_ops *m_ops)
|
|
{
|
|
struct device_node *ep, *port, *remote;
|
|
struct component_match *match = NULL;
|
|
int i;
|
|
|
|
if (!dev->of_node)
|
|
return -EINVAL;
|
|
|
|
/*
|
|
* Bind the crtc's ports first, so that drm_of_find_possible_crtcs()
|
|
* called from encoder's .bind callbacks works as expected
|
|
*/
|
|
for (i = 0; ; i++) {
|
|
port = of_parse_phandle(dev->of_node, "ports", i);
|
|
if (!port)
|
|
break;
|
|
|
|
if (of_device_is_available(port->parent))
|
|
drm_of_component_match_add(dev, &match, compare_of,
|
|
port);
|
|
|
|
of_node_put(port);
|
|
}
|
|
|
|
if (i == 0) {
|
|
dev_err(dev, "missing 'ports' property\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
if (!match) {
|
|
dev_err(dev, "no available port\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
/*
|
|
* For bound crtcs, bind the encoders attached to their remote endpoint
|
|
*/
|
|
for (i = 0; ; i++) {
|
|
port = of_parse_phandle(dev->of_node, "ports", i);
|
|
if (!port)
|
|
break;
|
|
|
|
if (!of_device_is_available(port->parent)) {
|
|
of_node_put(port);
|
|
continue;
|
|
}
|
|
|
|
for_each_child_of_node(port, ep) {
|
|
remote = of_graph_get_remote_port_parent(ep);
|
|
if (!remote || !of_device_is_available(remote)) {
|
|
of_node_put(remote);
|
|
continue;
|
|
} else if (!of_device_is_available(remote->parent)) {
|
|
dev_warn(dev, "parent device of %pOF is not available\n",
|
|
remote);
|
|
of_node_put(remote);
|
|
continue;
|
|
}
|
|
|
|
drm_of_component_match_add(dev, &match, compare_of,
|
|
remote);
|
|
of_node_put(remote);
|
|
}
|
|
of_node_put(port);
|
|
}
|
|
|
|
return component_master_add_with_match(dev, m_ops, match);
|
|
}
|
|
EXPORT_SYMBOL(drm_of_component_probe);
|
|
|
|
/*
|
|
* drm_of_encoder_active_endpoint - return the active encoder endpoint
|
|
* @node: device tree node containing encoder input ports
|
|
* @encoder: drm_encoder
|
|
*
|
|
* Given an encoder device node and a drm_encoder with a connected crtc,
|
|
* parse the encoder endpoint connecting to the crtc port.
|
|
*/
|
|
int drm_of_encoder_active_endpoint(struct device_node *node,
|
|
struct drm_encoder *encoder,
|
|
struct of_endpoint *endpoint)
|
|
{
|
|
struct device_node *ep;
|
|
struct drm_crtc *crtc = encoder->crtc;
|
|
struct device_node *port;
|
|
int ret;
|
|
|
|
if (!node || !crtc)
|
|
return -EINVAL;
|
|
|
|
for_each_endpoint_of_node(node, ep) {
|
|
port = of_graph_get_remote_port(ep);
|
|
of_node_put(port);
|
|
if (port == crtc->port) {
|
|
ret = of_graph_parse_endpoint(ep, endpoint);
|
|
of_node_put(ep);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
return -EINVAL;
|
|
}
|
|
EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint);
|
|
|
|
/**
|
|
* drm_of_find_panel_or_bridge - return connected panel or bridge device
|
|
* @np: device tree node containing encoder output ports
|
|
* @port: port in the device tree node
|
|
* @endpoint: endpoint in the device tree node
|
|
* @panel: pointer to hold returned drm_panel
|
|
* @bridge: pointer to hold returned drm_bridge
|
|
*
|
|
* Given a DT node's port and endpoint number, find the connected node and
|
|
* return either the associated struct drm_panel or drm_bridge device. Either
|
|
* @panel or @bridge must not be NULL.
|
|
*
|
|
* Returns zero if successful, or one of the standard error codes if it fails.
|
|
*/
|
|
int drm_of_find_panel_or_bridge(const struct device_node *np,
|
|
int port, int endpoint,
|
|
struct drm_panel **panel,
|
|
struct drm_bridge **bridge)
|
|
{
|
|
int ret = -EPROBE_DEFER;
|
|
struct device_node *remote;
|
|
|
|
if (!panel && !bridge)
|
|
return -EINVAL;
|
|
if (panel)
|
|
*panel = NULL;
|
|
|
|
/*
|
|
* of_graph_get_remote_node() produces a noisy error message if port
|
|
* node isn't found and the absence of the port is a legit case here,
|
|
* so at first we silently check whether graph presents in the
|
|
* device-tree node.
|
|
*/
|
|
if (!of_graph_is_present(np))
|
|
return -ENODEV;
|
|
|
|
remote = of_graph_get_remote_node(np, port, endpoint);
|
|
if (!remote)
|
|
return -ENODEV;
|
|
|
|
if (panel) {
|
|
*panel = of_drm_find_panel(remote);
|
|
if (!IS_ERR(*panel))
|
|
ret = 0;
|
|
else
|
|
*panel = NULL;
|
|
}
|
|
|
|
/* No panel found yet, check for a bridge next. */
|
|
if (bridge) {
|
|
if (ret) {
|
|
*bridge = of_drm_find_bridge(remote);
|
|
if (*bridge)
|
|
ret = 0;
|
|
} else {
|
|
*bridge = NULL;
|
|
}
|
|
|
|
}
|
|
|
|
of_node_put(remote);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(drm_of_find_panel_or_bridge);
|
|
|
|
enum drm_of_lvds_pixels {
|
|
DRM_OF_LVDS_EVEN = BIT(0),
|
|
DRM_OF_LVDS_ODD = BIT(1),
|
|
};
|
|
|
|
static int drm_of_lvds_get_port_pixels_type(struct device_node *port_node)
|
|
{
|
|
bool even_pixels =
|
|
of_property_read_bool(port_node, "dual-lvds-even-pixels");
|
|
bool odd_pixels =
|
|
of_property_read_bool(port_node, "dual-lvds-odd-pixels");
|
|
|
|
return (even_pixels ? DRM_OF_LVDS_EVEN : 0) |
|
|
(odd_pixels ? DRM_OF_LVDS_ODD : 0);
|
|
}
|
|
|
|
static int drm_of_lvds_get_remote_pixels_type(
|
|
const struct device_node *port_node)
|
|
{
|
|
struct device_node *endpoint = NULL;
|
|
int pixels_type = -EPIPE;
|
|
|
|
for_each_child_of_node(port_node, endpoint) {
|
|
struct device_node *remote_port;
|
|
int current_pt;
|
|
|
|
if (!of_node_name_eq(endpoint, "endpoint"))
|
|
continue;
|
|
|
|
remote_port = of_graph_get_remote_port(endpoint);
|
|
if (!remote_port) {
|
|
of_node_put(remote_port);
|
|
return -EPIPE;
|
|
}
|
|
|
|
current_pt = drm_of_lvds_get_port_pixels_type(remote_port);
|
|
of_node_put(remote_port);
|
|
if (pixels_type < 0)
|
|
pixels_type = current_pt;
|
|
|
|
/*
|
|
* Sanity check, ensure that all remote endpoints have the same
|
|
* pixel type. We may lift this restriction later if we need to
|
|
* support multiple sinks with different dual-link
|
|
* configurations by passing the endpoints explicitly to
|
|
* drm_of_lvds_get_dual_link_pixel_order().
|
|
*/
|
|
if (!current_pt || pixels_type != current_pt)
|
|
return -EINVAL;
|
|
}
|
|
|
|
return pixels_type;
|
|
}
|
|
|
|
/**
|
|
* drm_of_lvds_get_dual_link_pixel_order - Get LVDS dual-link pixel order
|
|
* @port1: First DT port node of the Dual-link LVDS source
|
|
* @port2: Second DT port node of the Dual-link LVDS source
|
|
*
|
|
* An LVDS dual-link connection is made of two links, with even pixels
|
|
* transitting on one link, and odd pixels on the other link. This function
|
|
* returns, for two ports of an LVDS dual-link source, which port shall transmit
|
|
* the even and odd pixels, based on the requirements of the connected sink.
|
|
*
|
|
* The pixel order is determined from the dual-lvds-even-pixels and
|
|
* dual-lvds-odd-pixels properties in the sink's DT port nodes. If those
|
|
* properties are not present, or if their usage is not valid, this function
|
|
* returns -EINVAL.
|
|
*
|
|
* If either port is not connected, this function returns -EPIPE.
|
|
*
|
|
* @port1 and @port2 are typically DT sibling nodes, but may have different
|
|
* parents when, for instance, two separate LVDS encoders carry the even and odd
|
|
* pixels.
|
|
*
|
|
* Return:
|
|
* * DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS - @port1 carries even pixels and @port2
|
|
* carries odd pixels
|
|
* * DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS - @port1 carries odd pixels and @port2
|
|
* carries even pixels
|
|
* * -EINVAL - @port1 and @port2 are not connected to a dual-link LVDS sink, or
|
|
* the sink configuration is invalid
|
|
* * -EPIPE - when @port1 or @port2 are not connected
|
|
*/
|
|
int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
|
|
const struct device_node *port2)
|
|
{
|
|
int remote_p1_pt, remote_p2_pt;
|
|
|
|
if (!port1 || !port2)
|
|
return -EINVAL;
|
|
|
|
remote_p1_pt = drm_of_lvds_get_remote_pixels_type(port1);
|
|
if (remote_p1_pt < 0)
|
|
return remote_p1_pt;
|
|
|
|
remote_p2_pt = drm_of_lvds_get_remote_pixels_type(port2);
|
|
if (remote_p2_pt < 0)
|
|
return remote_p2_pt;
|
|
|
|
/*
|
|
* A valid dual-lVDS bus is found when one remote port is marked with
|
|
* "dual-lvds-even-pixels", and the other remote port is marked with
|
|
* "dual-lvds-odd-pixels", bail out if the markers are not right.
|
|
*/
|
|
if (remote_p1_pt + remote_p2_pt != DRM_OF_LVDS_EVEN + DRM_OF_LVDS_ODD)
|
|
return -EINVAL;
|
|
|
|
return remote_p1_pt == DRM_OF_LVDS_EVEN ?
|
|
DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS :
|
|
DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS;
|
|
}
|
|
EXPORT_SYMBOL_GPL(drm_of_lvds_get_dual_link_pixel_order);
|