shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '36b0a9a80e8793b5475dc7f05fd6d7468d391a8d'

Browse Source 
* commit '36b0a9a80e8793b5475dc7f05fd6d7468d391a8d':
  drm/rockchp: dw-dp: move aux_register to bind
  dma-buf: rk-debug: update namespace get_each_dmabuf to dma_buf_get_each
  ANDROID: dma-buf: add dma_buf_get_each function
  input: touchscreen: elan: Add missing break in elan_iap_ioctl
  drm/rockchip: rk628: include drm/display/drm_dp_helper.h
  drm/rockchip: rk628: include media-bus-format.h
  drm/bridge: maxim-max96755: Add missing break in max96755f_link_parse
  drm/bridge: maxim-max96745: include drm_edid.h

Conflicts:
	include/linux/dma-buf.h
This commit is contained in:
Tao Huang
2023-05-23 20:11:59 +08:00
parent 7f8ef6f51f 36b0a9a80e
commit 0842130bd4
10 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma-buf/rk_heaps/rk-dma-heap.c
View File

@@ -613,7 +613,7 @@ static int rk_dma_heap_debug_show(struct seq_file *s, void *unused)
mutex_lock(&rk_heap_list_lock);
list_for_each_entry(heap, &rk_heap_list, list) {
heap->s = s;
get_each_dmabuf(rk_dma_heap_dump_dmabuf, heap);
dma_buf_get_each(rk_dma_heap_dump_dmabuf, heap);
rk_dma_heap_dump_contig(heap);
total += heap->total_size;
}
@@ -662,7 +662,7 @@ static int rk_dma_heap_proc_show(struct seq_file *s, void *unused)
mutex_lock(&rk_heap_list_lock);
list_for_each_entry(heap, &rk_heap_list, list) {
heap->s = s;
get_each_dmabuf(rk_dma_heap_dump_dmabuf, heap);
dma_buf_get_each(rk_dma_heap_dump_dmabuf, heap);
rk_dma_heap_dump_contig(heap);
total += heap->total_size;
}

1
drivers/gpu/drm/bridge/maxim-max96745.c
View File

@@ -7,6 +7,7 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
#include <drm/drm_edid.h>
#include <drm/drm_panel.h>
#include <drm/drm_print.h>
#include <drm/drm_of.h>

2
drivers/gpu/drm/bridge/maxim-max96755f.c
View File

@@ -466,10 +466,12 @@ static int max96755f_link_parse(struct max96755f_bridge *ser)
switch (nr) {
case 2:
ser->split_mode = true;
break;
case 1:
break;
default:
ret = -EINVAL;
break;
}
return ret;

36
drivers/gpu/drm/rockchip/dw-dp.c
View File

@@ -3854,13 +3854,6 @@ static void dw_dp_unregister_audio_driver(void *data)
}
}
static void dw_dp_aux_unregister(void *data)
{
struct dw_dp *dp = data;
drm_dp_aux_unregister(&dp->aux);
}
static int dw_dp_bind(struct device *dev, struct device *master, void *data)
{
struct dw_dp *dp = dev_get_drvdata(dev);
@@ -3869,6 +3862,14 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data)
struct drm_bridge *bridge = &dp->bridge;
int ret;
dp->aux.dev = dev;
dp->aux.drm_dev = drm_dev;
dp->aux.name = dev_name(dev);
dp->aux.transfer = dw_dp_aux_transfer;
ret = drm_dp_aux_register(&dp->aux);
if (ret)
return ret;
if (!dp->left) {
drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS);
drm_encoder_helper_add(encoder, &dw_dp_encoder_helper_funcs);
@@ -3879,7 +3880,7 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data)
ret = drm_bridge_attach(encoder, bridge, NULL, 0);
if (ret) {
dev_err(dev, "failed to attach bridge: %d\n", ret);
return ret;
goto error_unregister_aux;
}
}
@@ -3892,7 +3893,7 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data)
ret = drm_bridge_attach(encoder, &secondary->bridge, last_bridge,
DRM_BRIDGE_ATTACH_NO_CONNECTOR);
if (ret)
return ret;
goto error_unregister_aux;
}
pm_runtime_enable(dp->dev);
@@ -3903,12 +3904,18 @@ static int dw_dp_bind(struct device *dev, struct device *master, void *data)
enable_irq(dp->hpd_irq);
return 0;
error_unregister_aux:
drm_dp_aux_unregister(&dp->aux);
return ret;
}
static void dw_dp_unbind(struct device *dev, struct device *master, void *data)
{
struct dw_dp *dp = dev_get_drvdata(dev);
drm_dp_aux_unregister(&dp->aux);
if (dp->hpd_gpio)
disable_irq(dp->hpd_irq);
disable_irq(dp->irq);
@@ -4127,17 +4134,6 @@ static int dw_dp_probe(struct platform_device *pdev)
if (ret)
return ret;
dp->aux.dev = dev;
dp->aux.name = dev_name(dev);
dp->aux.transfer = dw_dp_aux_transfer;
ret = drm_dp_aux_register(&dp->aux);
if (ret)
return ret;
ret = devm_add_action_or_reset(dev, dw_dp_aux_unregister, dp);
if (ret)
return ret;
dp->bridge.of_node = dev->of_node;
dp->bridge.funcs = &dw_dp_bridge_funcs;
dp->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID |

1
drivers/gpu/drm/rockchip/rk628/rk628_gvi.c
View File

@@ -7,6 +7,7 @@
#include <linux/module.h>
#include <linux/clk.h>
#include <linux/media-bus-format.h>
#include <linux/platform_device.h>
#include <linux/of.h>
#include <linux/regmap.h>

2
drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c
View File

@@ -21,7 +21,7 @@
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_print.h>
#include <drm/drm_dp_helper.h>
#include <drm/display/drm_dp_helper.h>
#include <drm/drm_of.h>
#define REG(x) ((x) + 0x30000)

1
drivers/gpu/drm/rockchip/rk628/rk628_lvds.c
View File

@@ -7,6 +7,7 @@
#include <linux/module.h>
#include <linux/clk.h>
#include <linux/media-bus-format.h>
#include <linux/platform_device.h>
#include <linux/of.h>
#include <linux/regmap.h>

11
drivers/input/touchscreen/elan/elan_ts.c
View File

@@ -1463,11 +1463,12 @@ static long elan_iap_ioctl( struct file *filp, unsigned int cmd, unsigned long a
case IOCTL_I2C_INT:
put_user(gpio_get_value(ts->hw_info.intr_gpio), ip);
break;
case IOCTL_USER_HANDLE_IRQ:
ts->user_handle_irq = 1;
break;
case IOCTL_KERN_HANDLE_IRQ:
ts->user_handle_irq = 0;
case IOCTL_USER_HANDLE_IRQ:
ts->user_handle_irq = 1;
break;
case IOCTL_KERN_HANDLE_IRQ:
ts->user_handle_irq = 0;
break;
default:
break;
}

2
drivers/soc/rockchip/Kconfig
View File

@@ -276,7 +276,7 @@ config RK_DMABUF_PROCFS
depends on PROC_FS
help
Turns on this to create a procfs debug interface for dma-buf, support
get information from db_list by get_each_dmabuf.
get information from db_list by dma_buf_get_each.
If unsure, say "N".

4
drivers/soc/rockchip/rk_dmabuf_procfs.c
View File

@@ -118,7 +118,7 @@ static int rk_dmabuf_sgt_show(struct seq_file *s, void *v)
seq_printf(s, "%16s %-16s %-16s %14s %8s\n\n",
"DMABUF", "NAME", "EXPORT", "SIZE:KiB", "SGLIST");
return get_each_dmabuf(rk_dmabuf_cb, s);
return dma_buf_get_each(rk_dmabuf_cb, s);
}
static int rk_dmabuf_dev_show(struct seq_file *s, void *v)
@@ -126,7 +126,7 @@ static int rk_dmabuf_dev_show(struct seq_file *s, void *v)
seq_printf(s, "%16s %-16s %-16s %14s %8s\n\n",
"DMABUF", "NAME", "EXPORT", "SIZE:KiB", "AttachedDevices");
return get_each_dmabuf(rk_dmabuf_cb3, s);
return dma_buf_get_each(rk_dmabuf_cb3, s);
}
static int rk_dmabuf_size_show(struct seq_file *s, void *v)