summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/display/skl_watermark.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2022-09-12 14:45:15 +0300
committerJani Nikula <jani.nikula@intel.com>2022-09-13 19:55:08 +0300
commit70296670f672e470a5b42f72468a9fe631264070 (patch)
tree420a899833974a578a12f9461d06dbd7f016aff6 /drivers/gpu/drm/i915/display/skl_watermark.c
parent62a21a7c6a1cb7030eab8d64427d93b97cdeedec (diff)
downloadlinux-70296670f672e470a5b42f72468a9fe631264070.tar.gz
linux-70296670f672e470a5b42f72468a9fe631264070.tar.bz2
linux-70296670f672e470a5b42f72468a9fe631264070.zip
drm/i915/display: move IPC under display wm sub-struct
Move display IPC related member under drm_i915_private display sub-struct. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/04ccaaceee9293e5a6c75761ba9d36792c36f095.1662983005.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/skl_watermark.c')
-rw-r--r--drivers/gpu/drm/i915/display/skl_watermark.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index c67497b5908f..09249a42a53f 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -3122,7 +3122,7 @@ void intel_wm_state_verify(struct intel_crtc *crtc,
bool skl_watermark_ipc_enabled(struct drm_i915_private *i915)
{
- return i915->ipc_enabled;
+ return i915->display.wm.ipc_enabled;
}
void skl_watermark_ipc_update(struct drm_i915_private *i915)
@@ -3162,7 +3162,7 @@ void skl_watermark_ipc_init(struct drm_i915_private *i915)
if (!HAS_IPC(i915))
return;
- i915->ipc_enabled = skl_watermark_ipc_can_enable(i915);
+ i915->display.wm.ipc_enabled = skl_watermark_ipc_can_enable(i915);
skl_watermark_ipc_update(i915);
}
@@ -3506,7 +3506,7 @@ static ssize_t skl_watermark_ipc_status_write(struct file *file,
if (!skl_watermark_ipc_enabled(i915) && enable)
drm_info(&i915->drm,
"Enabling IPC: WM will be proper only after next commit\n");
- i915->ipc_enabled = enable;
+ i915->display.wm.ipc_enabled = enable;
skl_watermark_ipc_update(i915);
}