| Message ID | 20250211104857.3501566-3-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm_i915_private to intel_display cleanup | expand |
On Tue, 11 Feb 2025, Suraj Kandpal <suraj.kandpal@intel.com> wrote: > Prefer using display->platform.xx instead of IS_PLATFORM() checks Could've been squashed to the previous patch? Ditto about the subject prefix as previous patch. Regardless, Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index d85924caa26e..991c1726f522 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -96,14 +96,14 @@ static int i915_sr_status(struct seq_file *m, void *unused) > /* no global SR status; inspect per-plane WM */; > else if (HAS_PCH_SPLIT(dev_priv)) > sr_enabled = intel_de_read(display, WM1_LP_ILK) & WM_LP_ENABLE; > - else if (IS_I965GM(dev_priv) || IS_G4X(dev_priv) || > - IS_I945G(dev_priv) || IS_I945GM(dev_priv)) > + else if (display->platform.i965gm || display->platform.g4x || > + display->platform.i945g || display->platform.i945gm) > sr_enabled = intel_de_read(display, FW_BLC_SELF) & FW_BLC_SELF_EN; > - else if (IS_I915GM(dev_priv)) > + else if (display->platform.i915gm) > sr_enabled = intel_de_read(display, INSTPM) & INSTPM_SELF_EN; > - else if (IS_PINEVIEW(dev_priv)) > + else if (display->platform.pineview) > sr_enabled = intel_de_read(display, DSPFW3(dev_priv)) & PINEVIEW_SELF_REFRESH_EN; > - else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > + else if (display->platform.valleyview || display->platform.cherryview) > sr_enabled = intel_de_read(display, FW_BLC_SELF_VLV) & FW_CSPWRDWNEN; > > intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index d85924caa26e..991c1726f522 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -96,14 +96,14 @@ static int i915_sr_status(struct seq_file *m, void *unused) /* no global SR status; inspect per-plane WM */; else if (HAS_PCH_SPLIT(dev_priv)) sr_enabled = intel_de_read(display, WM1_LP_ILK) & WM_LP_ENABLE; - else if (IS_I965GM(dev_priv) || IS_G4X(dev_priv) || - IS_I945G(dev_priv) || IS_I945GM(dev_priv)) + else if (display->platform.i965gm || display->platform.g4x || + display->platform.i945g || display->platform.i945gm) sr_enabled = intel_de_read(display, FW_BLC_SELF) & FW_BLC_SELF_EN; - else if (IS_I915GM(dev_priv)) + else if (display->platform.i915gm) sr_enabled = intel_de_read(display, INSTPM) & INSTPM_SELF_EN; - else if (IS_PINEVIEW(dev_priv)) + else if (display->platform.pineview) sr_enabled = intel_de_read(display, DSPFW3(dev_priv)) & PINEVIEW_SELF_REFRESH_EN; - else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) + else if (display->platform.valleyview || display->platform.cherryview) sr_enabled = intel_de_read(display, FW_BLC_SELF_VLV) & FW_CSPWRDWNEN; intel_display_power_put(display, POWER_DOMAIN_INIT, wakeref);
Prefer using display->platform.xx instead of IS_PLATFORM() checks Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> --- drivers/gpu/drm/i915/display/intel_display_debugfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)