summaryrefslogtreecommitdiffstats
path: root/sys-kernel/boest-v5.0.15/raspberrypi/0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sys-kernel/boest-v5.0.15/raspberrypi/0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch')
-rw-r--r--sys-kernel/boest-v5.0.15/raspberrypi/0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/sys-kernel/boest-v5.0.15/raspberrypi/0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch b/sys-kernel/boest-v5.0.15/raspberrypi/0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch
new file mode 100644
index 00000000..6d20b56c
--- /dev/null
+++ b/sys-kernel/boest-v5.0.15/raspberrypi/0114-vc4_fkms-Apply-firmware-overscan-offset-to-hardware-.patch
@@ -0,0 +1,59 @@
+From 19bfc1a1acbb45fc5fe1722c2e6121fa20091836 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 18 Apr 2017 21:43:46 +0100
+Subject: [PATCH 114/194] vc4_fkms: Apply firmware overscan offset to hardware
+ cursor
+
+---
+ drivers/gpu/drm/vc4/vc4_firmware_kms.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
+index e3dfc20c404c..7edb38953a6a 100644
+--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
+@@ -42,6 +42,7 @@ struct vc4_crtc {
+ void __iomem *regs;
+
+ struct drm_pending_vblank_event *event;
++ u32 overscan[4];
+ };
+
+ static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc)
+@@ -191,6 +192,7 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane,
+ struct drm_plane_state *old_state)
+ {
+ struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
++ struct vc4_crtc *vc4_crtc = to_vc4_crtc(plane->crtc);
+ struct drm_plane_state *state = plane->state;
+ struct drm_framebuffer *fb = state->fb;
+ struct drm_gem_cma_object *bo = drm_fb_cma_get_gem_obj(fb, 0);
+@@ -216,6 +218,12 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane,
+ bo->paddr + fb->offsets[0],
+ fb->pitches[0]);
+
++ /* add on the top/left offsets when overscan is active */
++ if (vc4_crtc) {
++ packet_state[1] += vc4_crtc->overscan[0];
++ packet_state[2] += vc4_crtc->overscan[1];
++ }
++
+ ret = rpi_firmware_property(vc4->firmware,
+ RPI_FIRMWARE_SET_CURSOR_STATE,
+ &packet_state,
+@@ -695,6 +703,15 @@ static int vc4_fkms_bind(struct device *dev, struct device *master, void *data)
+ if (ret)
+ goto err_destroy_connector;
+
++ ret = rpi_firmware_property(vc4->firmware,
++ RPI_FIRMWARE_FRAMEBUFFER_GET_OVERSCAN,
++ &vc4_crtc->overscan,
++ sizeof(vc4_crtc->overscan));
++ if (ret) {
++ DRM_ERROR("Failed to get overscan state: 0x%08x\n", vc4_crtc->overscan[0]);
++ memset(&vc4_crtc->overscan, 0, sizeof(vc4_crtc->overscan));
++ }
++
+ platform_set_drvdata(pdev, vc4_crtc);
+
+ return 0;