]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915/dsb: Fix in mmio offset calculation of DSB instance
authorAnimesh Manna <animesh.manna@intel.com>
Thu, 5 Dec 2019 12:35:13 +0000 (18:05 +0530)
committerJani Nikula <jani.nikula@intel.com>
Wed, 11 Dec 2019 10:13:47 +0000 (12:13 +0200)
As the current usage is restricted to first DSB instance per pipe, so
existing code could not catch the issue to calculate the mmio offset
of different DSB instance per pipe. Corrected the offset calculation.

Fixes: a6e58d9a2e04 ("drm/i915/dsb: Check DSB engine status.")
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191205123513.22603-1-animesh.manna@intel.com
drivers/gpu/drm/i915/i915_reg.h

index 082190c2dc48d14d3adaea8320f05516650c3fc6..17f9dd3bda7248480d771405753e85adcf3c2e0d 100644 (file)
@@ -12084,7 +12084,7 @@ enum skl_power_gate {
 /* This register controls the Display State Buffer (DSB) engines. */
 #define _DSBSL_INSTANCE_BASE           0x70B00
 #define DSBSL_INSTANCE(pipe, id)       (_DSBSL_INSTANCE_BASE + \
-                                        (pipe) * 0x1000 + (id) * 100)
+                                        (pipe) * 0x1000 + (id) * 0x100)
 #define DSB_HEAD(pipe, id)             _MMIO(DSBSL_INSTANCE(pipe, id) + 0x0)
 #define DSB_TAIL(pipe, id)             _MMIO(DSBSL_INSTANCE(pipe, id) + 0x4)
 #define DSB_CTRL(pipe, id)             _MMIO(DSBSL_INSTANCE(pipe, id) + 0x8)