mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-27 01:11:31 +00:00
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJaCm8RAAoJEAx081l5xIa+zX0QAJSm31kCG3vdw2CNiRx25L3q
3hcsEOgAjVJ9FQVGKFWjzb8TK35tSqtNx5kWIj0VGaIfBE5Bdg5SLLgKKUYas8rY
4LaphqICq2uxu2BNa2tpiar/sHhAnuozwQ4czpVWXzlaISnb9yYzRl7gMuyUVGkx
+Gih5VUhLmQC0HsRTLJ3vaZQoUsLAl2gAjKcWa1bx57j2S+iKOPfsLaq7VYo+y1I
Njc+iSGqMhJzRLXVkxL2lQKaslp7R38Bbh5K4Kvyjkm4Aq7zErOF6irpOXKMcrGl
mwnr89vf1G9thjikrBaXpKnuvdbWYveoN/ORMlTdCfxkFnChHLnm3bd7NJ49RXDN
Hv/Iq9YYjmZ9GTatxnx7lWtmXnZXC5he1yn1JAuz/yt7/0b/Wx+Mu/wEpBXYNFTd
1AZdD586i+AmPo3yDkqH9nBu8JC0W0AnS9VZma4LVvZOP2UfJmj5Im1CLHItbGDN
FnUCkwyD/lJUUk+WgT+w/GOMJgmFHDiFFl4tFtYVVjrUirpCFVguSKG9xuv6tT8P
8iRsoP7RrcmDN9ojN2SEHwcpsAv3HnKkDv+9+GIbWnrGsSbCPq8Qm+JDSvf4h22I
K5lwNpJrcpSKI+q10L7w2xliTBwb98sJkWGA/rssomrdBOWteGZAyqFRYAVgQ+mJ
x/nJurIqQYh2KQN9+uLG
=xVV2
-----END PGP SIGNATURE-----
Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux
Pull drm updates from Dave Airlie:
"This is the main drm pull request for v4.15.
Core:
- Atomic object lifetime fixes
- Atomic iterator improvements
- Sparse/smatch fixes
- Legacy kms ioctls to be interruptible
- EDID override improvements
- fb/gem helper cleanups
- Simple outreachy patches
- Documentation improvements
- Fix dma-buf rcu races
- DRM mode object leasing for improving VR use cases.
- vgaarb improvements for non-x86 platforms.
New driver:
- tve200: Faraday Technology TVE200 block.
This "TV Encoder" encodes a ITU-T BT.656 stream and can be found in
the StorLink SL3516 (later Cortina Systems CS3516) as well as the
Grain Media GM8180.
New bridges:
- SiI9234 support
New panels:
- S6E63J0X03, OTM8009A, Seiko 43WVF1G, 7" rpi touch panel, Toshiba
LT089AC19000, Innolux AT043TN24
i915:
- Remove Coffeelake from alpha support
- Cannonlake workarounds
- Infoframe refactoring for DisplayPort
- VBT updates
- DisplayPort vswing/emph/buffer translation refactoring
- CCS fixes
- Restore GPU clock boost on missed vblanks
- Scatter list updates for userptr allocations
- Gen9+ transition watermarks
- Display IPC (Isochronous Priority Control)
- Private PAT management
- GVT: improved error handling and pci config sanitizing
- Execlist refactoring
- Transparent Huge Page support
- User defined priorities support
- HuC/GuC firmware refactoring
- DP MST fixes
- eDP power sequencing fixes
- Use RCU instead of stop_machine
- PSR state tracking support
- Eviction fixes
- BDW DP aux channel timeout fixes
- LSPCON fixes
- Cannonlake PLL fixes
amdgpu:
- Per VM BO support
- Powerplay cleanups
- CI powerplay support
- PASID mgr for kfd
- SR-IOV fixes
- initial GPU reset for vega10
- Prime mmap support
- TTM updates
- Clock query interface for Raven
- Fence to handle ioctl
- UVD encode ring support on Polaris
- Transparent huge page DMA support
- Compute LRU pipe tweaks
- BO flag to allow buffers to opt out of implicit sync
- CTX priority setting API
- VRAM lost infrastructure plumbing
qxl:
- fix flicker since atomic rework
amdkfd:
- Further improvements from internal AMD tree
- Usermode events
- Drop radeon support
nouveau:
- Pascal temperature sensor support
- Improved BAR2 handling
- MMU rework to support Pascal MMU
exynos:
- Improved HDMI/mixer support
- HDMI audio interface support
tegra:
- Prep work for tegra186
- Cleanup/fixes
msm:
- Preemption support for a5xx
- Display fixes for 8x96 (snapdragon 820)
- Async cursor plane fixes
- FW loading rework
- GPU debugging improvements
vc4:
- Prep for DSI panels
- fix T-format tiling scanout
- New madvise ioctl
Rockchip:
- LVDS support
omapdrm:
- omap4 HDMI CEC support
etnaviv:
- GPU performance counters groundwork
sun4i:
- refactor driver load + TCON backend
- HDMI improvements
- A31 support
- Misc fixes
udl:
- Probe/EDID read fixes.
tilcdc:
- Misc fixes.
pl111:
- Support more variants
adv7511:
- Improve EDID handling.
- HDMI CEC support
sii8620:
- Add remote control support"
* tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux: (1480 commits)
drm/rockchip: analogix_dp: Use mutex rather than spinlock
drm/mode_object: fix documentation for object lookups.
drm/i915: Reorder context-close to avoid calling i915_vma_close() under RCU
drm/i915: Move init_clock_gating() back to where it was
drm/i915: Prune the reservation shared fence array
drm/i915: Idle the GPU before shinking everything
drm/i915: Lock llist_del_first() vs llist_del_all()
drm/i915: Calculate ironlake intermediate watermarks correctly, v2.
drm/i915: Disable lazy PPGTT page table optimization for vGPU
drm/i915/execlists: Remove the priority "optimisation"
drm/i915: Filter out spurious execlists context-switch interrupts
drm/amdgpu: use irq-safe lock for kiq->ring_lock
drm/amdgpu: bypass lru touch for KIQ ring submission
drm/amdgpu: Potential uninitialized variable in amdgpu_vm_update_directories()
drm/amdgpu: potential uninitialized variable in amdgpu_vce_ring_parse_cs()
drm/amd/powerplay: initialize a variable before using it
drm/amd/powerplay: suppress KASAN out of bounds warning in vega10_populate_all_memory_levels
drm/amd/amdgpu: fix evicted VRAM bo adjudgement condition
drm/vblank: Tune drm_crtc_accurate_vblank_count() WARN down to a debug
drm/rockchip: add CONFIG_OF dependency for lvds
...
264 lines
5.8 KiB
C
264 lines
5.8 KiB
C
/*
|
|
* Copyright (C) 2015 Texas Instruments
|
|
* Author: Jyri Sarha <jsarha@ti.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
* the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* To support the old "ti,tilcdc,slave" binding the binding has to be
|
|
* transformed to the new external encoder binding.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_graph.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/list.h>
|
|
|
|
#include "tilcdc_slave_compat.h"
|
|
|
|
struct kfree_table {
|
|
int total;
|
|
int num;
|
|
void **table;
|
|
};
|
|
|
|
static int __init kfree_table_init(struct kfree_table *kft)
|
|
{
|
|
kft->total = 32;
|
|
kft->num = 0;
|
|
kft->table = kmalloc(kft->total * sizeof(*kft->table),
|
|
GFP_KERNEL);
|
|
if (!kft->table)
|
|
return -ENOMEM;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init kfree_table_add(struct kfree_table *kft, void *p)
|
|
{
|
|
if (kft->num == kft->total) {
|
|
void **old = kft->table;
|
|
|
|
kft->total *= 2;
|
|
kft->table = krealloc(old, kft->total * sizeof(*kft->table),
|
|
GFP_KERNEL);
|
|
if (!kft->table) {
|
|
kft->table = old;
|
|
kfree(p);
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
kft->table[kft->num++] = p;
|
|
return 0;
|
|
}
|
|
|
|
static void __init kfree_table_free(struct kfree_table *kft)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < kft->num; i++)
|
|
kfree(kft->table[i]);
|
|
|
|
kfree(kft->table);
|
|
}
|
|
|
|
static
|
|
struct property * __init tilcdc_prop_dup(const struct property *prop,
|
|
struct kfree_table *kft)
|
|
{
|
|
struct property *nprop;
|
|
|
|
nprop = kzalloc(sizeof(*nprop), GFP_KERNEL);
|
|
if (!nprop || kfree_table_add(kft, nprop))
|
|
return NULL;
|
|
|
|
nprop->name = kstrdup(prop->name, GFP_KERNEL);
|
|
if (!nprop->name || kfree_table_add(kft, nprop->name))
|
|
return NULL;
|
|
|
|
nprop->value = kmemdup(prop->value, prop->length, GFP_KERNEL);
|
|
if (!nprop->value || kfree_table_add(kft, nprop->value))
|
|
return NULL;
|
|
|
|
nprop->length = prop->length;
|
|
|
|
return nprop;
|
|
}
|
|
|
|
static void __init tilcdc_copy_props(struct device_node *from,
|
|
struct device_node *to,
|
|
const char * const props[],
|
|
struct kfree_table *kft)
|
|
{
|
|
struct property *prop;
|
|
int i;
|
|
|
|
for (i = 0; props[i]; i++) {
|
|
prop = of_find_property(from, props[i], NULL);
|
|
if (!prop)
|
|
continue;
|
|
|
|
prop = tilcdc_prop_dup(prop, kft);
|
|
if (!prop)
|
|
continue;
|
|
|
|
prop->next = to->properties;
|
|
to->properties = prop;
|
|
}
|
|
}
|
|
|
|
static int __init tilcdc_prop_str_update(struct property *prop,
|
|
const char *str,
|
|
struct kfree_table *kft)
|
|
{
|
|
prop->value = kstrdup(str, GFP_KERNEL);
|
|
if (kfree_table_add(kft, prop->value) || !prop->value)
|
|
return -ENOMEM;
|
|
prop->length = strlen(str)+1;
|
|
return 0;
|
|
}
|
|
|
|
static void __init tilcdc_node_disable(struct device_node *node)
|
|
{
|
|
struct property *prop;
|
|
|
|
prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
if (!prop)
|
|
return;
|
|
|
|
prop->name = "status";
|
|
prop->value = "disabled";
|
|
prop->length = strlen((char *)prop->value)+1;
|
|
|
|
of_update_property(node, prop);
|
|
}
|
|
|
|
static struct device_node * __init tilcdc_get_overlay(struct kfree_table *kft)
|
|
{
|
|
const int size = __dtb_tilcdc_slave_compat_end -
|
|
__dtb_tilcdc_slave_compat_begin;
|
|
static void *overlay_data;
|
|
struct device_node *overlay;
|
|
|
|
if (!size) {
|
|
pr_warn("%s: No overlay data\n", __func__);
|
|
return NULL;
|
|
}
|
|
|
|
overlay_data = kmemdup(__dtb_tilcdc_slave_compat_begin,
|
|
size, GFP_KERNEL);
|
|
if (!overlay_data || kfree_table_add(kft, overlay_data))
|
|
return NULL;
|
|
|
|
of_fdt_unflatten_tree(overlay_data, NULL, &overlay);
|
|
if (!overlay) {
|
|
pr_warn("%s: Unfattening overlay tree failed\n", __func__);
|
|
return NULL;
|
|
}
|
|
|
|
return overlay;
|
|
}
|
|
|
|
static const struct of_device_id tilcdc_slave_of_match[] __initconst = {
|
|
{ .compatible = "ti,tilcdc,slave", },
|
|
{},
|
|
};
|
|
|
|
static const struct of_device_id tilcdc_of_match[] __initconst = {
|
|
{ .compatible = "ti,am33xx-tilcdc", },
|
|
{},
|
|
};
|
|
|
|
static const struct of_device_id tilcdc_tda998x_of_match[] __initconst = {
|
|
{ .compatible = "nxp,tda998x", },
|
|
{},
|
|
};
|
|
|
|
static const char * const tilcdc_slave_props[] __initconst = {
|
|
"pinctrl-names",
|
|
"pinctrl-0",
|
|
"pinctrl-1",
|
|
NULL
|
|
};
|
|
|
|
static void __init tilcdc_convert_slave_node(void)
|
|
{
|
|
struct device_node *slave = NULL, *lcdc = NULL;
|
|
struct device_node *i2c = NULL, *fragment = NULL;
|
|
struct device_node *overlay, *encoder;
|
|
struct property *prop;
|
|
/* For all memory needed for the overlay tree. This memory can
|
|
be freed after the overlay has been applied. */
|
|
struct kfree_table kft;
|
|
int ovcs_id, ret;
|
|
|
|
if (kfree_table_init(&kft))
|
|
return;
|
|
|
|
lcdc = of_find_matching_node(NULL, tilcdc_of_match);
|
|
slave = of_find_matching_node(NULL, tilcdc_slave_of_match);
|
|
|
|
if (!slave || !of_device_is_available(lcdc))
|
|
goto out;
|
|
|
|
i2c = of_parse_phandle(slave, "i2c", 0);
|
|
if (!i2c) {
|
|
pr_err("%s: Can't find i2c node trough phandle\n", __func__);
|
|
goto out;
|
|
}
|
|
|
|
overlay = tilcdc_get_overlay(&kft);
|
|
if (!overlay)
|
|
goto out;
|
|
|
|
encoder = of_find_matching_node(overlay, tilcdc_tda998x_of_match);
|
|
if (!encoder) {
|
|
pr_err("%s: Failed to find tda998x node\n", __func__);
|
|
goto out;
|
|
}
|
|
|
|
tilcdc_copy_props(slave, encoder, tilcdc_slave_props, &kft);
|
|
|
|
for_each_child_of_node(overlay, fragment) {
|
|
prop = of_find_property(fragment, "target-path", NULL);
|
|
if (!prop)
|
|
continue;
|
|
if (!strncmp("i2c", (char *)prop->value, prop->length))
|
|
if (tilcdc_prop_str_update(prop, i2c->full_name, &kft))
|
|
goto out;
|
|
if (!strncmp("lcdc", (char *)prop->value, prop->length))
|
|
if (tilcdc_prop_str_update(prop, lcdc->full_name, &kft))
|
|
goto out;
|
|
}
|
|
|
|
tilcdc_node_disable(slave);
|
|
|
|
ovcs_id = 0;
|
|
ret = of_overlay_apply(overlay, &ovcs_id);
|
|
if (ret)
|
|
pr_err("%s: Applying overlay changeset failed: %d\n",
|
|
__func__, ret);
|
|
else
|
|
pr_info("%s: ti,tilcdc,slave node successfully converted\n",
|
|
__func__);
|
|
out:
|
|
kfree_table_free(&kft);
|
|
of_node_put(i2c);
|
|
of_node_put(slave);
|
|
of_node_put(lcdc);
|
|
of_node_put(fragment);
|
|
}
|
|
|
|
static int __init tilcdc_slave_compat_init(void)
|
|
{
|
|
tilcdc_convert_slave_node();
|
|
return 0;
|
|
}
|
|
|
|
subsys_initcall(tilcdc_slave_compat_init);
|