diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2022-08-24 02:11:18 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2022-08-24 02:11:18 +0800 |
| commit | 4d1fa80167364aff810b1c2661968cdace99ae2d (patch) | |
| tree | 02c9a2a0e08ede0fd1b1d1a000a43e6bcea057c4 | |
| parent | d9f201ead47cb7b82178198e86e31ec09e5cad62 (diff) | |
| download | hikey-modules-4d1fa80167364aff810b1c2661968cdace99ae2d.tar.gz | |
patchsets: fix broken with drm_framebuffer
since it's removed from the drm_crtc.h with the following commit
Fixes: 720cf96d8fec ("drm: Drop drm_framebuffer.h from drm_crtc.h")
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: If1363797c734a4492e1388e11f1e5359bba5aeef
| -rw-r--r-- | patchsets/0001-kirin_drm_dpe.c-include-drm_framebuffer.h-explicitly.patch | 30 | ||||
| -rwxr-xr-x | patchsets/apply.sh | 2 |
2 files changed, 32 insertions, 0 deletions
diff --git a/patchsets/0001-kirin_drm_dpe.c-include-drm_framebuffer.h-explicitly.patch b/patchsets/0001-kirin_drm_dpe.c-include-drm_framebuffer.h-explicitly.patch new file mode 100644 index 0000000..1dff71d --- /dev/null +++ b/patchsets/0001-kirin_drm_dpe.c-include-drm_framebuffer.h-explicitly.patch @@ -0,0 +1,30 @@ +From f626a9e093100df69f19aaab1ba428a8a5b0bcbe Mon Sep 17 00:00:00 2001 +From: Yongqin Liu <yongqin.liu@linaro.org> +Date: Tue, 23 Aug 2022 11:43:23 +0800 +Subject: [PATCH 1/1] kirin_drm_dpe.c: include drm_framebuffer.h explicitly + +since it's removed from the drm_crtc.h with the following commit + +Fixes: 720cf96d8fec ("drm: Drop drm_framebuffer.h from drm_crtc.h") + +Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> +Change-Id: Id78d3da65a57910e013ba4e2ef17079c2c815525 +--- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_dpe.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_dpe.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_dpe.c +index 75d15c102cad..19d58860ada0 100644 +--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_dpe.c ++++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_dpe.c +@@ -33,6 +33,7 @@ + #include <drm/drm_atomic.h> + #include <drm/drm_atomic_helper.h> + #include <drm/drm_plane_helper.h> ++#include <drm/drm_framebuffer.h> + #include <drm/drm_gem_cma_helper.h> + #include <drm/drm_gem_framebuffer_helper.h> + #include <drm/drm_fb_cma_helper.h> +-- +2.25.1 + diff --git a/patchsets/apply.sh b/patchsets/apply.sh index e17ac78..afa8ece 100755 --- a/patchsets/apply.sh +++ b/patchsets/apply.sh @@ -69,6 +69,8 @@ git am "${dir_parent}/0016-drm-kirin_drm_dpe-Fix-rdma_stride-calculation.patch" ## hikey960: drm: Fix LDI not being enabled ## http://android-review.linaro.org/c/kernel/common/+/22733 git am "${dir_parent}/0017-hikey960-drm-Fix-LDI-not-being-enabled.patch" +## kirin_drm_dpe.c: include drm_framebuffer.h explicitly +git am "${dir_parent}/0001-kirin_drm_dpe.c-include-drm_framebuffer.h-explicitly.patch" ## HACK: adv7511: Add poweron delay to allow for EDID probing to work ## https://git.linaro.org/people/john.stultz/android-dev.git/commit/drivers/gpu/drm?h=dev/hikey960-mainline-WIP&id=20572af2f4123ffc8e0ab64db2b6029ce8f727bd |