1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From e7ecdf293b07f35f23684badcab6afa58928257a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Apr 2017 21:43:46 +0100
Subject: [PATCH 114/454] vc4_fkms: Apply firmware overscan offset to hardware
cursor
---
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
@@ -39,6 +39,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)
@@ -180,6 +181,7 @@ static void vc4_cursor_plane_atomic_upda
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);
@@ -200,6 +202,12 @@ static void vc4_cursor_plane_atomic_upda
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,
@@ -641,6 +649,15 @@ static int vc4_fkms_bind(struct device *
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;
|
