blob: 0a5804235972a81ce299db43bc3e3cdd8ddbeef6 (
plain)
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
|
From 44029293d12f538a95824ecdd40b8c228933bebc Mon Sep 17 00:00:00 2001
From: Vitaly Prosyak <vitaly.prosyak@amd.com>
Date: Thu, 24 Mar 2016 11:18:12 -0400
Subject: [PATCH 0992/1110] drm/amd/dal: fix cursor width and height in
interface
Cursor size in interface should be equal to the requested values
Do adjustment in dce's specific code.
Signed-off-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++--
drivers/gpu/drm/amd/dal/dc/dce110/dce110_ipp_cursor.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
index 010705d..9f02d3e 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
@@ -82,8 +82,8 @@ static void dm_set_cursor(
attributes.address.high_part = upper_32_bits(gpu_addr);
attributes.address.low_part = lower_32_bits(gpu_addr);
- attributes.width = width-1;
- attributes.height = height-1;
+ attributes.width = width;
+ attributes.height = height;
attributes.x_hot = 0;
attributes.y_hot = 0;
attributes.color_format = CURSOR_MODE_COLOR_PRE_MULTIPLIED_ALPHA;
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_ipp_cursor.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_ipp_cursor.c
index 2dabaed..95f6ca3 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_ipp_cursor.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_ipp_cursor.c
@@ -117,7 +117,7 @@ bool dce110_ipp_cursor_set_attributes(
* Program cursor size -- NOTE: HW spec specifies that HW register
* stores size as (height - 1, width - 1)
*/
- program_size(ipp110, attributes->width, attributes->height);
+ program_size(ipp110, attributes->width-1, attributes->height-1);
/* Program cursor surface address */
program_address(ipp110, attributes->address);
--
2.7.4
|
