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

Merge commit 'd2d73e0a5a0345ee01581a01432b5410f38232e9'

Browse Source 
* commit 'd2d73e0a5a0345ee01581a01432b5410f38232e9':
  media: videobuf2-cma-sg: fix build error for kernel 6.1
  thermal: rk_virtual_thermal: fix compile error for kernel 6.1
This commit is contained in:
Tao Huang
2023-05-25 20:46:23 +08:00
parent 2a34e3c0c4 d2d73e0a5a
commit 1872b360fc
2 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
drivers/media/common/videobuf2/videobuf2-cma-sg.c
View File

@@ -40,6 +40,8 @@ struct vb2_cma_sg_buf {
struct vb2_vmarea_handler handler;
struct dma_buf_attachment *db_attach;
struct vb2_buffer *vb;
};
static void vb2_cma_sg_put(void *buf_priv);
@@ -137,16 +139,15 @@ static void vb2_cma_sg_free_contiguous(struct vb2_cma_sg_buf *buf)
}
}
static void *vb2_cma_sg_alloc(struct device *dev, unsigned long dma_attrs,
unsigned long size,
enum dma_data_direction dma_dir,
gfp_t gfp_flags)
static void *vb2_cma_sg_alloc(struct vb2_buffer *vb, struct device *dev,
unsigned long size)
{
struct vb2_cma_sg_buf *buf;
struct sg_table *sgt;
unsigned long dma_attrs;
int ret;
if (WARN_ON(!dev))
if (WARN_ON(!dev) || WARN_ON(!size))
return ERR_PTR(-EINVAL);
buf = kzalloc(sizeof(*buf), GFP_KERNEL);
@@ -154,8 +155,9 @@ static void *vb2_cma_sg_alloc(struct device *dev, unsigned long dma_attrs,
return ERR_PTR(-ENOMEM);
buf->vaddr = NULL;
dma_attrs = vb->vb2_queue->dma_attrs;
buf->dma_attrs = dma_attrs;
buf->dma_dir = dma_dir;
buf->dma_dir = vb->vb2_queue->dma_dir;
buf->offset = 0;
buf->size = size;
/* size is already page aligned */
@@ -164,15 +166,14 @@ static void *vb2_cma_sg_alloc(struct device *dev, unsigned long dma_attrs,
/* Prevent the device from being released while the buffer is used */
buf->dev = get_device(dev);
buf->pages = kvmalloc_array(buf->num_pages, sizeof(struct page *),
GFP_KERNEL | __GFP_ZERO);
buf->pages = kvcalloc(buf->num_pages, sizeof(struct page *), GFP_KERNEL);
if (!buf->pages)
goto fail_pages_array_alloc;
if (dma_attrs & DMA_ATTR_FORCE_CONTIGUOUS)
ret = vb2_cma_sg_alloc_contiguous(buf);
else
ret = vb2_cma_sg_alloc_compacted(buf, gfp_flags);
ret = vb2_cma_sg_alloc_compacted(buf, vb->vb2_queue->gfp_flags);
if (ret)
goto fail_pages_alloc;
@@ -193,6 +194,7 @@ static void *vb2_cma_sg_alloc(struct device *dev, unsigned long dma_attrs,
buf->handler.refcount = &buf->refcount;
buf->handler.put = vb2_cma_sg_put;
buf->handler.arg = buf;
buf->vb = vb;
refcount_set(&buf->refcount, 1);
@@ -240,6 +242,9 @@ static void vb2_cma_sg_prepare(void *buf_priv)
struct vb2_cma_sg_buf *buf = buf_priv;
struct sg_table *sgt = buf->dma_sgt;
if (buf->vb->skip_cache_sync_on_prepare)
return;
dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir);
}
@@ -248,12 +253,14 @@ static void vb2_cma_sg_finish(void *buf_priv)
struct vb2_cma_sg_buf *buf = buf_priv;
struct sg_table *sgt = buf->dma_sgt;
if (buf->vb->skip_cache_sync_on_finish)
return;
dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir);
}
static void *vb2_cma_sg_get_userptr(struct device *dev, unsigned long vaddr,
unsigned long size,
enum dma_data_direction dma_dir)
static void *vb2_cma_sg_get_userptr(struct vb2_buffer *vb, struct device *dev,
unsigned long vaddr, unsigned long size)
{
struct vb2_cma_sg_buf *buf;
struct sg_table *sgt;
@@ -268,10 +275,11 @@ static void *vb2_cma_sg_get_userptr(struct device *dev, unsigned long vaddr,
buf->vaddr = NULL;
buf->dev = dev;
buf->dma_dir = dma_dir;
buf->dma_dir = vb->vb2_queue->dma_dir;
buf->offset = vaddr & ~PAGE_MASK;
buf->size = size;
buf->dma_sgt = &buf->sg_table;
buf->vb = vb;
vec = vb2_create_framevec(vaddr, size);
if (IS_ERR(vec))
goto userptr_fail_pfnvec;
@@ -328,7 +336,7 @@ static void vb2_cma_sg_put_userptr(void *buf_priv)
kfree(buf);
}
static void *vb2_cma_sg_vaddr(void *buf_priv)
static void vb2_cma_sg_vaddr_map(void *buf_priv)
{
struct vb2_cma_sg_buf *buf = buf_priv;
struct iosys_map map;
@@ -344,6 +352,13 @@ static void *vb2_cma_sg_vaddr(void *buf_priv)
buf->vaddr = vm_map_ram(buf->pages, buf->num_pages, -1);
}
}
}
static void *vb2_cma_sg_vaddr(struct vb2_buffer *vb, void *buf_priv)
{
struct vb2_cma_sg_buf *buf = buf_priv;
vb2_cma_sg_vaddr_map(buf);
/* add offset in case userptr is not page-aligned */
return buf->vaddr ? buf->vaddr + buf->offset : NULL;
@@ -520,15 +535,16 @@ vb2_cma_sg_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,
return 0;
}
static int vb2_cma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf, struct iosys_map *map)
static int vb2_cma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf,
struct iosys_map *map)
{
struct vb2_cma_sg_buf *buf = dbuf->priv;
void *vaddr;
vaddr = vb2_cma_sg_vaddr(buf);
if (!vaddr)
vb2_cma_sg_vaddr_map(buf);
if (!buf->vaddr)
return -ENOMEM;
iosys_map_set_vaddr(map, vaddr);
iosys_map_set_vaddr(map, buf->vaddr);
return 0;
}
@@ -551,7 +567,9 @@ static const struct dma_buf_ops vb2_cma_sg_dmabuf_ops = {
.release = vb2_cma_sg_dmabuf_ops_release,
};
static struct dma_buf *vb2_cma_sg_get_dmabuf(void *buf_priv, unsigned long flags)
static struct dma_buf *vb2_cma_sg_get_dmabuf(struct vb2_buffer *vb,
void *buf_priv,
unsigned long flags)
{
struct vb2_cma_sg_buf *buf = buf_priv;
struct dma_buf *dbuf;
@@ -611,6 +629,7 @@ static void vb2_cma_sg_unmap_dmabuf(void *mem_priv)
{
struct vb2_cma_sg_buf *buf = mem_priv;
struct sg_table *sgt = buf->dma_sgt;
struct iosys_map map = IOSYS_MAP_INIT_VADDR(buf->vaddr);
if (WARN_ON(!buf->db_attach)) {
pr_err("trying to unpin a not attached buffer\n");
@@ -623,7 +642,7 @@ static void vb2_cma_sg_unmap_dmabuf(void *mem_priv)
}
if (buf->vaddr) {
dma_buf_vunmap(buf->db_attach->dmabuf, buf->vaddr);
dma_buf_vunmap(buf->db_attach->dmabuf, &map);
buf->vaddr = NULL;
}
dma_buf_unmap_attachment(buf->db_attach, sgt, buf->dma_dir);
@@ -644,8 +663,8 @@ static void vb2_cma_sg_detach_dmabuf(void *mem_priv)
kfree(buf);
}
static void *vb2_cma_sg_attach_dmabuf(struct device *dev, struct dma_buf *dbuf,
unsigned long size, enum dma_data_direction dma_dir)
static void *vb2_cma_sg_attach_dmabuf(struct vb2_buffer *vb, struct device *dev,
struct dma_buf *dbuf, unsigned long size)
{
struct vb2_cma_sg_buf *buf;
struct dma_buf_attachment *dba;
@@ -669,14 +688,15 @@ static void *vb2_cma_sg_attach_dmabuf(struct device *dev, struct dma_buf *dbuf,
return dba;
}
buf->dma_dir = dma_dir;
buf->dma_dir = vb->vb2_queue->dma_dir;
buf->size = size;
buf->db_attach = dba;
buf->vb = vb;
return buf;
}
static void *vb2_cma_sg_cookie(void *buf_priv)
static void *vb2_cma_sg_cookie(struct vb2_buffer *vb, void *buf_priv)
{
struct vb2_cma_sg_buf *buf = buf_priv;
@@ -703,3 +723,4 @@ const struct vb2_mem_ops vb2_cma_sg_memops = {
EXPORT_SYMBOL_GPL(vb2_cma_sg_memops);
MODULE_LICENSE("GPL");
MODULE_IMPORT_NS(DMA_BUF);

13
drivers/thermal/rk_virtual_thermal.c
View File

@@ -19,6 +19,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/panic_notifier.h>
#include <linux/platform_device.h>
#include <linux/thermal.h>
#include <linux/timer.h>
@@ -708,18 +709,18 @@ static int estimate_temp_internal(void)
return temp;
}
static int virtual_thermal_set_trips(void *_sensor, int low, int high)
static int virtual_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
{
return 0;
}
static int virtual_thermal_get_temp(void *_sensor, int *out_temp)
static int virtual_thermal_get_temp(struct thermal_zone_device *tz, int *out_temp)
{
*out_temp = estimate_temp_internal();
return 0;
}
static const struct thermal_zone_of_device_ops virtual_of_thermal_ops = {
static const struct thermal_zone_device_ops virtual_of_thermal_ops = {
.get_temp = virtual_thermal_get_temp,
.set_trips = virtual_thermal_set_trips,
};
@@ -855,9 +856,9 @@ static int virtual_thermal_probe(struct platform_device *pdev)
dev_warn(&pdev->dev, "failed to get vpu's clock: %d\n", ret);
}
ctx->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, 0,
NULL,
&virtual_of_thermal_ops);
ctx->tzd = devm_thermal_of_zone_register(&pdev->dev, 0,
NULL,
&virtual_of_thermal_ops);
if (IS_ERR(ctx->tzd)) {
ret = PTR_ERR(ctx->tzd);
dev_err(&pdev->dev, "failed to register sensor 0: %d\n", ret);