drm/i915/dram: prefer display abstractions for VLV sideband

Use the display wrappers for VLV sideband in dram code.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/c971f1a1eccceeb5599ccea5909443afe24b20d3.1774957233.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dram.c b/drivers/gpu/drm/i915/display/intel_dram.c
index bd281d4b4c05c98eb870be5d6300b8337642f314..1686f808a0847a37214a74eed1046459b79e5243 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dram.c
+++ b/drivers/gpu/drm/i915/display/intel_dram.c
@@ -16,7 +16,7 @@
 #include "intel_mchbar_regs.h"
 #include "intel_parent.h"
 #include "intel_uncore.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 struct dram_dimm_info {
        u16 size;
@@ -109,9 +109,9 @@ static unsigned int chv_mem_freq(struct intel_display *display)
 {
        u32 val;
 
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_CCK));
-       val = vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_CCK, CCK_FUSE_REG);
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_CCK));
+       vlv_cck_get(display);
+       val = vlv_cck_read(display, CCK_FUSE_REG);
+       vlv_cck_put(display);
 
        switch ((val >> 2) & 0x7) {
        case 3:
@@ -125,9 +125,9 @@ static unsigned int vlv_mem_freq(struct intel_display *display)
 {
        u32 val;
 
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_PUNIT));
-       val = vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_PUNIT, PUNIT_REG_GPU_FREQ_STS);
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_PUNIT));
+       vlv_punit_get(display);
+       val = vlv_punit_read(display, PUNIT_REG_GPU_FREQ_STS);
+       vlv_punit_put(display);
 
        switch ((val >> 6) & 3) {
        case 0: