AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-23 21:29:39 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: Add Pipe D cursor ctrl register for Gen12

Browse Source 
Currently the offset for PIPE D cursor control register is missing in
i915_reg.h due to which the cursor plane cannot be enabled for Pipe D.
This also causes kernel Warning, when a user requests to enable cursor
plane for PIPE D for Gen 12 platforms.

This patch adds the CURSOR_CTL_D register in the i915_reg.h.

v2: Rebase

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111640
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
[Lucas: remove extra blank line]
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1569310312-12313-1-git-send-email-ankit.k.nautiyal@intel.com
This commit is contained in:
Ankit Nautiyal 2019-09-24 13:01:52 +05:30 committed by Lucas De Marchi
parent 7dc56af526
commit 6ea3cee6d7
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/i915_pci.c
View File

@ -118,6 +118,14 @@
[PIPE_C] = IVB_CURSOR_C_OFFSET, \ [PIPE_C] = IVB_CURSOR_C_OFFSET, \
} }
#define TGL_CURSOR_OFFSETS \
.cursor_offsets = { \
[PIPE_A] = CURSOR_A_OFFSET, \
[PIPE_B] = IVB_CURSOR_B_OFFSET, \
[PIPE_C] = IVB_CURSOR_C_OFFSET, \
[PIPE_D] = TGL_CURSOR_D_OFFSET, \
}
#define I9XX_COLORS \ #define I9XX_COLORS \
.color = { .gamma_lut_size = 256 } .color = { .gamma_lut_size = 256 }
#define I965_COLORS \ #define I965_COLORS \
@ -787,6 +795,7 @@ static const struct intel_device_info intel_elkhartlake_info = {
[TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \
[TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \
}, \ }, \
TGL_CURSOR_OFFSETS, \
.has_global_mocs = 1, \ .has_global_mocs = 1, \
.display.has_dsb = 1 .display.has_dsb = 1

1
drivers/gpu/drm/i915/i915_reg.h
View File

@ -6240,6 +6240,7 @@ enum {
#define CHV_CURSOR_C_OFFSET 0x700e0 #define CHV_CURSOR_C_OFFSET 0x700e0
#define IVB_CURSOR_B_OFFSET 0x71080 #define IVB_CURSOR_B_OFFSET 0x71080
#define IVB_CURSOR_C_OFFSET 0x72080 #define IVB_CURSOR_C_OFFSET 0x72080
#define TGL_CURSOR_D_OFFSET 0x73080
/* Display A control */ /* Display A control */
#define _DSPACNTR 0x70180 #define _DSPACNTR 0x70180