diff options
author | Imre Deak <imre.deak@intel.com> | 2020-02-26 21:34:45 +0100 |
---|---|---|
committer | Imre Deak <imre.deak@intel.com> | 2020-03-02 18:36:21 +0100 |
commit | 353ad959a0bc6d702218f9d77ff47bf80e3c2075 (patch) | |
tree | d6b80a9c0cc7c60004377c359c5fe799f93b7f4a /drivers/gpu/drm/i915/i915_drv.h | |
parent | drm/i915: Move DPLL HW readout/sanitize fns to intel_dpll_mgr.c (diff) | |
download | linux-353ad959a0bc6d702218f9d77ff47bf80e3c2075.tar.xz linux-353ad959a0bc6d702218f9d77ff47bf80e3c2075.zip |
drm/i915: Keep the global DPLL state in a DPLL specific struct
For clarity add a new DPLL specific struct to the i915 device struct and
move all DPLL fields into it. Accordingly remove the dpll_ prefixes, as
the new struct already provides the required namespacing.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226203455.23032-4-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 1f5dda38e7b4..43a47b7deaa0 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1017,17 +1017,19 @@ struct drm_i915_private { struct intel_crtc *plane_to_crtc_mapping[I915_MAX_PIPES]; struct intel_crtc *pipe_to_crtc_mapping[I915_MAX_PIPES]; - /* dpll and cdclk state is protected by connection_mutex */ - int num_shared_dpll; - struct intel_shared_dpll shared_dplls[I915_NUM_PLLS]; - const struct intel_dpll_mgr *dpll_mgr; - - /* - * dpll_lock serializes intel_{prepare,enable,disable}_shared_dpll. - * Must be global rather than per dpll, because on some platforms - * plls share registers. + /** + * dpll and cdclk state is protected by connection_mutex + * dpll.lock serializes intel_{prepare,enable,disable}_shared_dpll. + * Must be global rather than per dpll, because on some platforms plls + * share registers. */ - struct mutex dpll_lock; + struct { + struct mutex lock; + + int num_shared_dpll; + struct intel_shared_dpll shared_dplls[I915_NUM_PLLS]; + const struct intel_dpll_mgr *mgr; + } dpll; struct list_head global_obj_list; |