drm/i915: move hpll and czclk caching under display

Perhaps not the ideal place, but better than having to have the fields
in both struct drm_i915_private and struct xe_device.

v2: Rebase

Reviewed-by: Michał Grzelak <michal.grzelak@intel.com> # v1
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/cbca9b13f2235a624a21bf7617ffe763e25c848c.1757688216.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b49661b4e95968d4fc1b6fb66007201bf63f877c..02f50d0f370a1d26ffe61d31203fbaaf12836755 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -144,22 +144,22 @@ static void bdw_set_pipe_misc(struct intel_dsb *dsb,
 /* returns HPLL frequency in kHz */
 int vlv_clock_get_hpll_vco(struct drm_device *drm)
 {
-       struct drm_i915_private *i915 = to_i915(drm);
+       struct intel_display *display = to_intel_display(drm);
        int hpll_freq, vco_freq[] = { 800, 1600, 2000, 2400 };
 
-       if (!i915->hpll_freq) {
+       if (!display->vlv_clock.hpll_freq) {
                vlv_cck_get(drm);
                /* Obtain SKU information */
                hpll_freq = vlv_cck_read(drm, CCK_FUSE_REG) &
                        CCK_FUSE_HPLL_FREQ_MASK;
                vlv_cck_put(drm);
 
-               i915->hpll_freq = vco_freq[hpll_freq] * 1000;
+               display->vlv_clock.hpll_freq = vco_freq[hpll_freq] * 1000;
 
-               drm_dbg_kms(drm, "HPLL frequency: %d kHz\n", i915->hpll_freq);
+               drm_dbg_kms(drm, "HPLL frequency: %d kHz\n", display->vlv_clock.hpll_freq);
        }
 
-       return i915->hpll_freq;
+       return display->vlv_clock.hpll_freq;
 }
 
 static int vlv_get_cck_clock(struct drm_device *drm,
@@ -190,15 +190,15 @@ int vlv_clock_get_hrawclk(struct drm_device *drm)
 
 int vlv_clock_get_czclk(struct drm_device *drm)
 {
-       struct drm_i915_private *i915 = to_i915(drm);
+       struct intel_display *display = to_intel_display(drm);
 
-       if (!i915->czclk_freq) {
-               i915->czclk_freq = vlv_get_cck_clock(drm, "czclk", CCK_CZ_CLOCK_CONTROL,
-                                                    vlv_clock_get_hpll_vco(drm));
-               drm_dbg_kms(drm, "CZ clock rate: %d kHz\n", i915->czclk_freq);
+       if (!display->vlv_clock.czclk_freq) {
+               display->vlv_clock.czclk_freq = vlv_get_cck_clock(drm, "czclk", CCK_CZ_CLOCK_CONTROL,
+                                                                 vlv_clock_get_hpll_vco(drm));
+               drm_dbg_kms(drm, "CZ clock rate: %d kHz\n", display->vlv_clock.czclk_freq);
        }
 
-       return i915->czclk_freq;
+       return display->vlv_clock.czclk_freq;
 }
 
 int vlv_clock_get_cdclk(struct drm_device *drm)

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 8c226406c5cd0a47bd5cd9ddf668e0825103c06f..791021a4e3bb040f3d9df65df23410bc82c68bdc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -567,6 +567,11 @@ struct intel_display {
                u32 bxt_phy_grc;
        } state;
 
+       struct {
+               unsigned int hpll_freq;
+               unsigned int czclk_freq;
+       } vlv_clock;
+
        struct {
                /* ordered wq for modesets */
                struct workqueue_struct *modeset;

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 6a768aad8edde2e03edcad3d73e9341e01adbf0c..37970d8db25550c5ca38ebfed56d667886ebdfba 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -239,9 +239,6 @@ struct drm_i915_private {
 
        bool preserve_bios_swizzle;
 
-       unsigned int hpll_freq;
-       unsigned int czclk_freq;
-
        /**
         * wq - Driver workqueue for GEM.
         *

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 092004d14db215f29a74b9a17c3a813258642854..4353256452aabe00ddbbe46ea67e6775ff2be747 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -617,12 +617,6 @@ struct xe_device {
        struct intel_uncore {
                spinlock_t lock;
        } uncore;
-
-       /* only to allow build, not used functionally */
-       struct {
-               unsigned int hpll_freq;
-               unsigned int czclk_freq;
-       };
 #endif
 };