bcm27xx: switch to kernel v6.1
[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.15 / 950-0899-drm-vc4-bo-Rename-vc4_dumb_create.patch
1 From a2cfbcef760e546c930c37fa36e3415bbc0cad31 Mon Sep 17 00:00:00 2001
2 From: Maxime Ripard <maxime@cerno.tech>
3 Date: Fri, 18 Mar 2022 09:46:35 +0100
4 Subject: [PATCH] drm/vc4: bo: Rename vc4_dumb_create
5
6 We're going to add a new variant of the dumb BO allocation function, so
7 let's rename vc4_dumb_create() to something a bit more specific.
8
9 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
10 ---
11 drivers/gpu/drm/vc4/vc4_bo.c | 6 +++---
12 drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
13 drivers/gpu/drm/vc4/vc4_drv.h | 6 +++---
14 3 files changed, 7 insertions(+), 7 deletions(-)
15
16 --- a/drivers/gpu/drm/vc4/vc4_bo.c
17 +++ b/drivers/gpu/drm/vc4/vc4_bo.c
18 @@ -473,9 +473,9 @@ struct vc4_bo *vc4_bo_create(struct drm_
19 return bo;
20 }
21
22 -int vc4_dumb_create(struct drm_file *file_priv,
23 - struct drm_device *dev,
24 - struct drm_mode_create_dumb *args)
25 +int vc4_bo_dumb_create(struct drm_file *file_priv,
26 + struct drm_device *dev,
27 + struct drm_mode_create_dumb *args)
28 {
29 int min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
30 struct vc4_bo *bo = NULL;
31 --- a/drivers/gpu/drm/vc4/vc4_drv.c
32 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
33 @@ -177,7 +177,7 @@ static struct drm_driver vc4_drm_driver
34
35 .gem_create_object = vc4_create_object,
36
37 - DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(vc4_dumb_create),
38 + DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(vc4_bo_dumb_create),
39
40 .ioctls = vc4_drm_ioctls,
41 .num_ioctls = ARRAY_SIZE(vc4_drm_ioctls),
42 --- a/drivers/gpu/drm/vc4/vc4_drv.h
43 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
44 @@ -846,9 +846,9 @@ struct vc4_validated_shader_info {
45 struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size);
46 struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t size,
47 bool from_cache, enum vc4_kernel_bo_type type);
48 -int vc4_dumb_create(struct drm_file *file_priv,
49 - struct drm_device *dev,
50 - struct drm_mode_create_dumb *args);
51 +int vc4_bo_dumb_create(struct drm_file *file_priv,
52 + struct drm_device *dev,
53 + struct drm_mode_create_dumb *args);
54 int vc4_create_bo_ioctl(struct drm_device *dev, void *data,
55 struct drm_file *file_priv);
56 int vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data,