github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/dg1: Update DMC_DEBUG3 register

Browse Source 
[ Upstream commit b60668cb4c ]

Current DMC_DEBUG3(_MMIO(0x101090)) address is for TGL,
it is wrong for DG1. Just like commit 5bcc95ca38
("drm/i915/dg1: Update DMC_DEBUG register"), correct
this issue for DG1 platform to avoid wrong register
being read.

BSpec: 49788

v2: fix "not wrong" typo. (Jani)

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Chuansheng Liu <chuansheng.liu@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220211002933.84240-1-chuansheng.liu@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuansheng Liu 2022-02-11 08:29:33 +08:00 committed by Greg Kroah-Hartman
parent dd02510fb4
commit a3a85c045a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/display/intel_display_debugfs.c
View File

@ -526,8 +526,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
* reg for DC3CO debugging and validation, * reg for DC3CO debugging and validation,
* but TGL DMC f/w is using DMC_DEBUG3 reg for DC3CO counter. * but TGL DMC f/w is using DMC_DEBUG3 reg for DC3CO counter.
*/ */
seq_printf(m, "DC3CO count: %d\n", seq_printf(m, "DC3CO count: %d\n", intel_de_read(dev_priv, IS_DGFX(dev_priv) ?
intel_de_read(dev_priv, DMC_DEBUG3)); DG1_DMC_DEBUG3 : TGL_DMC_DEBUG3));
} else { } else {
dc5_reg = IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT : dc5_reg = IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT :
SKL_CSR_DC3_DC5_COUNT; SKL_CSR_DC3_DC5_COUNT;

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

@ -7546,7 +7546,8 @@ enum {
#define TGL_DMC_DEBUG_DC5_COUNT _MMIO(0x101084) #define TGL_DMC_DEBUG_DC5_COUNT _MMIO(0x101084)
#define TGL_DMC_DEBUG_DC6_COUNT _MMIO(0x101088) #define TGL_DMC_DEBUG_DC6_COUNT _MMIO(0x101088)
#define DMC_DEBUG3 _MMIO(0x101090) #define TGL_DMC_DEBUG3 _MMIO(0x101090)
#define DG1_DMC_DEBUG3 _MMIO(0x13415c)
/* Display Internal Timeout Register */ /* Display Internal Timeout Register */
#define RM_TIMEOUT _MMIO(0x42060) #define RM_TIMEOUT _MMIO(0x42060)