| Message ID | 20190131173600.GN25147@e110455-lin.cambridge.arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL] malidp-next | expand |
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c index 9edfd6ab0c12..f1c9e3fefa86 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c @@ -45,7 +45,7 @@ static int komeda_pipeline_obj_add(struct komeda_kms_dev *kms, return -ENOMEM; st->pipe = pipe; - drm_atomic_private_obj_init(&pipe->obj, &st->obj, + drm_atomic_private_obj_init(&kms->base, &pipe->obj, &st->obj, &komeda_pipeline_obj_funcs); return 0;
Hi DRM maintainers, This pull includes the new Arm "komeda" DRM driver. It is currently hosted in the same repo as the other "mali-dp" driver because it is the next iteration of the IP. Please note that due to changes in the DRM framework, after merging the tree you will need to apply the following patch to resolve the build failure caused by commit b962a12050a3 ("drm/atomic: integrate modeset lock with private objects") --8<--------------------------------------------------------- From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 15 Jan 2019 10:42:04 +1100 Subject: [PATCH] drm/komeda: merge fix for drm_atomic_private_obj_init() API change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Liviu Dudau <liviu.dudau@arm.com> --- drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 --8<--------------------------------------------------------- Thanks, Liviu The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c: Linux 5.0-rc1 (2019-01-06 17:08:20 -0800) are available in the Git repository at: git://linux-arm.org/linux-ld.git for-upstream/mali-dp for you to fetch changes up to dcc9d76b6d834d06a317e27fa8242d7e009135ac: drm/komeda: Off by one in komeda_fb_get_pixel_addr() (2019-01-30 13:46:17 +0000) ---------------------------------------------------------------- Brian Starkey (1): drm/afbc: Add AFBC modifier usage documentation Dan Carpenter (1): drm/komeda: Off by one in komeda_fb_get_pixel_addr() Liviu Dudau (1): drm: arm/komeda: Remove IRQ parsing from initial series james qian wang (Arm Technology China) (10): drm/arm: Delete redundant CONFIG_DRM_ARM drm/komeda: komeda_dev/pipeline/component definition and initialzation dt/bindings: drm/komeda: Add DT bindings for ARM display processor D71 drm/komeda: Build komeda to be a platform module drm/komeda: Add DT parsing drm/komeda: Add komeda_format_caps for format handling drm/komeda: Add komeda_framebuffer drm/komeda: Attach komeda_dev to DRM-KMS drm/doc: Add initial komeda driver documentation MAINTAINERS: Add maintainer for Arm komeda driver .../devicetree/bindings/display/arm,komeda.txt | 73 +++ Documentation/gpu/afbc.rst | 235 ++++++++++ Documentation/gpu/drivers.rst | 2 + Documentation/gpu/komeda-kms.rst | 488 +++++++++++++++++++++ MAINTAINERS | 15 +- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/arm/Kconfig | 12 +- drivers/gpu/drm/arm/Makefile | 1 + drivers/gpu/drm/arm/display/Kbuild | 3 + drivers/gpu/drm/arm/display/Kconfig | 14 + drivers/gpu/drm/arm/display/include/malidp_io.h | 42 ++ .../gpu/drm/arm/display/include/malidp_product.h | 23 + drivers/gpu/drm/arm/display/include/malidp_utils.h | 16 + drivers/gpu/drm/arm/display/komeda/Makefile | 21 + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 111 +++++ drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 106 +++++ drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 186 ++++++++ drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 110 +++++ drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 144 ++++++ .../drm/arm/display/komeda/komeda_format_caps.c | 75 ++++ .../drm/arm/display/komeda/komeda_format_caps.h | 89 ++++ .../drm/arm/display/komeda/komeda_framebuffer.c | 165 +++++++ .../drm/arm/display/komeda/komeda_framebuffer.h | 34 ++ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 167 +++++++ drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 113 +++++ .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 200 +++++++++ .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 359 +++++++++++++++ drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 109 +++++ .../drm/arm/display/komeda/komeda_private_obj.c | 88 ++++ include/uapi/drm/drm_fourcc.h | 3 + 30 files changed, 2998 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/arm,komeda.txt create mode 100644 Documentation/gpu/afbc.rst create mode 100644 Documentation/gpu/komeda-kms.rst create mode 100644 drivers/gpu/drm/arm/display/Kbuild create mode 100644 drivers/gpu/drm/arm/display/Kconfig create mode 100644 drivers/gpu/drm/arm/display/include/malidp_io.h create mode 100644 drivers/gpu/drm/arm/display/include/malidp_product.h create mode 100644 drivers/gpu/drm/arm/display/include/malidp_utils.h create mode 100644 drivers/gpu/drm/arm/display/komeda/Makefile create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_drv.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_plane.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c