drm/i915: add display sub-struct to drm_i915_private
Subsystems (4)
v2 cover drm/i915: add display sub-struct to drm_i915_private
v2 of https://patchwork.freedesktop.org/series/107170/
Mostly just rebases, commit message updates and some trivial checkpatch fixes, and dropping the clock gating function move patch.
BR,
Jani.
Jani Nikula (38):
drm/i915: add display sub-struct to drm_i915_private drm/i915: move cdclk_funcs to display.funcs
drm/i915: move dpll_funcs to display.funcs
drm/i915: move hotplug_funcs to display.funcs
drm/i915: move wm_disp funcs to display.funcs
drm/i915: move fdi_funcs to display.funcs
drm/i915: move color_funcs to display.funcs
drm/i915: move and group gmbus members under display.gmbus drm/i915: move and group pps members under display.pps drm/i915: move dmc to display.dmc
drm/i915: move and split audio under display.audio and display.funcs drm/i915: move dpll under display.dpll
drm/i915: move and group fbdev under display.fbdev drm/i915: move wm to display.wm
drm/i915: move and group hdcp under display.hdcp drm/i915: move hotplug to display.hotplug
drm/i915: move overlay to display.overlay
drm/i915: move and group sagv under display.sagv drm/i915: move and group max_bw and bw_obj under display.bw drm/i915: move opregion to display.opregion
drm/i915: move and group cdclk under display.cdclk drm/i915: move backlight to display.backlight
drm/i915: move mipi_mmio_base to display.dsi
drm/i915: move vbt to display.vbt
drm/i915: move fbc to display.fbc
drm/i915/vrr: drop window2_delay member from i915 drm/i915: move and group power related members under display.power drm/i915: move and group fdi members under display.fdi drm/i915: move fb_tracking under display sub-struct drm/i915: move INTEL_FRONTBUFFER_* macros to intel_frontbuffer.h drm/i915: move dbuf under display sub-struct
drm/i915: move and group modeset_wq and flip_wq under display.wq drm/i915: split gem quirks from display quirks drm/i915/quirks: abstract checking for display quirks drm/i915/quirks: abstract quirks further by making quirk ids an enum drm/i915: move quirks under display sub-struct
drm/i915: move atomic_helper under display sub-struct drm/i915: move and group properties under display.properties
drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- drivers/gpu/drm/i915/display/hsw_ips.c | 2 +- drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- drivers/gpu/drm/i915/display/icl_dsi.c | 12 +- drivers/gpu/drm/i915/display/intel_atomic.c | 8 +- drivers/gpu/drm/i915/display/intel_audio.c | 102 ++--- .../gpu/drm/i915/display/intel_backlight.c | 41 +- drivers/gpu/drm/i915/display/intel_bios.c | 216 ++++----- drivers/gpu/drm/i915/display/intel_bw.c | 52 +-- drivers/gpu/drm/i915/display/intel_cdclk.c | 282 ++++++------ drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +- drivers/gpu/drm/i915/display/intel_color.c | 34 +- .../gpu/drm/i915/display/intel_connector.c | 8 +- drivers/gpu/drm/i915/display/intel_crt.c | 8 +- drivers/gpu/drm/i915/display/intel_ddi.c | 33 +- drivers/gpu/drm/i915/display/intel_display.c | 124 +++--- .../gpu/drm/i915/display/intel_display_core.h | 416 ++++++++++++++++++ .../drm/i915/display/intel_display_debugfs.c | 60 +-- .../drm/i915/display/intel_display_power.c | 140 +++--- .../i915/display/intel_display_power_map.c | 4 +- .../i915/display/intel_display_power_well.c | 78 ++-- .../i915/display/intel_display_power_well.h | 12 +- drivers/gpu/drm/i915/display/intel_dmc.c | 52 +-- drivers/gpu/drm/i915/display/intel_dp.c | 10 +- drivers/gpu/drm/i915/display/intel_dp_aux.c | 4 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll.c | 38 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 130 +++--- drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_fbc.c | 6 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 26 +- drivers/gpu/drm/i915/display/intel_fdi.c | 18 +- .../gpu/drm/i915/display/intel_frontbuffer.c | 56 +-- .../gpu/drm/i915/display/intel_frontbuffer.h | 18 + drivers/gpu/drm/i915/display/intel_gmbus.c | 46 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 134 +++--- drivers/gpu/drm/i915/display/intel_hotplug.c | 116 ++--- .../gpu/drm/i915/display/intel_lpe_audio.c | 42 +- drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- .../drm/i915/display/intel_modeset_setup.c | 14 +- drivers/gpu/drm/i915/display/intel_opregion.c | 42 +- drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 5 +- .../gpu/drm/i915/display/intel_pch_refclk.c | 4 +- .../drm/i915/display/intel_plane_initial.c | 2 +- drivers/gpu/drm/i915/display/intel_pps.c | 51 +-- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- drivers/gpu/drm/i915/display/intel_quirks.c | 22 +- drivers/gpu/drm/i915/display/intel_quirks.h | 14 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 18 +- drivers/gpu/drm/i915/display/intel_tc.c | 4 +- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 8 +- drivers/gpu/drm/i915/display/intel_vrr.c | 14 +- .../drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 4 +- drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 188 ++++---- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 +- .../i915/gem/selftests/i915_gem_client_blt.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 4 +- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +- drivers/gpu/drm/i915/gvt/handlers.c | 4 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 16 +- drivers/gpu/drm/i915/i915_drv.h | 407 +---------------- drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/i915/i915_getparam.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 78 ++-- drivers/gpu/drm/i915/i915_reg.h | 16 +- drivers/gpu/drm/i915/intel_pm.c | 260 +++++------ drivers/gpu/drm/i915/intel_pm.h | 4 +- 72 files changed, 1824 insertions(+), 1741 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_core.h
Signature · 1 line
2.34.1
PATCH v2 3/38 drm/i915: move dpll_funcs to display.funcs
Move display dpll functions under drm_i915_private display sub-struct.
--- .../gpu/drm/i915/display/intel_display_core.h | 4 ++++ drivers/gpu/drm/i915/display/intel_dpll.c | 24 +++++++++---------- drivers/gpu/drm/i915/i915_drv.h | 4 ---- 3 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +4 -0
@@ -12,6 +12,7 @@ struct intel_atomic_state;struct intel_cdclk_funcs ;struct intel_crtc ;struct intel_crtc_state ; +struct intel_dpll_funcs ;struct intel_initial_plane_config ;struct intel_display_funcs {
@@ -38,6 +39,9 @@ struct intel_display {/* Display CDCLK functions */ const struct intel_cdclk_funcs *cdclk; + +/* Display pll funcs */ +const struct intel_dpll_funcs *dpll; } funcs; };
drivers/gpu/drm/i915/display/intel_dpll.c +12 -12
@@ -1420,7 +1420,7 @@ int intel_dpll_crtc_compute_clock(struct intel_atomic_state *state,if (!crtc_state->hw.enable)return 0 ; - ret = i915->dpll_funcs->crtc_compute_clock (state, crtc); + ret = i915->display.funcs.dpll->crtc_compute_clock (state, crtc);if (ret) {drm_dbg_kms (&i915->drm,"[CRTC:%d:%s] Couldn't calculate DPLL settings\n" , crtc->base.base.id, crtc->base.name);
@@ -1446,10 +1446,10 @@ int intel_dpll_crtc_get_shared_dpll(struct intel_atomic_state *state,if (!crtc_state->hw.enable)return 0 ; -if (!i915->dpll_funcs->crtc_get_shared_dpll) +if (!i915->display.funcs.dpll->crtc_get_shared_dpll)return 0 ; - ret = i915->dpll_funcs->crtc_get_shared_dpll (state, crtc); + ret = i915->display.funcs.dpll->crtc_get_shared_dpll (state, crtc);if (ret) {drm_dbg_kms (&i915->drm,"[CRTC:%d:%s] Couldn't get a shared DPLL\n" , crtc->base.base.id, crtc->base.name);
@@ -1463,23 +1463,23 @@ void intel_dpll_init_clock_hook(struct drm_i915_private *dev_priv) {if (IS_DG2 (dev_priv)) - dev_priv->dpll_funcs = &dg2_dpll_funcs; + dev_priv->display.funcs.dpll = &dg2_dpll_funcs;else if (DISPLAY_VER (dev_priv) >=9 ||HAS_DDI (dev_priv)) - dev_priv->dpll_funcs = &hsw_dpll_funcs; + dev_priv->display.funcs.dpll = &hsw_dpll_funcs;else if (HAS_PCH_SPLIT (dev_priv)) - dev_priv->dpll_funcs = &ilk_dpll_funcs; + dev_priv->display.funcs.dpll = &ilk_dpll_funcs;else if (IS_CHERRYVIEW (dev_priv)) - dev_priv->dpll_funcs = &chv_dpll_funcs; + dev_priv->display.funcs.dpll = &chv_dpll_funcs;else if (IS_VALLEYVIEW (dev_priv)) - dev_priv->dpll_funcs = &vlv_dpll_funcs; + dev_priv->display.funcs.dpll = &vlv_dpll_funcs;else if (IS_G4X (dev_priv)) - dev_priv->dpll_funcs = &g4x_dpll_funcs; + dev_priv->display.funcs.dpll = &g4x_dpll_funcs;else if (IS_PINEVIEW (dev_priv)) - dev_priv->dpll_funcs = &pnv_dpll_funcs; + dev_priv->display.funcs.dpll = &pnv_dpll_funcs;else if (DISPLAY_VER (dev_priv) !=2 ) - dev_priv->dpll_funcs = &i9xx_dpll_funcs; + dev_priv->display.funcs.dpll = &i9xx_dpll_funcs;else - dev_priv->dpll_funcs = &i8xx_dpll_funcs; + dev_priv->display.funcs.dpll = &i8xx_dpll_funcs; }static bool i9xx_has_pps (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -90,7 +90,6 @@ struct intel_color_funcs;struct intel_connector ;struct intel_crtc ;struct intel_dp ; -struct intel_dpll_funcs ;struct intel_encoder ;struct intel_fbdev ;struct intel_fdi_funcs ;
@@ -516,9 +515,6 @@ struct drm_i915_private {/* fdi display functions */ const struct intel_fdi_funcs *fdi_funcs; -/* display pll funcs */ -const struct intel_dpll_funcs *dpll_funcs; -/* Display internal color functions */ const struct intel_color_funcs *color_funcs;
Signature · 1 line
2.34.1
PATCH v2 5/38 drm/i915: move wm_disp funcs to display.funcs
In reply to Jani NikulaMove display watermark functions under drm_i915_private display sub-struct.
Rename struct drm_i915_wm_disp_funcs to intel_wm_funcs while at it.
--- drivers/gpu/drm/i915/display/intel_display.c | 34 +++++++-------- .../gpu/drm/i915/display/intel_display_core.h | 21 ++++++++++ drivers/gpu/drm/i915/i915_drv.h | 22 ---------- drivers/gpu/drm/i915/intel_pm.c | 42 +++++++++---------- 4 files changed, 59 insertions(+), 60 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +17 -17
@@ -163,16 +163,16 @@ static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state);*/ void intel_update_watermarks (struct drm_i915_private *dev_priv) { -if (dev_priv->wm_disp->update_wm) - dev_priv->wm_disp->update_wm (dev_priv); +if (dev_priv->display.funcs.wm->update_wm) + dev_priv->display.funcs.wm->update_wm (dev_priv); }static int intel_compute_pipe_wm (struct intel_atomic_state *state,struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->wm_disp->compute_pipe_wm) -return dev_priv->wm_disp->compute_pipe_wm (state, crtc); +if (dev_priv->display.funcs.wm->compute_pipe_wm) +return dev_priv->display.funcs.wm->compute_pipe_wm (state, crtc);return 0 ; }
@@ -180,20 +180,20 @@ static int intel_compute_intermediate_wm(struct intel_atomic_state *state, struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (!dev_priv->wm_disp->compute_intermediate_wm) +if (!dev_priv->display.funcs.wm->compute_intermediate_wm)return 0 ;if (drm_WARN_ON (&dev_priv->drm, - !dev_priv->wm_disp->compute_pipe_wm)) + !dev_priv->display.funcs.wm->compute_pipe_wm))return 0 ; -return dev_priv->wm_disp->compute_intermediate_wm (state, crtc); +return dev_priv->display.funcs.wm->compute_intermediate_wm (state, crtc); }static bool intel_initial_watermarks (struct intel_atomic_state *state,struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->wm_disp->initial_watermarks) { - dev_priv->wm_disp->initial_watermarks (state, crtc); +if (dev_priv->display.funcs.wm->initial_watermarks) { + dev_priv->display.funcs.wm->initial_watermarks (state, crtc);return true; }return false;
@@ -203,23 +203,23 @@ static void intel_atomic_update_watermarks(struct intel_atomic_state *state, struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->wm_disp->atomic_update_watermarks) - dev_priv->wm_disp->atomic_update_watermarks (state, crtc); +if (dev_priv->display.funcs.wm->atomic_update_watermarks) + dev_priv->display.funcs.wm->atomic_update_watermarks (state, crtc); }static void intel_optimize_watermarks (struct intel_atomic_state *state,struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->wm_disp->optimize_watermarks) - dev_priv->wm_disp->optimize_watermarks (state, crtc); +if (dev_priv->display.funcs.wm->optimize_watermarks) + dev_priv->display.funcs.wm->optimize_watermarks (state, crtc); }static int intel_compute_global_watermarks (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -if (dev_priv->wm_disp->compute_global_watermarks) -return dev_priv->wm_disp->compute_global_watermarks (state); +if (dev_priv->display.funcs.wm->compute_global_watermarks) +return dev_priv->display.funcs.wm->compute_global_watermarks (state);return 0 ; }
@@ -2399,7 +2399,7 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state,if (DISPLAY_VER (dev_priv) !=2 )intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false); -if (!dev_priv->wm_disp->initial_watermarks) +if (!dev_priv->display.funcs.wm->initial_watermarks)intel_update_watermarks (dev_priv);/* clock the pipe down to 640x480@60 to potentially save power */
@@ -8454,7 +8454,7 @@ static void sanitize_watermarks(struct drm_i915_private *dev_priv)int i;/* Only supported on platforms that use atomic watermark design */ -if (!dev_priv->wm_disp->optimize_watermarks) +if (!dev_priv->display.funcs.wm->optimize_watermarks)return ; state =drm_atomic_state_alloc (&dev_priv->drm);
drivers/gpu/drm/i915/display/intel_display_core.h +21 -0
@@ -8,6 +8,7 @@#include <linux/types.h> +struct drm_i915_private ;struct intel_atomic_state ;struct intel_cdclk_funcs ;struct intel_crtc ;
@@ -32,6 +33,23 @@ struct intel_display_funcs {void (*commit_modeset_enables)(struct intel_atomic_state *state); }; +/* functions used for watermark calcs for display. */ +struct intel_wm_funcs { +/* update_wm is for legacy wm management */ +void (*update_wm)(struct drm_i915_private *dev_priv); +int (*compute_pipe_wm)(struct intel_atomic_state *state, +struct intel_crtc *crtc); +int (*compute_intermediate_wm)(struct intel_atomic_state *state, +struct intel_crtc *crtc); +void (*initial_watermarks)(struct intel_atomic_state *state, +struct intel_crtc *crtc); +void (*atomic_update_watermarks)(struct intel_atomic_state *state, +struct intel_crtc *crtc); +void (*optimize_watermarks)(struct intel_atomic_state *state, +struct intel_crtc *crtc); +int (*compute_global_watermarks)(struct intel_atomic_state *state); +}; + struct intel_display { /* Display functions */ struct {
@@ -46,6 +64,9 @@ struct intel_display {/* irq display functions */ const struct intel_hotplug_funcs *hotplug; + +/* pm display functions */ +const struct intel_wm_funcs *wm; } funcs; };
drivers/gpu/drm/i915/i915_drv.h +0 -22
@@ -81,14 +81,12 @@ struct dpll;struct drm_i915_clock_gating_funcs ;struct drm_i915_gem_object ;struct drm_i915_private ; -struct intel_atomic_state ;struct intel_audio_funcs ;struct intel_cdclk_config ;struct intel_cdclk_state ;struct intel_cdclk_vals ;struct intel_color_funcs ;struct intel_connector ; -struct intel_crtc ;struct intel_dp ;struct intel_encoder ;struct intel_fbdev ;
@@ -157,23 +155,6 @@ struct sdvo_device_mapping {u8 ddc_pin; }; -/* functions used for watermark calcs for display. */ -struct drm_i915_wm_disp_funcs { -/* update_wm is for legacy wm management */ -void (*update_wm)(struct drm_i915_private *dev_priv); -int (*compute_pipe_wm)(struct intel_atomic_state *state, -struct intel_crtc *crtc); -int (*compute_intermediate_wm)(struct intel_atomic_state *state, -struct intel_crtc *crtc); -void (*initial_watermarks)(struct intel_atomic_state *state, -struct intel_crtc *crtc); -void (*atomic_update_watermarks)(struct intel_atomic_state *state, -struct intel_crtc *crtc); -void (*optimize_watermarks)(struct intel_atomic_state *state, -struct intel_crtc *crtc); -int (*compute_global_watermarks)(struct intel_atomic_state *state); -}; -#define I915_COLOR_UNEVICTABLE (-1)/* a non-vma sharing the address space */ #define QUIRK_LVDS_SSC_DISABLE (1<<1)
@@ -505,9 +486,6 @@ struct drm_i915_private {/* pm private clock gating functions */ const struct drm_i915_clock_gating_funcs *clock_gating_funcs; -/* pm display functions */ -const struct drm_i915_wm_disp_funcs *wm_disp; -/* fdi display functions */ const struct intel_fdi_funcs *fdi_funcs;
drivers/gpu/drm/i915/intel_pm.c +21 -21
117 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 1/38 drm/i915: add display sub-struct to drm_i915_private
In reply to Jani NikulaIn another long-overdue cleanup, add a display sub-struct to drm_i915_private, and start moving display related members there. Start with display funcs that need a rename anyway to not collide with the new display member.
Add a new header under display/ for defining struct intel_display.
Rename struct drm_i915_display_funcs to intel_display_funcs while at it.
v2:
- Fix multi-line comment style (Arun)
- Use display as the member name
--- drivers/gpu/drm/i915/display/intel_display.c | 28 ++++++------- .../gpu/drm/i915/display/intel_display_core.h | 40 +++++++++++++++++++ .../drm/i915/display/intel_modeset_setup.c | 2 +- .../drm/i915/display/intel_plane_initial.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 21 ++-------- 5 files changed, 59 insertions(+), 34 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_core.h
drivers/gpu/drm/i915/display/intel_display.c +14 -14
@@ -4143,7 +4143,7 @@ bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state)struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev); -if (!i915->display->get_pipe_config (crtc, crtc_state)) +if (!i915->display.funcs.display->get_pipe_config (crtc, crtc_state))return false; crtc_state->hw.active = true;
@@ -7118,7 +7118,7 @@ static void intel_enable_crtc(struct intel_atomic_state *state,intel_crtc_update_active_timings (new_crtc_state); - dev_priv->display->crtc_enable (state, crtc); + dev_priv->display.funcs.display->crtc_enable (state, crtc);if (intel_crtc_is_bigjoiner_slave (new_crtc_state))return ;
@@ -7197,7 +7197,7 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,*/ intel_crtc_disable_pipe_crc (crtc); - dev_priv->display->crtc_disable (state, crtc); + dev_priv->display.funcs.display->crtc_disable (state, crtc); crtc->active = false;intel_fbc_disable (crtc);intel_disable_shared_dpll (old_crtc_state);
@@ -7586,7 +7586,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) }/* Now enable the clocks, plane, pipe, and connectors that we set up. */ - dev_priv->display->commit_modeset_enables (state); + dev_priv->display.funcs.display->commit_modeset_enables (state);intel_encoders_update_complete (state);
@@ -8317,7 +8317,7 @@ static const struct drm_mode_config_funcs intel_mode_funcs = { .atomic_state_free = intel_atomic_state_free, }; -static const struct drm_i915_display_funcs skl_display_funcs = { +static const struct intel_display_funcs skl_display_funcs = { .get_pipe_config = hsw_get_pipe_config, .crtc_enable = hsw_crtc_enable, .crtc_disable = hsw_crtc_disable,
@@ -8325,7 +8325,7 @@ static const struct drm_i915_display_funcs skl_display_funcs = { .get_initial_plane_config = skl_get_initial_plane_config, }; -static const struct drm_i915_display_funcs ddi_display_funcs = { +static const struct intel_display_funcs ddi_display_funcs = { .get_pipe_config = hsw_get_pipe_config, .crtc_enable = hsw_crtc_enable, .crtc_disable = hsw_crtc_disable,
@@ -8333,7 +8333,7 @@ static const struct drm_i915_display_funcs ddi_display_funcs = { .get_initial_plane_config = i9xx_get_initial_plane_config, }; -static const struct drm_i915_display_funcs pch_split_display_funcs = { +static const struct intel_display_funcs pch_split_display_funcs = { .get_pipe_config = ilk_get_pipe_config, .crtc_enable = ilk_crtc_enable, .crtc_disable = ilk_crtc_disable,
@@ -8341,7 +8341,7 @@ static const struct drm_i915_display_funcs pch_split_display_funcs = { .get_initial_plane_config = i9xx_get_initial_plane_config, }; -static const struct drm_i915_display_funcs vlv_display_funcs = { +static const struct intel_display_funcs vlv_display_funcs = { .get_pipe_config = i9xx_get_pipe_config, .crtc_enable = valleyview_crtc_enable, .crtc_disable = i9xx_crtc_disable,
@@ -8349,7 +8349,7 @@ static const struct drm_i915_display_funcs vlv_display_funcs = { .get_initial_plane_config = i9xx_get_initial_plane_config, }; -static const struct drm_i915_display_funcs i9xx_display_funcs = { +static const struct intel_display_funcs i9xx_display_funcs = { .get_pipe_config = i9xx_get_pipe_config, .crtc_enable = i9xx_crtc_enable, .crtc_disable = i9xx_crtc_disable,
@@ -8372,16 +8372,16 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv)intel_dpll_init_clock_hook (dev_priv);if (DISPLAY_VER (dev_priv) >=9 ) { - dev_priv->display = &skl_display_funcs; + dev_priv->display.funcs.display = &skl_display_funcs; }else if (HAS_DDI (dev_priv)) { - dev_priv->display = &ddi_display_funcs; + dev_priv->display.funcs.display = &ddi_display_funcs; }else if (HAS_PCH_SPLIT (dev_priv)) { - dev_priv->display = &pch_split_display_funcs; + dev_priv->display.funcs.display = &pch_split_display_funcs; }else if (IS_CHERRYVIEW (dev_priv) ||IS_VALLEYVIEW (dev_priv)) { - dev_priv->display = &vlv_display_funcs; + dev_priv->display.funcs.display = &vlv_display_funcs; }else { - dev_priv->display = &i9xx_display_funcs; + dev_priv->display.funcs.display = &i9xx_display_funcs; }intel_fdi_init_hook (dev_priv);
drivers/gpu/drm/i915/display/intel_display_core.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2022 Intel Corporation +*/ + +#ifndef __INTEL_DISPLAY_CORE_H__ +#define __INTEL_DISPLAY_CORE_H__ + +#include <linux/types.h> + +struct intel_atomic_state ; +struct intel_crtc ; +struct intel_crtc_state ; +struct intel_initial_plane_config ; + +struct intel_display_funcs { +/* +* Returns the active state of the crtc, and if the crtc is active, +* fills out the pipe-config with the hw state. +*/ +bool (*get_pipe_config)(struct intel_crtc *, +struct intel_crtc_state *); +void (*get_initial_plane_config)(struct intel_crtc *, +struct intel_initial_plane_config *); +void (*crtc_enable)(struct intel_atomic_state *state, +struct intel_crtc *crtc); +void (*crtc_disable)(struct intel_atomic_state *state, +struct intel_crtc *crtc); +void (*commit_modeset_enables)(struct intel_atomic_state *state); +}; + +struct intel_display { +/* Display functions */ +struct { +/* Top level crtc-ish functions */ +const struct intel_display_funcs *display; + } funcs; +}; + +#endif /* __INTEL_DISPLAY_CORE_H__ */
drivers/gpu/drm/i915/display/intel_modeset_setup.c +1 -1
@@ -70,7 +70,7 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,drm_WARN_ON (&i915->drm,IS_ERR (temp_crtc_state) || ret); - i915->display->crtc_disable (to_intel_atomic_state (state), crtc); + i915->display.funcs.display->crtc_disable (to_intel_atomic_state (state), crtc);drm_atomic_state_put (state);
drivers/gpu/drm/i915/display/intel_plane_initial.c +1 -1
@@ -311,7 +311,7 @@ void intel_crtc_initial_plane_config(struct intel_crtc *crtc)* can even allow for smooth boot transitions if the BIOS * fb is large enough for the active pipe configuration. */ - dev_priv->display->get_initial_plane_config (crtc, &plane_config); + dev_priv->display.funcs.display->get_initial_plane_config (crtc, &plane_config);/* * If the fb is shared between multiple heads, we'll
drivers/gpu/drm/i915/i915_drv.h +3 -18
@@ -39,6 +39,7 @@#include "display/intel_cdclk.h" #include "display/intel_display.h" +#include "display/intel_display_core.h" #include "display/intel_display_power.h" #include "display/intel_dmc.h" #include "display/intel_dpll_mgr.h"
@@ -96,7 +97,6 @@ struct intel_fbdev;struct intel_fdi_funcs ;struct intel_gmbus ;struct intel_hotplug_funcs ; -struct intel_initial_plane_config ;struct intel_limit ;struct intel_overlay ;struct intel_overlay_error_state ;
@@ -177,20 +177,6 @@ struct drm_i915_wm_disp_funcs {int (*compute_global_watermarks)(struct intel_atomic_state *state); }; -struct drm_i915_display_funcs { -/* Returns the active state of the crtc, and if the crtc is active, -* fills out the pipe-config with the hw state. */ -bool (*get_pipe_config)(struct intel_crtc *, -struct intel_crtc_state *); -void (*get_initial_plane_config)(struct intel_crtc *, -struct intel_initial_plane_config *); -void (*crtc_enable)(struct intel_atomic_state *state, -struct intel_crtc *crtc); -void (*crtc_disable)(struct intel_atomic_state *state, -struct intel_crtc *crtc); -void (*commit_modeset_enables)(struct intel_atomic_state *state); -}; -#define I915_COLOR_UNEVICTABLE (-1)/* a non-vma sharing the address space */ #define QUIRK_LVDS_SSC_DISABLE (1<<1)
@@ -374,6 +360,8 @@ struct intel_audio_private {struct drm_i915_private {struct drm_device drm; +struct intel_display display; +/* FIXME: Device release actions should all be moved to drmm_ */ bool do_release;
@@ -532,9 +520,6 @@ struct drm_i915_private {/* display pll funcs */ const struct intel_dpll_funcs *dpll_funcs; -/* Display functions */ -const struct drm_i915_display_funcs *display; -/* Display internal color functions */ const struct intel_color_funcs *color_funcs;
Signature · 1 line
2.34.1
PATCH v2 4/38 drm/i915: move hotplug_funcs to display.funcs
In reply to Jani NikulaMove display hotplug functions under drm_i915_private display sub-struct.
--- .../gpu/drm/i915/display/intel_display_core.h | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 ---- drivers/gpu/drm/i915/i915_irq.c | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +4 -0
@@ -13,6 +13,7 @@ struct intel_cdclk_funcs;struct intel_crtc ;struct intel_crtc_state ;struct intel_dpll_funcs ; +struct intel_hotplug_funcs ;struct intel_initial_plane_config ;struct intel_display_funcs {
@@ -42,6 +43,9 @@ struct intel_display {/* Display pll funcs */ const struct intel_dpll_funcs *dpll; + +/* irq display functions */ +const struct intel_hotplug_funcs *hotplug; } funcs; };
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -94,7 +94,6 @@ struct intel_encoder;struct intel_fbdev ;struct intel_fdi_funcs ;struct intel_gmbus ; -struct intel_hotplug_funcs ;struct intel_limit ;struct intel_overlay ;struct intel_overlay_error_state ;
@@ -509,9 +508,6 @@ struct drm_i915_private {/* pm display functions */ const struct drm_i915_wm_disp_funcs *wm_disp; -/* irq display functions */ -const struct intel_hotplug_funcs *hotplug_funcs; -/* fdi display functions */ const struct intel_fdi_funcs *fdi_funcs;
drivers/gpu/drm/i915/i915_irq.c +10 -10
@@ -4370,8 +4370,8 @@ HPD_FUNCS(ilk);void intel_hpd_irq_setup (struct drm_i915_private *i915) { -if (i915->display_irqs_enabled && i915->hotplug_funcs) - i915->hotplug_funcs->hpd_irq_setup (i915); +if (i915->display_irqs_enabled && i915->display.funcs.hotplug) + i915->display.funcs.hotplug->hpd_irq_setup (i915); }/**
@@ -4424,22 +4424,22 @@ void intel_irq_init(struct drm_i915_private *dev_priv)if (HAS_GMCH (dev_priv)) {if (I915_HAS_HOTPLUG (dev_priv)) - dev_priv->hotplug_funcs = &i915_hpd_funcs; + dev_priv->display.funcs.hotplug = &i915_hpd_funcs; }else {if (HAS_PCH_DG2 (dev_priv)) - dev_priv->hotplug_funcs = &icp_hpd_funcs; + dev_priv->display.funcs.hotplug = &icp_hpd_funcs;else if (HAS_PCH_DG1 (dev_priv)) - dev_priv->hotplug_funcs = &dg1_hpd_funcs; + dev_priv->display.funcs.hotplug = &dg1_hpd_funcs;else if (DISPLAY_VER (dev_priv) >=11 ) - dev_priv->hotplug_funcs = &gen11_hpd_funcs; + dev_priv->display.funcs.hotplug = &gen11_hpd_funcs;else if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) - dev_priv->hotplug_funcs = &bxt_hpd_funcs; + dev_priv->display.funcs.hotplug = &bxt_hpd_funcs;else if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP ) - dev_priv->hotplug_funcs = &icp_hpd_funcs; + dev_priv->display.funcs.hotplug = &icp_hpd_funcs;else if (INTEL_PCH_TYPE (dev_priv) >=PCH_SPT ) - dev_priv->hotplug_funcs = &spt_hpd_funcs; + dev_priv->display.funcs.hotplug = &spt_hpd_funcs;else - dev_priv->hotplug_funcs = &ilk_hpd_funcs; + dev_priv->display.funcs.hotplug = &ilk_hpd_funcs; } }
Signature · 1 line
2.34.1
PATCH v2 9/38 drm/i915: move and group pps members under display.pps
In reply to Jani NikulaMove display PPS related members under drm_i915_private display sub-struct.
--- .../gpu/drm/i915/display/intel_display_core.h | 7 +++ drivers/gpu/drm/i915/display/intel_pps.c | 48 +++++++++---------- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 5 -- drivers/gpu/drm/i915/i915_reg.h | 2 +- 5 files changed, 33 insertions(+), 31 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +7 -0
@@ -99,6 +99,13 @@ struct intel_display { wait_queue_head_t wait_queue; } gmbus; + +struct { +u32 mmio_base; + +/* protects panel power sequencer state */ +struct mutex mutex; + } pps; };#endif /* __INTEL_DISPLAY_CORE_H__ */
drivers/gpu/drm/i915/display/intel_pps.c +24 -24
182 lines not on this page · raw message
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -337,7 +337,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)mutex_init (&dev_priv->audio.mutex);mutex_init (&dev_priv->wm.wm_mutex); -mutex_init (&dev_priv->pps_mutex); +mutex_init (&dev_priv->display.pps.mutex);mutex_init (&dev_priv->hdcp_comp_mutex);i915_memcpy_init_early (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +0 -5
@@ -384,8 +384,6 @@ struct drm_i915_private {/* MMIO base address for MIPI regs */ u32 mipi_mmio_base; -u32 pps_mmio_base; -struct pci_dev *bridge_dev;struct rb_root uabi_engines;
@@ -422,9 +420,6 @@ struct drm_i915_private {/* backlight registers and fields in struct intel_panel */ struct mutex backlight_lock; -/* protects panel power sequencer state */ -struct mutex pps_mutex; -unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_preferred_vco_freq;unsigned int max_cdclk_freq;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2829,7 +2829,7 @@#define VLV_PPS_BASE (VLV_DISPLAY_BASE + PPS_BASE)#define PCH_PPS_BASE 0xC7200 -#define _MMIO_PPS (pps_idx, reg) _MMIO(dev_priv->pps_mmio_base - \ +#define _MMIO_PPS (pps_idx, reg) _MMIO(dev_priv->display.pps.mmio_base - \ PPS_BASE + (reg) + \ (pps_idx) * 0x100)
Signature · 1 line
2.34.1
PATCH v2 7/38 drm/i915: move color_funcs to display.funcs
In reply to Jani NikulaMove display color functions under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_color.c | 34 +++++++++---------- .../gpu/drm/i915/display/intel_display_core.h | 4 +++ drivers/gpu/drm/i915/i915_drv.h | 4 --- 3 files changed, 21 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_color.c +17 -17
@@ -1167,22 +1167,22 @@ void intel_color_load_luts(const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); - dev_priv->color_funcs->load_luts (crtc_state); + dev_priv->display.funcs.color->load_luts (crtc_state); }void intel_color_commit_noarm (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -if (dev_priv->color_funcs->color_commit_noarm) - dev_priv->color_funcs->color_commit_noarm (crtc_state); +if (dev_priv->display.funcs.color->color_commit_noarm) + dev_priv->display.funcs.color->color_commit_noarm (crtc_state); }void intel_color_commit_arm (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); - dev_priv->color_funcs->color_commit_arm (crtc_state); + dev_priv->display.funcs.color->color_commit_arm (crtc_state); }static bool intel_can_preload_luts (const struct intel_crtc_state *new_crtc_state)
@@ -1238,15 +1238,15 @@ int intel_color_check(struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -return dev_priv->color_funcs->color_check (crtc_state); +return dev_priv->display.funcs.color->color_check (crtc_state); }void intel_color_get_config (struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -if (dev_priv->color_funcs->read_luts) - dev_priv->color_funcs->read_luts (crtc_state); +if (dev_priv->display.funcs.color->read_luts) + dev_priv->display.funcs.color->read_luts (crtc_state); } static bool need_plane_update(struct intel_plane *plane,
@@ -2225,28 +2225,28 @@ void intel_color_init(struct intel_crtc *crtc)if (HAS_GMCH (dev_priv)) {if (IS_CHERRYVIEW (dev_priv)) { - dev_priv->color_funcs = &chv_color_funcs; + dev_priv->display.funcs.color = &chv_color_funcs; }else if (DISPLAY_VER (dev_priv) >=4 ) { - dev_priv->color_funcs = &i965_color_funcs; + dev_priv->display.funcs.color = &i965_color_funcs; }else { - dev_priv->color_funcs = &i9xx_color_funcs; + dev_priv->display.funcs.color = &i9xx_color_funcs; } }else {if (DISPLAY_VER (dev_priv) >=11 ) - dev_priv->color_funcs = &icl_color_funcs; + dev_priv->display.funcs.color = &icl_color_funcs;else if (DISPLAY_VER (dev_priv) ==10 ) - dev_priv->color_funcs = &glk_color_funcs; + dev_priv->display.funcs.color = &glk_color_funcs;else if (DISPLAY_VER (dev_priv) ==9 ) - dev_priv->color_funcs = &skl_color_funcs; + dev_priv->display.funcs.color = &skl_color_funcs;else if (DISPLAY_VER (dev_priv) ==8 ) - dev_priv->color_funcs = &bdw_color_funcs; + dev_priv->display.funcs.color = &bdw_color_funcs;else if (DISPLAY_VER (dev_priv) ==7 ) {if (IS_HASWELL (dev_priv)) - dev_priv->color_funcs = &hsw_color_funcs; + dev_priv->display.funcs.color = &hsw_color_funcs;else - dev_priv->color_funcs = &ivb_color_funcs; + dev_priv->display.funcs.color = &ivb_color_funcs; }else - dev_priv->color_funcs = &ilk_color_funcs; + dev_priv->display.funcs.color = &ilk_color_funcs; } drm_crtc_enable_color_mgmt(&crtc->base,
drivers/gpu/drm/i915/display/intel_display_core.h +4 -0
@@ -11,6 +11,7 @@struct drm_i915_private ;struct intel_atomic_state ;struct intel_cdclk_funcs ; +struct intel_color_funcs ;struct intel_crtc ;struct intel_crtc_state ;struct intel_dpll_funcs ;
@@ -71,6 +72,9 @@ struct intel_display {/* fdi display functions */ const struct intel_fdi_funcs *fdi; + +/* Display internal color functions */ +const struct intel_color_funcs *color; } funcs; };
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -85,7 +85,6 @@ struct intel_audio_funcs;struct intel_cdclk_config ;struct intel_cdclk_state ;struct intel_cdclk_vals ; -struct intel_color_funcs ;struct intel_connector ;struct intel_dp ;struct intel_encoder ;
@@ -485,9 +484,6 @@ struct drm_i915_private {/* pm private clock gating functions */ const struct drm_i915_clock_gating_funcs *clock_gating_funcs; -/* Display internal color functions */ -const struct intel_color_funcs *color_funcs; -/* PCH chipset type */ enum intel_pch pch_type;unsigned short pch_id;
Signature · 1 line
2.34.1
PATCH v2 6/38 drm/i915: move fdi_funcs to display.funcs
In reply to Jani NikulaMove display fdi functions under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_display_core.h | 4 ++++ drivers/gpu/drm/i915/display/intel_fdi.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 4 ---- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +4 -0
@@ -14,6 +14,7 @@ struct intel_cdclk_funcs;struct intel_crtc ;struct intel_crtc_state ;struct intel_dpll_funcs ; +struct intel_fdi_funcs ;struct intel_hotplug_funcs ;struct intel_initial_plane_config ;
@@ -67,6 +68,9 @@ struct intel_display {/* pm display functions */ const struct intel_wm_funcs *wm; + +/* fdi display functions */ +const struct intel_fdi_funcs *fdi; } funcs; };
drivers/gpu/drm/i915/display/intel_fdi.c +4 -4
@@ -113,7 +113,7 @@ void intel_fdi_link_train(struct intel_crtc *crtc, {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); - dev_priv->fdi_funcs->fdi_link_train (crtc, crtc_state); + dev_priv->display.funcs.fdi->fdi_link_train (crtc, crtc_state); }/* units of 100MHz */
@@ -1066,11 +1066,11 @@ void intel_fdi_init_hook(struct drm_i915_private *dev_priv) {if (IS_IRONLAKE (dev_priv)) { - dev_priv->fdi_funcs = &ilk_funcs; + dev_priv->display.funcs.fdi = &ilk_funcs; }else if (IS_SANDYBRIDGE (dev_priv)) { - dev_priv->fdi_funcs = &gen6_funcs; + dev_priv->display.funcs.fdi = &gen6_funcs; }else if (IS_IVYBRIDGE (dev_priv)) {/* FIXME: detect B0+ stepping and use auto training */ - dev_priv->fdi_funcs = &ivb_funcs; + dev_priv->display.funcs.fdi = &ivb_funcs; } }
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -90,7 +90,6 @@ struct intel_connector;struct intel_dp ;struct intel_encoder ;struct intel_fbdev ; -struct intel_fdi_funcs ;struct intel_gmbus ;struct intel_limit ;struct intel_overlay ;
@@ -486,9 +485,6 @@ struct drm_i915_private {/* pm private clock gating functions */ const struct drm_i915_clock_gating_funcs *clock_gating_funcs; -/* fdi display functions */ -const struct intel_fdi_funcs *fdi_funcs; -/* Display internal color functions */ const struct intel_color_funcs *color_funcs;
Signature · 1 line
2.34.1
PATCH v2 2/38 drm/i915: move cdclk_funcs to display.funcs
In reply to Jani NikulaMove display cdclk functions under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 70 +++++++++---------- .../gpu/drm/i915/display/intel_display_core.h | 4 ++ drivers/gpu/drm/i915/i915_drv.h | 4 -- 3 files changed, 39 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +35 -35
@@ -79,26 +79,26 @@ struct intel_cdclk_funcs {void intel_cdclk_get_cdclk (struct drm_i915_private *dev_priv,struct intel_cdclk_config *cdclk_config) { - dev_priv->cdclk_funcs->get_cdclk (dev_priv, cdclk_config); + dev_priv->display.funcs.cdclk->get_cdclk (dev_priv, cdclk_config); }static void intel_cdclk_set_cdclk (struct drm_i915_private *dev_priv,const struct intel_cdclk_config *cdclk_config,enum pipe pipe) { - dev_priv->cdclk_funcs->set_cdclk (dev_priv, cdclk_config, pipe); + dev_priv->display.funcs.cdclk->set_cdclk (dev_priv, cdclk_config, pipe); }static int intel_cdclk_modeset_calc_cdclk (struct drm_i915_private *dev_priv,struct intel_cdclk_state *cdclk_config) { -return dev_priv->cdclk_funcs->modeset_calc_cdclk (cdclk_config); +return dev_priv->display.funcs.cdclk->modeset_calc_cdclk (cdclk_config); }static u8 intel_cdclk_calc_voltage_level (struct drm_i915_private *dev_priv,int cdclk) { -return dev_priv->cdclk_funcs->calc_voltage_level (cdclk); +return dev_priv->display.funcs.cdclk->calc_voltage_level (cdclk); } static void fixed_133mhz_get_cdclk(struct drm_i915_private *dev_priv,
@@ -2080,7 +2080,7 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,if (!intel_cdclk_changed (&dev_priv->cdclk.hw, cdclk_config))return ; -if (drm_WARN_ON_ONCE (&dev_priv->drm, !dev_priv->cdclk_funcs->set_cdclk)) +if (drm_WARN_ON_ONCE (&dev_priv->drm, !dev_priv->display.funcs.cdclk->set_cdclk))return ;intel_cdclk_dump_config (dev_priv, cdclk_config,"Changing CDCLK to" );
@@ -3187,78 +3187,78 @@ static const struct intel_cdclk_funcs i830_cdclk_funcs = {void intel_init_cdclk_hooks (struct drm_i915_private *dev_priv) {if (IS_DG2 (dev_priv)) { - dev_priv->cdclk_funcs = &tgl_cdclk_funcs; + dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; dev_priv->cdclk.table = dg2_cdclk_table; }else if (IS_ALDERLAKE_P (dev_priv)) { - dev_priv->cdclk_funcs = &tgl_cdclk_funcs; + dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;/* Wa_22011320316:adl-p[a0] */ if (IS_ADLP_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) dev_priv->cdclk.table = adlp_a_step_cdclk_table;else dev_priv->cdclk.table = adlp_cdclk_table; }else if (IS_ROCKETLAKE (dev_priv)) { - dev_priv->cdclk_funcs = &tgl_cdclk_funcs; + dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; dev_priv->cdclk.table = rkl_cdclk_table; }else if (DISPLAY_VER (dev_priv) >=12 ) { - dev_priv->cdclk_funcs = &tgl_cdclk_funcs; + dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; dev_priv->cdclk.table = icl_cdclk_table; }else if (IS_JSL_EHL (dev_priv)) { - dev_priv->cdclk_funcs = &ehl_cdclk_funcs; + dev_priv->display.funcs.cdclk = &ehl_cdclk_funcs; dev_priv->cdclk.table = icl_cdclk_table; }else if (DISPLAY_VER (dev_priv) >=11 ) { - dev_priv->cdclk_funcs = &icl_cdclk_funcs; + dev_priv->display.funcs.cdclk = &icl_cdclk_funcs; dev_priv->cdclk.table = icl_cdclk_table; }else if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) { - dev_priv->cdclk_funcs = &bxt_cdclk_funcs; + dev_priv->display.funcs.cdclk = &bxt_cdclk_funcs;if (IS_GEMINILAKE (dev_priv)) dev_priv->cdclk.table = glk_cdclk_table;else dev_priv->cdclk.table = bxt_cdclk_table; }else if (DISPLAY_VER (dev_priv) ==9 ) { - dev_priv->cdclk_funcs = &skl_cdclk_funcs; + dev_priv->display.funcs.cdclk = &skl_cdclk_funcs; }else if (IS_BROADWELL (dev_priv)) { - dev_priv->cdclk_funcs = &bdw_cdclk_funcs; + dev_priv->display.funcs.cdclk = &bdw_cdclk_funcs; }else if (IS_HASWELL (dev_priv)) { - dev_priv->cdclk_funcs = &hsw_cdclk_funcs; + dev_priv->display.funcs.cdclk = &hsw_cdclk_funcs; }else if (IS_CHERRYVIEW (dev_priv)) { - dev_priv->cdclk_funcs = &chv_cdclk_funcs; + dev_priv->display.funcs.cdclk = &chv_cdclk_funcs; }else if (IS_VALLEYVIEW (dev_priv)) { - dev_priv->cdclk_funcs = &vlv_cdclk_funcs; + dev_priv->display.funcs.cdclk = &vlv_cdclk_funcs; }else if (IS_SANDYBRIDGE (dev_priv) ||IS_IVYBRIDGE (dev_priv)) { - dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs; + dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs; }else if (IS_IRONLAKE (dev_priv)) { - dev_priv->cdclk_funcs = &ilk_cdclk_funcs; + dev_priv->display.funcs.cdclk = &ilk_cdclk_funcs; }else if (IS_GM45 (dev_priv)) { - dev_priv->cdclk_funcs = &gm45_cdclk_funcs; + dev_priv->display.funcs.cdclk = &gm45_cdclk_funcs; }else if (IS_G45 (dev_priv)) { - dev_priv->cdclk_funcs = &g33_cdclk_funcs; + dev_priv->display.funcs.cdclk = &g33_cdclk_funcs; }else if (IS_I965GM (dev_priv)) { - dev_priv->cdclk_funcs = &i965gm_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i965gm_cdclk_funcs; }else if (IS_I965G (dev_priv)) { - dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs; + dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs; }else if (IS_PINEVIEW (dev_priv)) { - dev_priv->cdclk_funcs = &pnv_cdclk_funcs; + dev_priv->display.funcs.cdclk = &pnv_cdclk_funcs; }else if (IS_G33 (dev_priv)) { - dev_priv->cdclk_funcs = &g33_cdclk_funcs; + dev_priv->display.funcs.cdclk = &g33_cdclk_funcs; }else if (IS_I945GM (dev_priv)) { - dev_priv->cdclk_funcs = &i945gm_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i945gm_cdclk_funcs; }else if (IS_I945G (dev_priv)) { - dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs; + dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs; }else if (IS_I915GM (dev_priv)) { - dev_priv->cdclk_funcs = &i915gm_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i915gm_cdclk_funcs; }else if (IS_I915G (dev_priv)) { - dev_priv->cdclk_funcs = &i915g_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i915g_cdclk_funcs; }else if (IS_I865G (dev_priv)) { - dev_priv->cdclk_funcs = &i865g_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i865g_cdclk_funcs; }else if (IS_I85X (dev_priv)) { - dev_priv->cdclk_funcs = &i85x_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i85x_cdclk_funcs; }else if (IS_I845G (dev_priv)) { - dev_priv->cdclk_funcs = &i845g_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i845g_cdclk_funcs; }else if (IS_I830 (dev_priv)) { - dev_priv->cdclk_funcs = &i830_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i830_cdclk_funcs; } -if (drm_WARN (&dev_priv->drm, !dev_priv->cdclk_funcs, +if (drm_WARN (&dev_priv->drm, !dev_priv->display.funcs.cdclk,"Unknown platform. Assuming i830\n" )) - dev_priv->cdclk_funcs = &i830_cdclk_funcs; + dev_priv->display.funcs.cdclk = &i830_cdclk_funcs; }
drivers/gpu/drm/i915/display/intel_display_core.h +4 -0
@@ -9,6 +9,7 @@#include <linux/types.h> struct intel_atomic_state ; +struct intel_cdclk_funcs ;struct intel_crtc ;struct intel_crtc_state ;struct intel_initial_plane_config ;
@@ -34,6 +35,9 @@ struct intel_display {struct {/* Top level crtc-ish functions */ const struct intel_display_funcs *display; + +/* Display CDCLK functions */ +const struct intel_cdclk_funcs *cdclk; } funcs; };
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -84,7 +84,6 @@ struct drm_i915_private;struct intel_atomic_state ;struct intel_audio_funcs ;struct intel_cdclk_config ; -struct intel_cdclk_funcs ;struct intel_cdclk_state ;struct intel_cdclk_vals ;struct intel_color_funcs ;
@@ -523,9 +522,6 @@ struct drm_i915_private {/* Display internal color functions */ const struct intel_color_funcs *color_funcs; -/* Display CDCLK functions */ -const struct intel_cdclk_funcs *cdclk_funcs; -/* PCH chipset type */ enum intel_pch pch_type;unsigned short pch_id;
Signature · 1 line
2.34.1
PATCH v2 13/38 drm/i915: move and group fbdev under display.fbdev
In reply to Jani NikulaMove display fbdev related members under drm_i915_private display sub-struct.
--- .../gpu/drm/i915/display/intel_display_core.h | 8 ++++++ .../drm/i915/display/intel_display_debugfs.c | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 26 +++++++++---------- drivers/gpu/drm/i915/i915_drv.h | 5 ---- 4 files changed, 22 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +8 -0
@@ -9,6 +9,7 @@#include <linux/mutex.h> #include <linux/types.h> #include <linux/wait.h> +#include <linux/workqueue.h> #include "intel_display.h" #include "intel_dmc.h"
@@ -25,6 +26,7 @@ struct intel_crtc;struct intel_crtc_state ;struct intel_dpll_funcs ;struct intel_dpll_mgr ; +struct intel_fbdev ;struct intel_fdi_funcs ;struct intel_hotplug_funcs ;struct intel_initial_plane_config ;
@@ -128,6 +130,12 @@ struct intel_display { } funcs;/* Grouping using anonymous structs. Keep sorted. */ +struct { +/* list of fbdev register on this device */ +struct intel_fbdev *fbdev; +struct work_struct suspend_work; + } fbdev; +struct {/* * Base address of where the gmbus and gpio blocks are located
drivers/gpu/drm/i915/display/intel_display_debugfs.c +1 -1
@@ -129,7 +129,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)struct drm_framebuffer *drm_fb;#ifdef CONFIG_DRM_FBDEV_EMULATION - fbdev_fb =intel_fbdev_framebuffer (dev_priv->fbdev); + fbdev_fb =intel_fbdev_framebuffer (dev_priv->display.fbdev.fbdev);if (fbdev_fb) { seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ", fbdev_fb->base.width,
drivers/gpu/drm/i915/display/intel_fbdev.c +13 -13
@@ -500,7 +500,7 @@ static void intel_fbdev_suspend_worker(struct work_struct *work) {intel_fbdev_set_suspend (&container_of (work, struct drm_i915_private, - fbdev_suspend_work)->drm, + display.fbdev.suspend_work)->drm,FBINFO_STATE_RUNNING , true); }
@@ -530,8 +530,8 @@ int intel_fbdev_init(struct drm_device *dev)return ret; } - dev_priv->fbdev = ifbdev; -INIT_WORK (&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker); + dev_priv->display.fbdev.fbdev = ifbdev; +INIT_WORK (&dev_priv->display.fbdev.suspend_work, intel_fbdev_suspend_worker);return 0 ; }
@@ -548,7 +548,7 @@ static void intel_fbdev_initial_config(void *data, async_cookie_t cookie)void intel_fbdev_initial_config_async (struct drm_device *dev) { -struct intel_fbdev *ifbdev =to_i915 (dev)->fbdev; +struct intel_fbdev *ifbdev =to_i915 (dev)->display.fbdev.fbdev;if (!ifbdev)return ;
@@ -568,12 +568,12 @@ static void intel_fbdev_sync(struct intel_fbdev *ifbdev)void intel_fbdev_unregister (struct drm_i915_private *dev_priv) { -struct intel_fbdev *ifbdev = dev_priv->fbdev; +struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev;if (!ifbdev)return ; -cancel_work_sync (&dev_priv->fbdev_suspend_work); +cancel_work_sync (&dev_priv->display.fbdev.suspend_work);if (!current_is_async ())intel_fbdev_sync (ifbdev);
@@ -582,7 +582,7 @@ void intel_fbdev_unregister(struct drm_i915_private *dev_priv)void intel_fbdev_fini (struct drm_i915_private *dev_priv) { -struct intel_fbdev *ifbdev =fetch_and_zero (&dev_priv->fbdev); +struct intel_fbdev *ifbdev =fetch_and_zero (&dev_priv->display.fbdev.fbdev);if (!ifbdev)return ;
@@ -596,7 +596,7 @@ void intel_fbdev_fini(struct drm_i915_private *dev_priv)*/ static void intel_fbdev_hpd_set_suspend (struct drm_i915_private *i915,int state) { -struct intel_fbdev *ifbdev = i915->fbdev; +struct intel_fbdev *ifbdev = i915->display.fbdev.fbdev;bool send_hpd = false;mutex_lock (&ifbdev->hpd_lock);
@@ -614,7 +614,7 @@ static void intel_fbdev_hpd_set_suspend(struct drm_i915_private *i915, int statevoid intel_fbdev_set_suspend (struct drm_device *dev,int state,bool synchronous) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_fbdev *ifbdev = dev_priv->fbdev; +struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev;struct fb_info *info;if (!ifbdev || !ifbdev->vma)
@@ -631,7 +631,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous* ourselves, so only flush outstanding work upon suspend! */ if (state !=FBINFO_STATE_RUNNING ) -flush_work (&dev_priv->fbdev_suspend_work); +flush_work (&dev_priv->display.fbdev.suspend_work);console_lock (); }else {
@@ -645,7 +645,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous/* Don't block our own workqueue as this can * be run in parallel with other i915.ko tasks. */ -schedule_work (&dev_priv->fbdev_suspend_work); +schedule_work (&dev_priv->display.fbdev.suspend_work);return ; } }
@@ -666,7 +666,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronousvoid intel_fbdev_output_poll_changed (struct drm_device *dev) { -struct intel_fbdev *ifbdev =to_i915 (dev)->fbdev; +struct intel_fbdev *ifbdev =to_i915 (dev)->display.fbdev.fbdev;bool send_hpd;if (!ifbdev)
@@ -685,7 +685,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)void intel_fbdev_restore_mode (struct drm_device *dev) { -struct intel_fbdev *ifbdev =to_i915 (dev)->fbdev; +struct intel_fbdev *ifbdev =to_i915 (dev)->display.fbdev.fbdev;if (!ifbdev)return ;
drivers/gpu/drm/i915/i915_drv.h +0 -5
@@ -83,7 +83,6 @@ struct intel_cdclk_vals;struct intel_connector ;struct intel_dp ;struct intel_encoder ; -struct intel_fbdev ;struct intel_limit ;struct intel_overlay ;struct intel_overlay_error_state ;
@@ -478,10 +477,6 @@ struct drm_i915_private {struct i915_gpu_error gpu_error; -/* list of fbdev register on this device */ -struct intel_fbdev *fbdev; -struct work_struct fbdev_suspend_work; -struct drm_property *broadcast_rgb_property;struct drm_property *force_audio_property;
Signature · 1 line
2.34.1
PATCH v2 8/38 drm/i915: move and group gmbus members under display.gmbus
In reply to Jani NikulaMove display gmbus related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 6 +-- .../gpu/drm/i915/display/intel_display_core.h | 23 ++++++++++ drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 46 +++++++++---------- drivers/gpu/drm/i915/i915_drv.h | 16 ------- drivers/gpu/drm/i915/i915_irq.c | 4 +- drivers/gpu/drm/i915/i915_reg.h | 14 +++--- 7 files changed, 59 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +3 -3
@@ -2098,12 +2098,12 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,* functions use cdclk. Not all platforms/ports do, * but we'll lock them all for simplicity. */ -mutex_lock (&dev_priv->gmbus_mutex); +mutex_lock (&dev_priv->display.gmbus.mutex);for_each_intel_dp (&dev_priv->drm, encoder) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);mutex_lock_nest_lock (&intel_dp->aux.hw_mutex, - &dev_priv->gmbus_mutex); + &dev_priv->display.gmbus.mutex); }intel_cdclk_set_cdclk (dev_priv, cdclk_config, pipe);
@@ -2113,7 +2113,7 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,mutex_unlock (&intel_dp->aux.hw_mutex); } -mutex_unlock (&dev_priv->gmbus_mutex); +mutex_unlock (&dev_priv->display.gmbus.mutex);for_each_intel_encoder_with_psr (&dev_priv->drm, encoder) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
drivers/gpu/drm/i915/display/intel_display_core.h +23 -0
@@ -6,7 +6,11 @@#ifndef __INTEL_DISPLAY_CORE_H__#define __INTEL_DISPLAY_CORE_H__ +#include <linux/mutex.h> #include <linux/types.h> +#include <linux/wait.h> + +#include "intel_gmbus.h" struct drm_i915_private ;struct intel_atomic_state ;
@@ -76,6 +80,25 @@ struct intel_display {/* Display internal color functions */ const struct intel_color_funcs *color; } funcs; + +/* Grouping using anonymous structs. Keep sorted. */ +struct { +/* +* Base address of where the gmbus and gpio blocks are located +* (either on PCH or on SoC for platforms without PCH). +*/ +u32 mmio_base; + +/* +* gmbus.mutex protects against concurrent usage of the single +* hw gmbus controller on different i2c buses. +*/ +struct mutex mutex; + +struct intel_gmbus *bus[GMBUS_NUM_PINS ]; + +wait_queue_head_t wait_queue; + } gmbus; };#endif /* __INTEL_DISPLAY_CORE_H__ */
drivers/gpu/drm/i915/display/intel_dp_aux.c +1 -1
@@ -42,7 +42,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp)bool done;#define C (((status = intel_uncore_read_notrace(&i915->uncore, ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0) - done =wait_event_timeout (i915->gmbus_wait_queue,C , + done =wait_event_timeout (i915->display.gmbus.wait_queue,C ,msecs_to_jiffies_timeout (timeout_ms));/* just trace the final value */
drivers/gpu/drm/i915/display/intel_gmbus.c +23 -23
152 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +0 -16
@@ -47,7 +47,6 @@#include "display/intel_fbc.h" #include "display/intel_frontbuffer.h" #include "display/intel_global_state.h" -#include "display/intel_gmbus.h" #include "display/intel_opregion.h" #include "gem/i915_gem_context_types.h"
@@ -89,7 +88,6 @@ struct intel_connector;struct intel_dp ;struct intel_encoder ;struct intel_fbdev ; -struct intel_gmbus ;struct intel_limit ;struct intel_overlay ;struct intel_overlay_error_state ;
@@ -383,25 +381,11 @@ struct drm_i915_private {struct intel_dmc dmc; -struct intel_gmbus *gmbus[GMBUS_NUM_PINS ]; - -/** gmbus_mutex protects against concurrent usage of the single hw gmbus -* controller on different i2c buses. */ -struct mutex gmbus_mutex; - -/** -* Base address of where the gmbus and gpio blocks are located (either -* on PCH or on SoC for platforms without PCH). -*/ -u32 gpio_mmio_base; -/* MMIO base address for MIPI regs */ u32 mipi_mmio_base;u32 pps_mmio_base; -wait_queue_head_t gmbus_wait_queue; -struct pci_dev *bridge_dev;struct rb_root uabi_engines;
drivers/gpu/drm/i915/i915_irq.c +2 -2
@@ -1304,12 +1304,12 @@ static u32 intel_hpd_hotplug_enables(struct drm_i915_private *i915,static void gmbus_irq_handler (struct drm_i915_private *dev_priv) { -wake_up_all (&dev_priv->gmbus_wait_queue); +wake_up_all (&dev_priv->display.gmbus.wait_queue); }static void dp_aux_irq_handler (struct drm_i915_private *dev_priv) { -wake_up_all (&dev_priv->gmbus_wait_queue); +wake_up_all (&dev_priv->display.gmbus.wait_queue); }#if defined(CONFIG_DEBUG_FS )
drivers/gpu/drm/i915/i915_reg.h +7 -7
@@ -1464,7 +1464,7 @@/* * GPIO regs */ -#define GPIO (gpio) _MMIO(dev_priv->gpio_mmio_base + 0x5010 + \ +#define GPIO (gpio) _MMIO(dev_priv->display.gmbus.mmio_base + 0x5010 + \ 4 * (gpio))# define GPIO_CLOCK_DIR_MASK (1 << 0)
@@ -1482,7 +1482,7 @@# define GPIO_DATA_VAL_IN (1 << 12)# define GPIO_DATA_PULLUP_DISABLE (1 << 13) -#define GMBUS0 _MMIO(dev_priv->gpio_mmio_base + 0x5100)/* clock/port select */ +#define GMBUS0 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5100)/* clock/port select */ #define GMBUS_AKSV_SELECT (1 << 11)#define GMBUS_RATE_100KHZ (0 << 8)#define GMBUS_RATE_50KHZ (1 << 8)
@@ -1491,7 +1491,7 @@#define GMBUS_HOLD_EXT (1 << 7)/* 300ns hold time, rsvd on Pineview */ #define GMBUS_BYTE_CNT_OVERRIDE (1 << 6) -#define GMBUS1 _MMIO(dev_priv->gpio_mmio_base + 0x5104)/* command/status */ +#define GMBUS1 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5104)/* command/status */ #define GMBUS_SW_CLR_INT (1 << 31)#define GMBUS_SW_RDY (1 << 30)#define GMBUS_ENT (1 << 29)/* enable timeout */
@@ -1506,7 +1506,7 @@#define GMBUS_SLAVE_ADDR_SHIFT 1#define GMBUS_SLAVE_READ (1 << 0)#define GMBUS_SLAVE_WRITE (0 << 0) -#define GMBUS2 _MMIO(dev_priv->gpio_mmio_base + 0x5108)/* status */ +#define GMBUS2 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5108)/* status */ #define GMBUS_INUSE (1 << 15)#define GMBUS_HW_WAIT_PHASE (1 << 14)#define GMBUS_STALL_TIMEOUT (1 << 13)
@@ -1514,14 +1514,14 @@#define GMBUS_HW_RDY (1 << 11)#define GMBUS_SATOER (1 << 10)#define GMBUS_ACTIVE (1 << 9) -#define GMBUS3 _MMIO(dev_priv->gpio_mmio_base + 0x510c)/* data buffer bytes 3-0 */ -#define GMBUS4 _MMIO(dev_priv->gpio_mmio_base + 0x5110)/* interrupt mask (Pineview+) */ +#define GMBUS3 _MMIO(dev_priv->display.gmbus.mmio_base + 0x510c)/* data buffer bytes 3-0 */ +#define GMBUS4 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5110)/* interrupt mask (Pineview+) */ #define GMBUS_SLAVE_TIMEOUT_EN (1 << 4)#define GMBUS_NAK_EN (1 << 3)#define GMBUS_IDLE_EN (1 << 2)#define GMBUS_HW_WAIT_EN (1 << 1)#define GMBUS_HW_RDY_EN (1 << 0) -#define GMBUS5 _MMIO(dev_priv->gpio_mmio_base + 0x5120)/* byte index */ +#define GMBUS5 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5120)/* byte index */ #define GMBUS_2BYTE_INDEX_EN (1 << 31)/*
Signature · 1 line
2.34.1
PATCH v2 18/38 drm/i915: move and group sagv under display.sagv
In reply to Jani NikulaMove display sagv related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_bw.c | 10 ++--- .../gpu/drm/i915/display/intel_display_core.h | 11 ++++++ drivers/gpu/drm/i915/i915_drv.h | 9 ----- drivers/gpu/drm/i915/intel_pm.c | 38 +++++++++---------- 4 files changed, 35 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +5 -5
@@ -346,9 +346,9 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel* as it will fail and pointless anyway. */ if (qi.num_points ==1 ) - dev_priv->sagv_status =I915_SAGV_NOT_CONTROLLED ; + dev_priv->display.sagv.status =I915_SAGV_NOT_CONTROLLED ;else - dev_priv->sagv_status =I915_SAGV_ENABLED ; + dev_priv->display.sagv.status =I915_SAGV_ENABLED ;return 0 ; }
@@ -456,9 +456,9 @@ static int tgl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel* as it will fail and pointless anyway. */ if (qi.num_points ==1 ) - dev_priv->sagv_status =I915_SAGV_NOT_CONTROLLED ; + dev_priv->display.sagv.status =I915_SAGV_NOT_CONTROLLED ;else - dev_priv->sagv_status =I915_SAGV_ENABLED ; + dev_priv->display.sagv.status =I915_SAGV_ENABLED ;return 0 ; }
@@ -485,7 +485,7 @@ static void dg2_get_bw_info(struct drm_i915_private *i915) bi->deratedbw[0 ] = deratedbw; } - i915->sagv_status =I915_SAGV_NOT_CONTROLLED ; + i915->display.sagv.status =I915_SAGV_NOT_CONTROLLED ; } static unsigned int icl_max_bw(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/display/intel_display_core.h +11 -0
@@ -247,6 +247,17 @@ struct intel_display {struct mutex mutex; } pps; +struct { +enum { +I915_SAGV_UNKNOWN =0 , +I915_SAGV_DISABLED , +I915_SAGV_ENABLED , +I915_SAGV_NOT_CONTROLLED + } status; + +u32 block_time_us; + } sagv; +/* Grouping using named structs. Keep sorted. */ struct intel_audio audio;struct intel_dmc dmc;
drivers/gpu/drm/i915/i915_drv.h +0 -9
@@ -451,15 +451,6 @@ struct drm_i915_private {struct i915_suspend_saved_registers regfile;struct vlv_s0ix_state *vlv_s0ix_state; -enum { -I915_SAGV_UNKNOWN =0 , -I915_SAGV_DISABLED , -I915_SAGV_ENABLED , -I915_SAGV_NOT_CONTROLLED - } sagv_status; - -u32 sagv_block_time_us; -struct dram_info {bool wm_lv_0_adjust_needed;u8 num_channels;
drivers/gpu/drm/i915/intel_pm.c +19 -19
@@ -3669,7 +3669,7 @@ static bool intel_has_sagv(struct drm_i915_private *dev_priv) {return DISPLAY_VER (dev_priv) >=9 && !IS_LP (dev_priv) && - dev_priv->sagv_status !=I915_SAGV_NOT_CONTROLLED ; + dev_priv->display.sagv.status !=I915_SAGV_NOT_CONTROLLED ; } static u32
@@ -3700,7 +3700,7 @@ intel_sagv_block_time(struct drm_i915_private *dev_priv)static void intel_sagv_init (struct drm_i915_private *i915) {if (!intel_has_sagv (i915)) - i915->sagv_status =I915_SAGV_NOT_CONTROLLED ; + i915->display.sagv.status =I915_SAGV_NOT_CONTROLLED ;/* * Probe to see if we have working SAGV control.
@@ -3709,21 +3709,21 @@ static void intel_sagv_init(struct drm_i915_private *i915)if (DISPLAY_VER (i915) <11 )skl_sagv_disable (i915); -drm_WARN_ON (&i915->drm, i915->sagv_status ==I915_SAGV_UNKNOWN ); +drm_WARN_ON (&i915->drm, i915->display.sagv.status ==I915_SAGV_UNKNOWN ); - i915->sagv_block_time_us =intel_sagv_block_time (i915); + i915->display.sagv.block_time_us =intel_sagv_block_time (i915);drm_dbg_kms (&i915->drm,"SAGV supported: %s, original SAGV block time: %u us\n" , -str_yes_no (intel_has_sagv (i915)), i915->sagv_block_time_us); +str_yes_no (intel_has_sagv (i915)), i915->display.sagv.block_time_us);/* avoid overflow when adding with wm0 latency/etc. */ -if (drm_WARN (&i915->drm, i915->sagv_block_time_us >U16_MAX , +if (drm_WARN (&i915->drm, i915->display.sagv.block_time_us >U16_MAX ,"Excessive SAGV block time %u, ignoring\n" , - i915->sagv_block_time_us)) - i915->sagv_block_time_us =0 ; + i915->display.sagv.block_time_us)) + i915->display.sagv.block_time_us =0 ;if (!intel_has_sagv (i915)) - i915->sagv_block_time_us =0 ; + i915->display.sagv.block_time_us =0 ; }/*
@@ -3744,7 +3744,7 @@ static void skl_sagv_enable(struct drm_i915_private *dev_priv)if (!intel_has_sagv (dev_priv))return ; -if (dev_priv->sagv_status ==I915_SAGV_ENABLED ) +if (dev_priv->display.sagv.status ==I915_SAGV_ENABLED )return ;drm_dbg_kms (&dev_priv->drm,"Enabling SAGV\n" );
@@ -3759,14 +3759,14 @@ static void skl_sagv_enable(struct drm_i915_private *dev_priv)*/ if (IS_SKYLAKE (dev_priv) && ret == -ENXIO ) {drm_dbg (&dev_priv->drm,"No SAGV found on system, ignoring\n" ); - dev_priv->sagv_status =I915_SAGV_NOT_CONTROLLED ; + dev_priv->display.sagv.status =I915_SAGV_NOT_CONTROLLED ;return ; }else if (ret <0 ) {drm_err (&dev_priv->drm,"Failed to enable SAGV\n" );return ; } - dev_priv->sagv_status =I915_SAGV_ENABLED ; + dev_priv->display.sagv.status =I915_SAGV_ENABLED ; }static void skl_sagv_disable (struct drm_i915_private *dev_priv)
@@ -3776,7 +3776,7 @@ static void skl_sagv_disable(struct drm_i915_private *dev_priv)if (!intel_has_sagv (dev_priv))return ; -if (dev_priv->sagv_status ==I915_SAGV_DISABLED ) +if (dev_priv->display.sagv.status ==I915_SAGV_DISABLED )return ;drm_dbg_kms (&dev_priv->drm,"Disabling SAGV\n" );
@@ -3791,14 +3791,14 @@ static void skl_sagv_disable(struct drm_i915_private *dev_priv)*/ if (IS_SKYLAKE (dev_priv) && ret == -ENXIO ) {drm_dbg (&dev_priv->drm,"No SAGV found on system, ignoring\n" ); - dev_priv->sagv_status =I915_SAGV_NOT_CONTROLLED ; + dev_priv->display.sagv.status =I915_SAGV_NOT_CONTROLLED ;return ; }else if (ret <0 ) {drm_err (&dev_priv->drm,"Failed to disable SAGV (%d)\n" , ret);return ; } - dev_priv->sagv_status =I915_SAGV_DISABLED ; + dev_priv->display.sagv.status =I915_SAGV_DISABLED ; }static void skl_sagv_pre_plane_update (struct intel_atomic_state *state)
@@ -5560,8 +5560,8 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state, result->min_ddb_alloc =max (min_ddb_alloc, blocks) +1 ; result->enable = true; -if (DISPLAY_VER (dev_priv) <12 && dev_priv->sagv_block_time_us) - result->can_sagv = latency >= dev_priv->sagv_block_time_us; +if (DISPLAY_VER (dev_priv) <12 && dev_priv->display.sagv.block_time_us) + result->can_sagv = latency >= dev_priv->display.sagv.block_time_us; } static void
@@ -5595,8 +5595,8 @@ static void tgl_compute_sagv_wm(const struct intel_crtc_state *crtc_state,struct skl_wm_level *levels = plane_wm->wm;unsigned int latency =0 ; -if (dev_priv->sagv_block_time_us) - latency = dev_priv->sagv_block_time_us + dev_priv->display.wm.skl_latency[0 ]; +if (dev_priv->display.sagv.block_time_us) + latency = dev_priv->display.sagv.block_time_us + dev_priv->display.wm.skl_latency[0 ]; skl_compute_plane_wm(crtc_state, plane, 0, latency, wm_params, &levels[0],
Signature · 1 line
2.34.1
PATCH v2 22/38 drm/i915: move backlight to display.backlight
In reply to Jani NikulaMove display backlight related members under drm_i915_private display sub-struct.
Prefer adding anonymous sub-structs even for single members that aren't our own structs.
--- .../gpu/drm/i915/display/intel_backlight.c | 28 +++++++++---------- .../gpu/drm/i915/display/intel_display_core.h | 5 ++++ drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 -- 4 files changed, 20 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +14 -14
@@ -305,7 +305,7 @@ void intel_backlight_set_acpi(const struct drm_connector_state *conn_state,if (!panel->backlight.present || !conn_state->crtc)return ; -mutex_lock (&dev_priv->backlight_lock); +mutex_lock (&dev_priv->display.backlight.lock);drm_WARN_ON (&dev_priv->drm, panel->backlight.max ==0 );
@@ -321,7 +321,7 @@ void intel_backlight_set_acpi(const struct drm_connector_state *conn_state,if (panel->backlight.enabled)intel_panel_actually_set_backlight (conn_state, hw_level); -mutex_unlock (&dev_priv->backlight_lock); +mutex_unlock (&dev_priv->display.backlight.lock); }static void lpt_disable_backlight (const struct drm_connector_state *old_conn_state,u32 level)
@@ -465,14 +465,14 @@ void intel_backlight_disable(const struct drm_connector_state *old_conn_state)return ; } -mutex_lock (&dev_priv->backlight_lock); +mutex_lock (&dev_priv->display.backlight.lock);if (panel->backlight.device) panel->backlight.device->props.power =FB_BLANK_POWERDOWN ; panel->backlight.enabled = false; panel->backlight.funcs->disable (old_conn_state,0 ); -mutex_unlock (&dev_priv->backlight_lock); +mutex_unlock (&dev_priv->display.backlight.lock); } static void lpt_enable_backlight(const struct intel_crtc_state *crtc_state,
@@ -815,11 +815,11 @@ void intel_backlight_enable(const struct intel_crtc_state *crtc_state,drm_dbg_kms (&dev_priv->drm,"pipe %c\n" ,pipe_name (pipe)); -mutex_lock (&dev_priv->backlight_lock); +mutex_lock (&dev_priv->display.backlight.lock);__intel_backlight_enable (crtc_state, conn_state); -mutex_unlock (&dev_priv->backlight_lock); +mutex_unlock (&dev_priv->display.backlight.lock); }#if IS_ENABLED (CONFIG_BACKLIGHT_CLASS_DEVICE )
@@ -829,12 +829,12 @@ static u32 intel_panel_get_backlight(struct intel_connector *connector)struct intel_panel *panel = &connector->panel;u32 val =0 ; -mutex_lock (&dev_priv->backlight_lock); +mutex_lock (&dev_priv->display.backlight.lock);if (panel->backlight.enabled) val = panel->backlight.funcs->get (connector,intel_connector_get_pipe (connector)); -mutex_unlock (&dev_priv->backlight_lock); +mutex_unlock (&dev_priv->display.backlight.lock);drm_dbg_kms (&dev_priv->drm,"get backlight PWM = %d\n" , val);return val;
@@ -862,7 +862,7 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_staif (!panel->backlight.present)return ; -mutex_lock (&dev_priv->backlight_lock); +mutex_lock (&dev_priv->display.backlight.lock);drm_WARN_ON (&dev_priv->drm, panel->backlight.max ==0 );
@@ -872,7 +872,7 @@ static void intel_panel_set_backlight(const struct drm_connector_state *conn_staif (panel->backlight.enabled)intel_panel_actually_set_backlight (conn_state, hw_level); -mutex_unlock (&dev_priv->backlight_lock); +mutex_unlock (&dev_priv->display.backlight.lock); }static int intel_backlight_device_update_status (struct backlight_device *bd)
@@ -1591,11 +1591,11 @@ void intel_backlight_update(struct intel_atomic_state *state,if (!panel->backlight.present)return ; -mutex_lock (&dev_priv->backlight_lock); +mutex_lock (&dev_priv->display.backlight.lock);if (!panel->backlight.enabled)__intel_backlight_enable (crtc_state, conn_state); -mutex_unlock (&dev_priv->backlight_lock); +mutex_unlock (&dev_priv->display.backlight.lock); }int intel_backlight_setup (struct intel_connector *connector,enum pipe pipe)
@@ -1620,9 +1620,9 @@ int intel_backlight_setup(struct intel_connector *connector, enum pipe pipe)return -ENODEV ;/* set level and max in panel struct */ -mutex_lock (&dev_priv->backlight_lock); +mutex_lock (&dev_priv->display.backlight.lock); ret = panel->backlight.funcs->setup (connector, pipe); -mutex_unlock (&dev_priv->backlight_lock); +mutex_unlock (&dev_priv->display.backlight.lock);if (ret) { drm_dbg_kms(&dev_priv->drm,
drivers/gpu/drm/i915/display/intel_display_core.h +5 -0
@@ -218,6 +218,11 @@ struct intel_display { } funcs;/* Grouping using anonymous structs. Keep sorted. */ +struct { +/* backlight registers and fields in struct intel_panel */ +struct mutex lock; + } backlight; +struct {struct intel_global_obj obj;
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -330,7 +330,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock); -mutex_init (&dev_priv->backlight_lock); +mutex_init (&dev_priv->display.backlight.lock);mutex_init (&dev_priv->sb_lock);cpu_latency_qos_add_request (&dev_priv->sb_qos,PM_QOS_DEFAULT_VALUE );
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -329,9 +329,6 @@ struct drm_i915_private {bool preserve_bios_swizzle; -/* backlight registers and fields in struct intel_panel */ -struct mutex backlight_lock; -unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_preferred_vco_freq;
Signature · 1 line
2.34.1
PATCH v2 21/38 drm/i915: move and group cdclk under display.cdclk
In reply to Jani NikulaMove display cdclk related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/hsw_ips.c | 2 +- drivers/gpu/drm/i915/display/intel_audio.c | 6 +- .../gpu/drm/i915/display/intel_backlight.c | 4 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 206 +++++++++--------- drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +- drivers/gpu/drm/i915/display/intel_display.c | 10 +- .../gpu/drm/i915/display/intel_display_core.h | 14 ++ .../drm/i915/display/intel_display_power.c | 2 +- .../i915/display/intel_display_power_well.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +- .../drm/i915/display/intel_modeset_setup.c | 4 +- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 15 -- 15 files changed, 141 insertions(+), 142 deletions(-)
drivers/gpu/drm/i915/display/hsw_ips.c +1 -1
@@ -202,7 +202,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)* Should measure whether using a lower cdclk w/o IPS */ if (IS_BROADWELL (i915) && - crtc_state->pixel_rate > i915->max_cdclk_freq *95 /100 ) + crtc_state->pixel_rate > i915->display.cdclk.max_cdclk_freq *95 /100 )return false;return true;
drivers/gpu/drm/i915/display/intel_audio.c +3 -3
@@ -532,7 +532,7 @@ static unsigned int calc_hblank_early_prog(struct intel_encoder *encoder, h_total = crtc_state->hw.adjusted_mode.crtc_htotal; pixel_clk = crtc_state->hw.adjusted_mode.crtc_clock; vdsc_bpp = crtc_state->dsc.compressed_bpp; - cdclk = i915->cdclk.hw.cdclk; + cdclk = i915->display.cdclk.hw.cdclk;/* fec= 0.972261, using rounding multiplier of 1000000 */ fec_coeff =972261 ; link_clk = crtc_state->port_clock;
@@ -971,7 +971,7 @@ void intel_audio_cdclk_change_post(struct drm_i915_private *i915)struct aud_ts_cdclk_m_n aud_ts;if (DISPLAY_VER (i915) >=13 ) { -get_aud_ts_cdclk_m_n (i915->cdclk.hw.ref, i915->cdclk.hw.cdclk, &aud_ts); +get_aud_ts_cdclk_m_n (i915->display.cdclk.hw.ref, i915->display.cdclk.hw.cdclk, &aud_ts);intel_de_write (i915,AUD_TS_CDCLK_N , aud_ts.n);intel_de_write (i915,AUD_TS_CDCLK_M , aud_ts.m |AUD_TS_CDCLK_M_EN );
@@ -1119,7 +1119,7 @@ static int i915_audio_component_get_cdclk_freq(struct device *kdev)if (drm_WARN_ON_ONCE (&dev_priv->drm, !HAS_DDI (dev_priv)))return -ENODEV ; -return dev_priv->cdclk.hw.cdclk; +return dev_priv->display.cdclk.hw.cdclk; }/*
drivers/gpu/drm/i915/display/intel_backlight.c +2 -2
@@ -1113,7 +1113,7 @@ static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)if (IS_PINEVIEW (dev_priv)) clock =KHz (RUNTIME_INFO (dev_priv)->rawclk_freq);else - clock =KHz (dev_priv->cdclk.hw.cdclk); + clock =KHz (dev_priv->display.cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *32 ); }
@@ -1131,7 +1131,7 @@ static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)if (IS_G4X (dev_priv)) clock =KHz (RUNTIME_INFO (dev_priv)->rawclk_freq);else - clock =KHz (dev_priv->cdclk.hw.cdclk); + clock =KHz (dev_priv->display.cdclk.hw.cdclk);return DIV_ROUND_CLOSEST (clock, pwm_freq_hz *128 ); }
drivers/gpu/drm/i915/display/intel_cdclk.c +103 -103
573 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_cdclk.h +2 -2
@@ -77,9 +77,9 @@ intel_atomic_get_cdclk_state(struct intel_atomic_state *state);#define to_intel_cdclk_state (x) container_of((x), struct intel_cdclk_state, base)#define intel_atomic_get_old_cdclk_state (state) \ - to_intel_cdclk_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->cdclk.obj)) + to_intel_cdclk_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.cdclk.obj))#define intel_atomic_get_new_cdclk_state (state) \ - to_intel_cdclk_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->cdclk.obj)) + to_intel_cdclk_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->display.cdclk.obj))int intel_cdclk_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/display/intel_display.c +5 -5
@@ -2658,7 +2658,7 @@ static int intel_crtc_compute_pipe_mode(struct intel_crtc_state *crtc_state)intel_mode_from_crtc_timings (pipe_mode, pipe_mode);if (DISPLAY_VER (i915) <4 ) { - clock_limit = i915->max_cdclk_freq *9 /10 ; + clock_limit = i915->display.cdclk.max_cdclk_freq *9 /10 ;/* * Enable double wide mode when the dot clock
@@ -8394,11 +8394,11 @@ void intel_modeset_init_hw(struct drm_i915_private *i915)if (!HAS_DISPLAY (i915))return ; - cdclk_state =to_intel_cdclk_state (i915->cdclk.obj.state); + cdclk_state =to_intel_cdclk_state (i915->display.cdclk.obj.state);intel_update_cdclk (i915); -intel_cdclk_dump_config (i915, &i915->cdclk.hw,"Current CDCLK" ); - cdclk_state->logical = cdclk_state->actual = i915->cdclk.hw; +intel_cdclk_dump_config (i915, &i915->display.cdclk.hw,"Current CDCLK" ); + cdclk_state->logical = cdclk_state->actual = i915->display.cdclk.hw; }static int sanitize_watermarks_add_affected (struct drm_atomic_state *state)
@@ -8767,7 +8767,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)intel_hdcp_component_init (i915); -if (i915->max_cdclk_freq ==0 ) +if (i915->display.cdclk.max_cdclk_freq ==0 )intel_update_max_cdclk (i915);/*
drivers/gpu/drm/i915/display/intel_display_core.h +14 -0
@@ -11,6 +11,7 @@#include <linux/wait.h> #include <linux/workqueue.h> +#include "intel_cdclk.h" #include "intel_display.h" #include "intel_dmc.h" #include "intel_dpll_mgr.h"
@@ -25,6 +26,7 @@ struct i915_hdcp_comp_master;struct intel_atomic_state ;struct intel_audio_funcs ;struct intel_cdclk_funcs ; +struct intel_cdclk_vals ;struct intel_color_funcs ;struct intel_crtc ;struct intel_crtc_state ;
@@ -230,6 +232,18 @@ struct intel_display { } max[6 ]; } bw; +struct { +/* The current hardware cdclk configuration */ +struct intel_cdclk_config hw; + +/* cdclk, divider, and ratio table from bspec */ +const struct intel_cdclk_vals *table; + +struct intel_global_obj obj; + +unsigned int max_cdclk_freq; + } cdclk; +struct {/* list of fbdev register on this device */ struct intel_fbdev *fbdev;
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -1310,7 +1310,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (&dev_priv->uncore,FORCEWAKE_ALL );intel_update_cdclk (dev_priv); -intel_cdclk_dump_config (dev_priv, &dev_priv->cdclk.hw,"Current CDCLK" ); +intel_cdclk_dump_config (dev_priv, &dev_priv->display.cdclk.hw,"Current CDCLK" ); }/*
drivers/gpu/drm/i915/display/intel_display_power_well.c +1 -1
@@ -972,7 +972,7 @@ void gen9_disable_dc_states(struct drm_i915_private *dev_priv)intel_cdclk_get_cdclk (dev_priv, &cdclk_config);/* Can't read out voltage_level so can't use intel_cdclk_changed() */ drm_WARN_ON (&dev_priv->drm, -intel_cdclk_needs_modeset (&dev_priv->cdclk.hw, +intel_cdclk_needs_modeset (&dev_priv->display.cdclk.hw, &cdclk_config));gen9_assert_dbuf_enabled (dev_priv);
drivers/gpu/drm/i915/display/intel_dp.c +2 -2
@@ -720,7 +720,7 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,if (bigjoiner) {u32 max_bpp_bigjoiner = - i915->max_cdclk_freq *48 / + i915->display.cdclk.max_cdclk_freq *48 /intel_dp_mode_to_fec_clock (mode_clock); bits_per_pixel =min (bits_per_pixel, max_bpp_bigjoiner);
@@ -1546,7 +1546,7 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,* is greater than the maximum Cdclock and if slice count is even * then we need to use 2 VDSC instances. */ -if (adjusted_mode->crtc_clock > dev_priv->max_cdclk_freq || +if (adjusted_mode->crtc_clock > dev_priv->display.cdclk.max_cdclk_freq || pipe_config->bigjoiner_pipes) {if (pipe_config->dsc.slice_count <2 ) { drm_dbg_kms(&dev_priv->drm,
drivers/gpu/drm/i915/display/intel_dp_aux.c +1 -1
@@ -86,7 +86,7 @@ static u32 ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)* divide by 2000 and use that */ if (dig_port->aux_ch ==AUX_CH_A ) - freq = dev_priv->cdclk.hw.cdclk; + freq = dev_priv->display.cdclk.hw.cdclk;else freq =RUNTIME_INFO (dev_priv)->rawclk_freq;return DIV_ROUND_CLOSEST (freq,2000 );
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +2 -2
@@ -1858,7 +1858,7 @@ static int skl_ddi_pll_get_freq(struct drm_i915_private *i915,static void skl_update_dpll_ref_clks (struct drm_i915_private *i915) {/* No SSC ref */ - i915->display.dpll.ref_clks.nssc = i915->cdclk.hw.ref; + i915->display.dpll.ref_clks.nssc = i915->display.cdclk.hw.ref; } static void skl_dump_hw_state(struct drm_i915_private *dev_priv,
@@ -3967,7 +3967,7 @@ static void mg_pll_disable(struct drm_i915_private *dev_priv,static void icl_update_dpll_ref_clks (struct drm_i915_private *i915) {/* No SSC ref */ - i915->display.dpll.ref_clks.nssc = i915->cdclk.hw.ref; + i915->display.dpll.ref_clks.nssc = i915->display.cdclk.hw.ref; } static void icl_dump_hw_state(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/display/intel_modeset_setup.c +2 -2
@@ -32,7 +32,7 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,struct intel_bw_state *bw_state =to_intel_bw_state (i915->display.bw.obj.state);struct intel_cdclk_state *cdclk_state = -to_intel_cdclk_state (i915->cdclk.obj.state); +to_intel_cdclk_state (i915->display.cdclk.obj.state);struct intel_dbuf_state *dbuf_state =to_intel_dbuf_state (i915->dbuf.obj.state); struct intel_crtc_state *crtc_state =
@@ -415,7 +415,7 @@ static void readout_plane_state(struct drm_i915_private *i915)static void intel_modeset_readout_hw_state (struct drm_i915_private *i915) {struct intel_cdclk_state *cdclk_state = -to_intel_cdclk_state (i915->cdclk.obj.state); +to_intel_cdclk_state (i915->display.cdclk.obj.state);struct intel_dbuf_state *dbuf_state =to_intel_dbuf_state (i915->dbuf.obj.state);enum pipe pipe;
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +2 -2
@@ -504,8 +504,8 @@ void intel_gt_pm_frequency_dump(struct intel_gt *gt, struct drm_printer *p)drm_puts (p,"no P-state info available\n" ); } -drm_printf (p,"Current CD clock frequency: %d kHz\n" , i915->cdclk.hw.cdclk); -drm_printf (p,"Max CD clock frequency: %d kHz\n" , i915->max_cdclk_freq); +drm_printf (p,"Current CD clock frequency: %d kHz\n" , i915->display.cdclk.hw.cdclk); +drm_printf (p,"Max CD clock frequency: %d kHz\n" , i915->display.cdclk.max_cdclk_freq);drm_printf (p,"Max pixel clock frequency: %d kHz\n" , i915->max_dotclk_freq);intel_runtime_pm_put (uncore->rpm, wakeref);
drivers/gpu/drm/i915/i915_drv.h +0 -15
@@ -37,7 +37,6 @@#include <drm/drm_connector.h> #include <drm/ttm/ttm_device.h> -#include "display/intel_cdclk.h" #include "display/intel_display.h" #include "display/intel_display_core.h" #include "display/intel_display_power.h"
@@ -74,9 +73,6 @@struct drm_i915_clock_gating_funcs ;struct drm_i915_gem_object ;struct drm_i915_private ; -struct intel_cdclk_config ; -struct intel_cdclk_state ; -struct intel_cdclk_vals ;struct intel_connector ;struct intel_dp ;struct intel_encoder ;
@@ -338,23 +334,12 @@ struct drm_i915_private {unsigned int fsb_freq, mem_freq, is_ddr3;unsigned int skl_preferred_vco_freq; -unsigned int max_cdclk_freq;unsigned int max_dotclk_freq;unsigned int hpll_freq;unsigned int fdi_pll_freq;unsigned int czclk_freq; -struct { -/* The current hardware cdclk configuration */ -struct intel_cdclk_config hw; - -/* cdclk, divider, and ratio table from bspec */ -const struct intel_cdclk_vals *table; - -struct intel_global_obj obj; - } cdclk; -struct {/* The current hardware dbuf configuration */ u8 enabled_slices;
Signature · 1 line
2.34.1
PATCH v2 23/38 drm/i915: move mipi_mmio_base to display.dsi
In reply to Jani NikulaMove display DSI related members under drm_i915_private display sub-struct.
Prefer adding anonymous sub-structs even for single members that aren't our own structs.
Abstract mmio base member access in register definitions in a macro.
--- .../gpu/drm/i915/display/intel_display_core.h | 5 + drivers/gpu/drm/i915/display/vlv_dsi.c | 4 +- drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 188 +++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 3 - 4 files changed, 102 insertions(+), 98 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +5 -0
@@ -249,6 +249,11 @@ struct intel_display {unsigned int max_cdclk_freq; } cdclk; +struct { +/* VLV/CHV/BXT/GLK DSI MMIO register base address */ +u32 mmio_base; + } dsi; +struct {/* list of fbdev register on this device */ struct intel_fbdev *fbdev;
drivers/gpu/drm/i915/display/vlv_dsi.c +2 -2
@@ -1872,9 +1872,9 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)return ;if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) - dev_priv->mipi_mmio_base =BXT_MIPI_BASE ; + dev_priv->display.dsi.mmio_base =BXT_MIPI_BASE ;else - dev_priv->mipi_mmio_base =VLV_MIPI_BASE ; + dev_priv->display.dsi.mmio_base =VLV_MIPI_BASE ; intel_dsi =kzalloc (sizeof (*intel_dsi),GFP_KERNEL );if (!intel_dsi)
drivers/gpu/drm/i915/display/vlv_dsi_regs.h +95 -93
378 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -298,9 +298,6 @@ struct drm_i915_private {struct intel_wopcm wopcm; -/* MMIO base address for MIPI regs */ -u32 mipi_mmio_base; -struct pci_dev *bridge_dev;struct rb_root uabi_engines;
Signature · 1 line
2.34.1
PATCH v2 19/38 drm/i915: move and group max_bw and bw_obj under display.bw
In reply to Jani NikulaMove display bandwidth related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_bw.c | 42 +++++++++---------- .../gpu/drm/i915/display/intel_display_core.h | 21 ++++++++++ .../drm/i915/display/intel_modeset_setup.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 19 --------- 4 files changed, 44 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/display/intel_bw.c +21 -21
@@ -292,7 +292,7 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intelint ipqdepth, ipqdepthpch =16 ;int dclk_max;int maxdebw; -int num_groups =ARRAY_SIZE (dev_priv->max_bw); +int num_groups =ARRAY_SIZE (dev_priv->display.bw.max);int i, ret; ret =icl_get_qgv_points (dev_priv, &qi, is_y_tile);
@@ -308,7 +308,7 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel qi.deinterleave =DIV_ROUND_UP (num_channels, is_y_tile ?4 :2 );for (i =0 ; i < num_groups; i++) { -struct intel_bw_info *bi = &dev_priv->max_bw[i]; +struct intel_bw_info *bi = &dev_priv->display.bw.max[i];int clpchgroup;int j;
@@ -363,7 +363,7 @@ static int tgl_get_bw_info(struct drm_i915_private *dev_priv, const struct intelint dclk_max;int maxdebw, peakbw;int clperchgroup; -int num_groups =ARRAY_SIZE (dev_priv->max_bw); +int num_groups =ARRAY_SIZE (dev_priv->display.bw.max);int i, ret; ret =icl_get_qgv_points (dev_priv, &qi, is_y_tile);
@@ -399,13 +399,13 @@ static int tgl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel clperchgroup =4 *DIV_ROUND_UP (8 , num_channels) * qi.deinterleave;for (i =0 ; i < num_groups; i++) { -struct intel_bw_info *bi = &dev_priv->max_bw[i]; +struct intel_bw_info *bi = &dev_priv->display.bw.max[i];struct intel_bw_info *bi_next;int clpchgroup;int j;if (i < num_groups -1 ) - bi_next = &dev_priv->max_bw[i +1 ]; + bi_next = &dev_priv->display.bw.max[i +1 ]; clpchgroup = (sa->deburst * qi.deinterleave / num_channels) << i;
@@ -466,7 +466,7 @@ static int tgl_get_bw_info(struct drm_i915_private *dev_priv, const struct intelstatic void dg2_get_bw_info (struct drm_i915_private *i915) {unsigned int deratedbw =IS_DG2_G11 (i915) ?38000 :50000 ; -int num_groups =ARRAY_SIZE (i915->max_bw); +int num_groups =ARRAY_SIZE (i915->display.bw.max);int i;/*
@@ -477,7 +477,7 @@ static void dg2_get_bw_info(struct drm_i915_private *i915)* whereas DG2-G11 platforms have 38 GB/s. */ for (i =0 ; i < num_groups; i++) { -struct intel_bw_info *bi = &i915->max_bw[i]; +struct intel_bw_info *bi = &i915->display.bw.max[i]; bi->num_planes =1 ;/* Need only one dummy QGV point per group */
@@ -498,9 +498,9 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv,*/ num_planes =max (1 , num_planes); -for (i =0 ; i <ARRAY_SIZE (dev_priv->max_bw); i++) { +for (i =0 ; i <ARRAY_SIZE (dev_priv->display.bw.max); i++) {const struct intel_bw_info *bi = - &dev_priv->max_bw[i]; + &dev_priv->display.bw.max[i];/* * Pcode will not expose all QGV points when
@@ -526,9 +526,9 @@ static unsigned int tgl_max_bw(struct drm_i915_private *dev_priv,*/ num_planes =max (1 , num_planes); -for (i =ARRAY_SIZE (dev_priv->max_bw) -1 ; i >=0 ; i--) { +for (i =ARRAY_SIZE (dev_priv->display.bw.max) -1 ; i >=0 ; i--) {const struct intel_bw_info *bi = - &dev_priv->max_bw[i]; + &dev_priv->display.bw.max[i];/* * Pcode will not expose all QGV points when
@@ -541,14 +541,14 @@ static unsigned int tgl_max_bw(struct drm_i915_private *dev_priv,return bi->deratedbw[qgv_point]; } -return dev_priv->max_bw[0 ].deratedbw[qgv_point]; +return dev_priv->display.bw.max[0 ].deratedbw[qgv_point]; }static unsigned int adl_psf_bw (struct drm_i915_private *dev_priv,int psf_gv_point) {const struct intel_bw_info *bi = - &dev_priv->max_bw[0 ]; + &dev_priv->display.bw.max[0 ];return bi->psf_bw[psf_gv_point]; }
@@ -667,7 +667,7 @@ intel_atomic_get_old_bw_state(struct intel_atomic_state *state)struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_global_state *bw_state; - bw_state =intel_atomic_get_old_global_obj_state (state, &dev_priv->bw_obj); + bw_state =intel_atomic_get_old_global_obj_state (state, &dev_priv->display.bw.obj);return to_intel_bw_state (bw_state); }
@@ -678,7 +678,7 @@ intel_atomic_get_new_bw_state(struct intel_atomic_state *state)struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_global_state *bw_state; - bw_state =intel_atomic_get_new_global_obj_state (state, &dev_priv->bw_obj); + bw_state =intel_atomic_get_new_global_obj_state (state, &dev_priv->display.bw.obj);return to_intel_bw_state (bw_state); }
@@ -689,7 +689,7 @@ intel_atomic_get_bw_state(struct intel_atomic_state *state)struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_global_state *bw_state; - bw_state =intel_atomic_get_global_obj_state (state, &dev_priv->bw_obj); + bw_state =intel_atomic_get_global_obj_state (state, &dev_priv->display.bw.obj);if (IS_ERR (bw_state))return ERR_CAST (bw_state);
@@ -896,8 +896,8 @@ int intel_bw_calc_min_cdclk(struct intel_atomic_state *state,static u16 icl_qgv_points_mask (struct drm_i915_private *i915) { -unsigned int num_psf_gv_points = i915->max_bw[0 ].num_psf_gv_points; -unsigned int num_qgv_points = i915->max_bw[0 ].num_qgv_points; +unsigned int num_psf_gv_points = i915->display.bw.max[0 ].num_psf_gv_points; +unsigned int num_qgv_points = i915->display.bw.max[0 ].num_qgv_points;u16 qgv_points =0 , psf_points =0 ;/*
@@ -970,8 +970,8 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)int i, ret;u16 qgv_points =0 , psf_points =0 ;unsigned int max_bw_point =0 , max_bw =0 ; -unsigned int num_qgv_points = dev_priv->max_bw[0 ].num_qgv_points; -unsigned int num_psf_gv_points = dev_priv->max_bw[0 ].num_psf_gv_points; +unsigned int num_qgv_points = dev_priv->display.bw.max[0 ].num_qgv_points; +unsigned int num_psf_gv_points = dev_priv->display.bw.max[0 ].num_psf_gv_points;bool changed = false;/* FIXME earlier gens need some checks too */
@@ -1126,7 +1126,7 @@ int intel_bw_init(struct drm_i915_private *dev_priv)if (!state)return -ENOMEM ; -intel_atomic_global_obj_init (dev_priv, &dev_priv->bw_obj, +intel_atomic_global_obj_init (dev_priv, &dev_priv->display.bw.obj, &state->base, &intel_bw_funcs);return 0 ;
drivers/gpu/drm/i915/display/intel_display_core.h +21 -0
@@ -14,6 +14,7 @@#include "intel_display.h" #include "intel_dmc.h" #include "intel_dpll_mgr.h" +#include "intel_global_state.h" #include "intel_gmbus.h" #include "intel_pm_types.h"
@@ -34,6 +35,12 @@ struct intel_hotplug_funcs;struct intel_initial_plane_config ;struct intel_overlay ; +/* Amount of SAGV/QGV points, BSpec precisely defines this */ +#define I915_NUM_QGV_POINTS 8 + +/* Amount of PSF GV points, BSpec precisely defines this */ +#define I915_NUM_PSF_GV_POINTS 3 +struct intel_display_funcs {/* * Returns the active state of the crtc, and if the crtc is active,
@@ -208,6 +215,20 @@ struct intel_display { } funcs;/* Grouping using anonymous structs. Keep sorted. */ +struct { +struct intel_global_obj obj; + +struct intel_bw_info { +/* for each QGV point */ +unsigned int deratedbw[I915_NUM_QGV_POINTS ]; +/* for each PSF GV point */ +unsigned int psf_bw[I915_NUM_PSF_GV_POINTS ]; +u8 num_qgv_points; +u8 num_psf_gv_points; +u8 num_planes; + } max[6 ]; + } bw; +struct {/* list of fbdev register on this device */ struct intel_fbdev *fbdev;
drivers/gpu/drm/i915/display/intel_modeset_setup.c +2 -2
@@ -30,7 +30,7 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,struct intel_encoder *encoder;struct drm_i915_private *i915 =to_i915 (crtc->base.dev);struct intel_bw_state *bw_state = -to_intel_bw_state (i915->bw_obj.state); +to_intel_bw_state (i915->display.bw.obj.state);struct intel_cdclk_state *cdclk_state =to_intel_cdclk_state (i915->cdclk.obj.state); struct intel_dbuf_state *dbuf_state =
@@ -535,7 +535,7 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915)for_each_intel_crtc (&i915->drm, crtc) {struct intel_bw_state *bw_state = -to_intel_bw_state (i915->bw_obj.state); +to_intel_bw_state (i915->display.bw.obj.state);struct intel_crtc_state *crtc_state =to_intel_crtc_state (crtc->base.state);struct intel_plane *plane;
drivers/gpu/drm/i915/i915_drv.h +0 -19
@@ -44,7 +44,6 @@#include "display/intel_dsb.h" #include "display/intel_fbc.h" #include "display/intel_frontbuffer.h" -#include "display/intel_global_state.h" #include "display/intel_opregion.h" #include "gem/i915_gem_context_types.h"
@@ -203,14 +202,8 @@ i915_fence_timeout(const struct drm_i915_private *i915)return i915_fence_context_timeout (i915,U64_MAX ); } -/* Amount of SAGV/QGV points, BSpec precisely defines this */ -#define I915_NUM_QGV_POINTS 8 -#define HAS_HW_SAGV_WM (i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915)) -/* Amount of PSF GV points, BSpec precisely defines this */ -#define I915_NUM_PSF_GV_POINTS 3 -struct intel_vbt_data {/* bdb version */ u16 version;
@@ -468,18 +461,6 @@ struct drm_i915_private {u8 num_psf_gv_points; } dram_info; -struct intel_bw_info { -/* for each QGV point */ -unsigned int deratedbw[I915_NUM_QGV_POINTS ]; -/* for each PSF GV point */ -unsigned int psf_bw[I915_NUM_PSF_GV_POINTS ]; -u8 num_qgv_points; -u8 num_psf_gv_points; -u8 num_planes; - } max_bw[6 ]; - -struct intel_global_obj bw_obj; -struct intel_runtime_pm runtime_pm;struct i915_perf perf;
Signature · 1 line
2.34.1
PATCH v2 15/38 drm/i915: move and group hdcp under display.hdcp
In reply to Jani NikulaMove display hdcp related members under drm_i915_private display sub-struct.
--- .../gpu/drm/i915/display/intel_display_core.h | 9 ++ drivers/gpu/drm/i915/display/intel_hdcp.c | 134 +++++++++--------- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 6 - 4 files changed, 77 insertions(+), 74 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +9 -0
@@ -19,6 +19,7 @@struct drm_i915_private ;struct i915_audio_component ; +struct i915_hdcp_comp_master ;struct intel_atomic_state ;struct intel_audio_funcs ;struct intel_cdclk_funcs ;
@@ -191,6 +192,14 @@ struct intel_display {wait_queue_head_t wait_queue; } gmbus; +struct { +struct i915_hdcp_comp_master *master; +bool comp_added; + +/* Mutex to protect the above hdcp component related values. */ +struct mutex comp_mutex; + } hdcp; +struct {u32 mmio_base;
drivers/gpu/drm/i915/display/intel_hdcp.c +67 -67
328 lines not on this page · raw message
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -338,7 +338,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)mutex_init (&dev_priv->display.audio.mutex);mutex_init (&dev_priv->display.wm.wm_mutex);mutex_init (&dev_priv->display.pps.mutex); -mutex_init (&dev_priv->hdcp_comp_mutex); +mutex_init (&dev_priv->display.hdcp.comp_mutex);i915_memcpy_init_early (dev_priv);intel_runtime_pm_init_early (&dev_priv->runtime_pm);
drivers/gpu/drm/i915/i915_drv.h +0 -6
@@ -592,12 +592,6 @@ struct drm_i915_private {struct i915_drm_clients clients; -struct i915_hdcp_comp_master *hdcp_master; -bool hdcp_comp_added; - -/* Mutex to protect the above hdcp component related values. */ -struct mutex hdcp_comp_mutex; -/* The TTM device structure. */ struct ttm_device bdev;
Signature · 1 line
2.34.1
PATCH v2 16/38 drm/i915: move hotplug to display.hotplug
In reply to Jani NikulaMove display hotplug related members under drm_i915_private display sub-struct.
Rename struct i915_hotplug to intel_hotplug while at it.
--- drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- .../gpu/drm/i915/display/intel_display_core.h | 40 ++++++ .../drm/i915/display/intel_display_debugfs.c | 16 +-- drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 116 +++++++++--------- drivers/gpu/drm/i915/display/intel_tc.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 6 +- drivers/gpu/drm/i915/i915_drv.h | 40 ------ drivers/gpu/drm/i915/i915_irq.c | 52 ++++---- 10 files changed, 144 insertions(+), 144 deletions(-)
drivers/gpu/drm/i915/display/g4x_dp.c +2 -2
@@ -1169,7 +1169,7 @@ intel_dp_hotplug(struct intel_encoder *encoder,static bool ibx_digital_port_connected (struct intel_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 bit = dev_priv->hotplug.pch_hpd[encoder->hpd_pin]; +u32 bit = dev_priv->display.hotplug.pch_hpd[encoder->hpd_pin];return intel_de_read (dev_priv,SDEISR ) & bit; }
@@ -1223,7 +1223,7 @@ static bool gm45_digital_port_connected(struct intel_encoder *encoder)static bool ilk_digital_port_connected (struct intel_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin]; +u32 bit = dev_priv->display.hotplug.hpd[encoder->hpd_pin];return intel_de_read (dev_priv,DEISR ) & bit; }
drivers/gpu/drm/i915/display/intel_ddi.c +3 -3
@@ -4038,7 +4038,7 @@ intel_ddi_hotplug(struct intel_encoder *encoder,static bool lpt_digital_port_connected (struct intel_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 bit = dev_priv->hotplug.pch_hpd[encoder->hpd_pin]; +u32 bit = dev_priv->display.hotplug.pch_hpd[encoder->hpd_pin];return intel_de_read (dev_priv,SDEISR ) & bit; }
@@ -4046,7 +4046,7 @@ static bool lpt_digital_port_connected(struct intel_encoder *encoder)static bool hsw_digital_port_connected (struct intel_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin]; +u32 bit = dev_priv->display.hotplug.hpd[encoder->hpd_pin];return intel_de_read (dev_priv,DEISR ) & bit; }
@@ -4054,7 +4054,7 @@ static bool hsw_digital_port_connected(struct intel_encoder *encoder)static bool bdw_digital_port_connected (struct intel_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin]; +u32 bit = dev_priv->display.hotplug.hpd[encoder->hpd_pin];return intel_de_read (dev_priv,GEN8_DE_PORT_ISR ) & bit; }
drivers/gpu/drm/i915/display/intel_display_core.h +40 -0
@@ -103,6 +103,45 @@ struct intel_dpll { } ref_clks; }; +struct intel_hotplug { +struct delayed_work hotplug_work; + +const u32 *hpd, *pch_hpd; + +struct { +unsigned long last_jiffies; +int count; +enum { +HPD_ENABLED =0 , +HPD_DISABLED =1 , +HPD_MARK_DISABLED =2 + } state; + } stats[HPD_NUM_PINS ]; +u32 event_bits; +u32 retry_bits; +struct delayed_work reenable_work; + +u32 long_port_mask; +u32 short_port_mask; +struct work_struct dig_port_work; + +struct work_struct poll_init_work; +bool poll_enabled; + +unsigned int hpd_storm_threshold; +/* Whether or not to count short HPD IRQs in HPD storms */ +u8 hpd_short_storm_enabled; + +/* +* if we get a HPD irq from DP and a HPD irq from non-DP +* the non-DP HPD could block the workqueue on a mode config +* mutex getting, that userspace may have taken. However +* userspace is waiting on the DP workqueue to run which is +* blocked behind the non-DP one. +*/ +struct workqueue_struct *dp_wq; +}; +struct intel_wm {/* * Raw watermark latency values:
@@ -211,6 +250,7 @@ struct intel_display {struct intel_audio audio;struct intel_dmc dmc;struct intel_dpll dpll; +struct intel_hotplug hotplug;struct intel_wm wm; };
drivers/gpu/drm/i915/display/intel_display_debugfs.c +8 -8
@@ -1618,14 +1618,14 @@ static const struct file_operations i915_cur_wm_latency_fops = {static int i915_hpd_storm_ctl_show (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv = m->private; -struct i915_hotplug *hotplug = &dev_priv->hotplug; +struct intel_hotplug *hotplug = &dev_priv->display.hotplug;/* Synchronize with everything first in case there's been an HPD * storm, but we haven't finished handling it in the kernel yet */ intel_synchronize_irq (dev_priv); -flush_work (&dev_priv->hotplug.dig_port_work); -flush_delayed_work (&dev_priv->hotplug.hotplug_work); +flush_work (&dev_priv->display.hotplug.dig_port_work); +flush_delayed_work (&dev_priv->display.hotplug.hotplug_work);seq_printf (m,"Threshold: %d\n" , hotplug->hpd_storm_threshold); seq_printf(m, "Detected: %s\n",
@@ -1640,7 +1640,7 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file, {struct seq_file *m = file->private_data;struct drm_i915_private *dev_priv = m->private; -struct i915_hotplug *hotplug = &dev_priv->hotplug; +struct intel_hotplug *hotplug = &dev_priv->display.hotplug;unsigned int new_threshold;int i;char *newline;
@@ -1679,7 +1679,7 @@ static ssize_t i915_hpd_storm_ctl_write(struct file *file,spin_unlock_irq (&dev_priv->irq_lock);/* Re-enable hpd immediately if we were in an irq storm */ -flush_delayed_work (&dev_priv->hotplug.reenable_work); +flush_delayed_work (&dev_priv->display.hotplug.reenable_work);return len; }
@@ -1703,7 +1703,7 @@ static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data)struct drm_i915_private *dev_priv = m->private;seq_printf (m,"Enabled: %s\n" , -str_yes_no (dev_priv->hotplug.hpd_short_storm_enabled)); +str_yes_no (dev_priv->display.hotplug.hpd_short_storm_enabled));return 0 ; }
@@ -1721,7 +1721,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file, {struct seq_file *m = file->private_data;struct drm_i915_private *dev_priv = m->private; -struct i915_hotplug *hotplug = &dev_priv->hotplug; +struct intel_hotplug *hotplug = &dev_priv->display.hotplug;char *newline;char tmp[16 ];int i;
@@ -1757,7 +1757,7 @@ static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,spin_unlock_irq (&dev_priv->irq_lock);/* Re-enable hpd immediately if we were in an irq storm */ -flush_delayed_work (&dev_priv->hotplug.reenable_work); +flush_delayed_work (&dev_priv->display.hotplug.reenable_work);return len; }
drivers/gpu/drm/i915/display/intel_dp.c +2 -2
@@ -5042,9 +5042,9 @@ static void intel_dp_oob_hotplug_event(struct drm_connector *connector)struct drm_i915_private *i915 =to_i915 (connector->dev);spin_lock_irq (&i915->irq_lock); - i915->hotplug.event_bits |=BIT (encoder->hpd_pin); + i915->display.hotplug.event_bits |=BIT (encoder->hpd_pin);spin_unlock_irq (&i915->irq_lock); -queue_delayed_work (system_wq, &i915->hotplug.hotplug_work,0 ); +queue_delayed_work (system_wq, &i915->display.hotplug.hotplug_work,0 ); }static const struct drm_connector_funcs intel_dp_connector_funcs = {
drivers/gpu/drm/i915/display/intel_hotplug.c +58 -58
320 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_tc.c +2 -2
@@ -246,7 +246,7 @@ static u32 icl_tc_port_live_status_mask(struct intel_digital_port *dig_port) {struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);struct intel_uncore *uncore = &i915->uncore; -u32 isr_bit = i915->hotplug.pch_hpd[dig_port->base.hpd_pin]; +u32 isr_bit = i915->display.hotplug.pch_hpd[dig_port->base.hpd_pin];u32 mask =0 ;u32 val;
@@ -279,7 +279,7 @@ static u32 adl_tc_port_live_status_mask(struct intel_digital_port *dig_port) {struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);enum tc_port tc_port =intel_port_to_tc (i915, dig_port->base.port); -u32 isr_bit = i915->hotplug.pch_hpd[dig_port->base.hpd_pin]; +u32 isr_bit = i915->display.hotplug.pch_hpd[dig_port->base.hpd_pin];struct intel_uncore *uncore = &i915->uncore;u32 val, mask =0 ;
drivers/gpu/drm/i915/i915_driver.c +3 -3
@@ -252,8 +252,8 @@ static int i915_workqueues_init(struct drm_i915_private *dev_priv)if (dev_priv->wq ==NULL ) goto out_err; - dev_priv->hotplug.dp_wq =alloc_ordered_workqueue ("i915-dp" ,0 ); -if (dev_priv->hotplug.dp_wq ==NULL ) + dev_priv->display.hotplug.dp_wq =alloc_ordered_workqueue ("i915-dp" ,0 ); +if (dev_priv->display.hotplug.dp_wq ==NULL ) goto out_free_wq;return 0 ;
@@ -268,7 +268,7 @@ static int i915_workqueues_init(struct drm_i915_private *dev_priv)static void i915_workqueues_cleanup (struct drm_i915_private *dev_priv) { -destroy_workqueue (dev_priv->hotplug.dp_wq); +destroy_workqueue (dev_priv->display.hotplug.dp_wq);destroy_workqueue (dev_priv->wq); }
drivers/gpu/drm/i915/i915_drv.h +0 -40
@@ -90,45 +90,6 @@ struct vlv_s0ix_state;/* Threshold == 5 for long IRQs, 50 for short */ #define HPD_STORM_DEFAULT_THRESHOLD 50 -struct i915_hotplug { -struct delayed_work hotplug_work; - -const u32 *hpd, *pch_hpd; - -struct { -unsigned long last_jiffies; -int count; -enum { -HPD_ENABLED =0 , -HPD_DISABLED =1 , -HPD_MARK_DISABLED =2 - } state; - } stats[HPD_NUM_PINS ]; -u32 event_bits; -u32 retry_bits; -struct delayed_work reenable_work; - -u32 long_port_mask; -u32 short_port_mask; -struct work_struct dig_port_work; - -struct work_struct poll_init_work; -bool poll_enabled; - -unsigned int hpd_storm_threshold; -/* Whether or not to count short HPD IRQs in HPD storms */ -u8 hpd_short_storm_enabled; - -/* -* if we get a HPD irq from DP and a HPD irq from non-DP -* the non-DP HPD could block the workqueue on a mode config -* mutex getting, that userspace may have taken. However -* userspace is waiting on the DP workqueue to run which is -* blocked behind the non-DP one. -*/ -struct workqueue_struct *dp_wq; -}; -#define I915_GEM_GPU_DOMAINS \ (I915_GEM_DOMAIN_RENDER | \ I915_GEM_DOMAIN_SAMPLER | \
@@ -376,7 +337,6 @@ struct drm_i915_private { };u32 pipestat_irq_mask[I915_MAX_PIPES ]; -struct i915_hotplug hotplug;struct intel_fbc *fbc[I915_MAX_FBCS ];struct intel_opregion opregion;struct intel_vbt_data vbt;
drivers/gpu/drm/i915/i915_irq.c +26 -26
172 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 20/38 drm/i915: move opregion to display.opregion
In reply to Jani NikulaMove display opregion related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_bios.c | 4 +- .../gpu/drm/i915/display/intel_display_core.h | 2 + .../drm/i915/display/intel_display_debugfs.c | 6 ++- drivers/gpu/drm/i915/display/intel_opregion.c | 42 +++++++++---------- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 2 +- 6 files changed, 30 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.c +2 -2
@@ -3080,7 +3080,7 @@ static struct vbt_header *oprom_get_vbt(struct drm_i915_private *i915)*/ void intel_bios_init (struct drm_i915_private *i915) { -const struct vbt_header *vbt = i915->opregion.vbt; +const struct vbt_header *vbt = i915->display.opregion.vbt;struct vbt_header *oprom_vbt =NULL ;const struct bdb_header *bdb;
@@ -3287,7 +3287,7 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *i915, u8 *i2c_pin)* additional data. Trust that if the VBT was written into * the OpRegion then they have validated the LVDS's existence. */ -if (i915->opregion.vbt) +if (i915->display.opregion.vbt)return true; }
drivers/gpu/drm/i915/display/intel_display_core.h +2 -0
@@ -16,6 +16,7 @@#include "intel_dpll_mgr.h" #include "intel_global_state.h" #include "intel_gmbus.h" +#include "intel_opregion.h" #include "intel_pm_types.h" struct drm_i915_private ;
@@ -284,6 +285,7 @@ struct intel_display {struct intel_dmc dmc;struct intel_dpll dpll;struct intel_hotplug hotplug; +struct intel_opregion opregion;struct intel_overlay *overlay;struct intel_wm wm; };
drivers/gpu/drm/i915/display/intel_display_debugfs.c +4 -2
@@ -103,7 +103,8 @@ static int i915_sr_status(struct seq_file *m, void *unused)static int i915_opregion (struct seq_file *m,void *unused) { -struct intel_opregion *opregion = &node_to_i915 (m->private)->opregion; +struct drm_i915_private *i915 =node_to_i915 (m->private); +struct intel_opregion *opregion = &i915->display.opregion;if (opregion->header)seq_write (m, opregion->header,OPREGION_SIZE );
@@ -113,7 +114,8 @@ static int i915_opregion(struct seq_file *m, void *unused)static int i915_vbt (struct seq_file *m,void *unused) { -struct intel_opregion *opregion = &node_to_i915 (m->private)->opregion; +struct drm_i915_private *i915 =node_to_i915 (m->private); +struct intel_opregion *opregion = &i915->display.opregion;if (opregion->vbt)seq_write (m, opregion->vbt, opregion->vbt_size);
drivers/gpu/drm/i915/display/intel_opregion.c +21 -21
153 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -44,7 +44,6 @@#include "display/intel_dsb.h" #include "display/intel_fbc.h" #include "display/intel_frontbuffer.h" -#include "display/intel_opregion.h" #include "gem/i915_gem_context_types.h" #include "gem/i915_gem_lmem.h"
@@ -330,7 +329,6 @@ struct drm_i915_private {u32 pipestat_irq_mask[I915_MAX_PIPES ];struct intel_fbc *fbc[I915_MAX_FBCS ]; -struct intel_opregion opregion;struct intel_vbt_data vbt;bool preserve_bios_swizzle;
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -595,7 +595,7 @@ void i915_disable_pipestat(struct drm_i915_private *dev_priv,static bool i915_has_asle (struct drm_i915_private *dev_priv) { -if (!dev_priv->opregion.asle) +if (!dev_priv->display.opregion.asle)return false;return IS_PINEVIEW (dev_priv) ||IS_MOBILE (dev_priv);
Signature · 1 line
2.34.1
PATCH v2 10/38 drm/i915: move dmc to display.dmc
In reply to Jani NikulaMove display dmc related members under drm_i915_private display sub-struct.
--- .../gpu/drm/i915/display/intel_display_core.h | 4 ++ .../drm/i915/display/intel_display_power.c | 18 +++---- .../i915/display/intel_display_power_well.c | 18 +++---- drivers/gpu/drm/i915/display/intel_dmc.c | 52 +++++++++---------- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 -- 6 files changed, 49 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +4 -0
@@ -10,6 +10,7 @@#include <linux/types.h> #include <linux/wait.h> +#include "intel_dmc.h" #include "intel_gmbus.h" struct drm_i915_private ;
@@ -106,6 +107,9 @@ struct intel_display {/* protects panel power sequencer state */ struct mutex mutex; } pps; + +/* Grouping using named structs. Keep sorted. */ +struct intel_dmc dmc; };#endif /* __INTEL_DISPLAY_CORE_H__ */
drivers/gpu/drm/i915/display/intel_display_power.c +9 -9
@@ -269,7 +269,7 @@ sanitize_target_dc_state(struct drm_i915_private *dev_priv,if (target_dc_state != states[i])continue ; -if (dev_priv->dmc.allowed_dc_mask & target_dc_state) +if (dev_priv->display.dmc.allowed_dc_mask & target_dc_state)break ; target_dc_state = states[i +1 ];
@@ -302,7 +302,7 @@ void intel_display_power_set_target_dc_state(struct drm_i915_private *dev_priv, state =sanitize_target_dc_state (dev_priv, state); -if (state == dev_priv->dmc.target_dc_state) +if (state == dev_priv->display.dmc.target_dc_state) goto unlock; dc_off_enabled =intel_power_well_is_enabled (dev_priv, power_well);
@@ -313,7 +313,7 @@ void intel_display_power_set_target_dc_state(struct drm_i915_private *dev_priv,if (!dc_off_enabled)intel_power_well_enable (dev_priv, power_well); - dev_priv->dmc.target_dc_state = state; + dev_priv->display.dmc.target_dc_state = state;if (!dc_off_enabled)intel_power_well_disable (dev_priv, power_well);
@@ -982,10 +982,10 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) dev_priv->params.disable_power_well =sanitize_disable_power_well_option (dev_priv, dev_priv->params.disable_power_well); - dev_priv->dmc.allowed_dc_mask = + dev_priv->display.dmc.allowed_dc_mask =get_allowed_dc_mask (dev_priv, dev_priv->params.enable_dc); - dev_priv->dmc.target_dc_state = + dev_priv->display.dmc.target_dc_state =sanitize_target_dc_state (dev_priv,DC_STATE_EN_UPTO_DC6 );mutex_init (&power_domains->lock);
@@ -2043,7 +2043,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915,* resources as required and also enable deeper system power states * that would be blocked if the firmware was inactive. */ -if (!(i915->dmc.allowed_dc_mask &DC_STATE_EN_DC9 ) && +if (!(i915->display.dmc.allowed_dc_mask &DC_STATE_EN_DC9 ) && suspend_mode ==I915_DRM_SUSPEND_IDLE &&intel_dmc_has_payload (i915)) {intel_display_power_flush_work (i915);
@@ -2236,10 +2236,10 @@ void intel_display_power_resume(struct drm_i915_private *i915)bxt_disable_dc9 (i915);icl_display_core_init (i915, true);if (intel_dmc_has_payload (i915)) { -if (i915->dmc.allowed_dc_mask & +if (i915->display.dmc.allowed_dc_mask &DC_STATE_EN_UPTO_DC6 )skl_enable_dc6 (i915); -else if (i915->dmc.allowed_dc_mask & +else if (i915->display.dmc.allowed_dc_mask &DC_STATE_EN_UPTO_DC5 )gen9_enable_dc5 (i915); }
@@ -2247,7 +2247,7 @@ void intel_display_power_resume(struct drm_i915_private *i915)bxt_disable_dc9 (i915);bxt_display_core_init (i915, true);if (intel_dmc_has_payload (i915) && - (i915->dmc.allowed_dc_mask &DC_STATE_EN_UPTO_DC5 )) + (i915->display.dmc.allowed_dc_mask &DC_STATE_EN_UPTO_DC5 ))gen9_enable_dc5 (i915); }else if (IS_HASWELL (i915) ||IS_BROADWELL (i915)) {hsw_disable_pc8 (i915);
drivers/gpu/drm/i915/display/intel_display_power_well.c +9 -9
@@ -711,8 +711,8 @@ void gen9_sanitize_dc_state(struct drm_i915_private *dev_priv)drm_dbg_kms (&dev_priv->drm,"Resetting DC state tracking from %02x to %02x\n" , - dev_priv->dmc.dc_state, val); - dev_priv->dmc.dc_state = val; + dev_priv->display.dmc.dc_state, val); + dev_priv->display.dmc.dc_state = val; }/**
@@ -747,8 +747,8 @@ void gen9_set_dc_state(struct drm_i915_private *dev_priv, u32 state)return ;if (drm_WARN_ON_ONCE (&dev_priv->drm, - state & ~dev_priv->dmc.allowed_dc_mask)) - state &= dev_priv->dmc.allowed_dc_mask; + state & ~dev_priv->display.dmc.allowed_dc_mask)) + state &= dev_priv->display.dmc.allowed_dc_mask; val =intel_de_read (dev_priv,DC_STATE_EN ); mask =gen9_dc_mask (dev_priv);
@@ -756,16 +756,16 @@ void gen9_set_dc_state(struct drm_i915_private *dev_priv, u32 state) val & mask, state);/* Check if DMC is ignoring our DC state requests */ -if ((val & mask) != dev_priv->dmc.dc_state) +if ((val & mask) != dev_priv->display.dmc.dc_state)drm_err (&dev_priv->drm,"DC state mismatch (0x%x -> 0x%x)\n" , - dev_priv->dmc.dc_state, val & mask); + dev_priv->display.dmc.dc_state, val & mask); val &= ~mask; val |= state;gen9_write_dc_state (dev_priv, val); - dev_priv->dmc.dc_state = val & mask; + dev_priv->display.dmc.dc_state = val & mask; }static void tgl_enable_dc3co (struct drm_i915_private *dev_priv)
@@ -959,7 +959,7 @@ void gen9_disable_dc_states(struct drm_i915_private *dev_priv) {struct intel_cdclk_config cdclk_config = {}; -if (dev_priv->dmc.target_dc_state ==DC_STATE_EN_DC3CO ) { +if (dev_priv->display.dmc.target_dc_state ==DC_STATE_EN_DC3CO ) {tgl_disable_dc3co (dev_priv);return ; }
@@ -1001,7 +1001,7 @@ static void gen9_dc_off_power_well_disable(struct drm_i915_private *dev_priv,if (!intel_dmc_has_payload (dev_priv))return ; -switch (dev_priv->dmc.target_dc_state) { +switch (dev_priv->display.dmc.target_dc_state) {case DC_STATE_EN_DC3CO :tgl_enable_dc3co (dev_priv);break ;
drivers/gpu/drm/i915/display/intel_dmc.c +26 -26
181 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_psr.c +1 -1
@@ -706,7 +706,7 @@ tgl_dc3co_exitline_compute_config(struct intel_dp *intel_dp,if (crtc_state->enable_psr2_sel_fetch)return ; -if (!(dev_priv->dmc.allowed_dc_mask &DC_STATE_EN_DC3CO )) +if (!(dev_priv->display.dmc.allowed_dc_mask &DC_STATE_EN_DC3CO ))return ;if (!dc3co_is_pipe_port_compatible (intel_dp, crtc_state))
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -41,7 +41,6 @@#include "display/intel_display.h" #include "display/intel_display_core.h" #include "display/intel_display_power.h" -#include "display/intel_dmc.h" #include "display/intel_dpll_mgr.h" #include "display/intel_dsb.h" #include "display/intel_fbc.h"
@@ -379,8 +378,6 @@ struct drm_i915_private {struct intel_wopcm wopcm; -struct intel_dmc dmc; -/* MMIO base address for MIPI regs */ u32 mipi_mmio_base;
Signature · 1 line
2.34.1
PATCH v2 25/38 drm/i915: move fbc to display.fbc
In reply to Jani NikulaMove display FBC related members under drm_i915_private display sub-struct.
Pointers and arrays of pointers to structs that we defined are fine without a sub-struct wrapping.
--- drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- drivers/gpu/drm/i915/display/intel_display_core.h | 2 ++ drivers/gpu/drm/i915/display/intel_fbc.c | 6 +++--- drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 --- 5 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/i9xx_plane.c +1 -1
@@ -125,7 +125,7 @@ static struct intel_fbc *i9xx_plane_fbc(struct drm_i915_private *dev_priv, enum i9xx_plane_id i9xx_plane) {if (i9xx_plane_has_fbc (dev_priv, i9xx_plane)) -return dev_priv->fbc[INTEL_FBC_A ]; +return dev_priv->display.fbc[INTEL_FBC_A ];else return NULL ; }
drivers/gpu/drm/i915/display/intel_display_core.h +2 -0
@@ -18,6 +18,7 @@#include "intel_display.h" #include "intel_dmc.h" #include "intel_dpll_mgr.h" +#include "intel_fbc.h" #include "intel_global_state.h" #include "intel_gmbus.h" #include "intel_opregion.h"
@@ -345,6 +346,7 @@ struct intel_display {struct intel_audio audio;struct intel_dmc dmc;struct intel_dpll dpll; +struct intel_fbc *fbc[I915_MAX_FBCS ];struct intel_hotplug hotplug;struct intel_opregion opregion;struct intel_overlay *overlay;
drivers/gpu/drm/i915/display/intel_fbc.c +3 -3
@@ -59,7 +59,7 @@#define for_each_intel_fbc (__dev_priv, __fbc, __fbc_id) \ for_each_fbc_id((__dev_priv), (__fbc_id)) \ - for_each_if((__fbc) = (__dev_priv)->fbc[(__fbc_id)]) + for_each_if((__fbc) = (__dev_priv)->display.fbc[(__fbc_id)])struct intel_fbc_funcs {void (*activate)(struct intel_fbc *fbc);
@@ -1720,7 +1720,7 @@ void intel_fbc_init(struct drm_i915_private *i915) i915->params.enable_fbc);for_each_fbc_id (i915, fbc_id) - i915->fbc[fbc_id] =intel_fbc_create (i915, fbc_id); + i915->display.fbc[fbc_id] =intel_fbc_create (i915, fbc_id); }/**
@@ -1840,7 +1840,7 @@ void intel_fbc_debugfs_register(struct drm_i915_private *i915)struct drm_minor *minor = i915->drm.primary;struct intel_fbc *fbc; - fbc = i915->fbc[INTEL_FBC_A ]; + fbc = i915->display.fbc[INTEL_FBC_A ];if (fbc)intel_fbc_debugfs_add (fbc, minor->debugfs_root); }
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -1
@@ -1940,7 +1940,7 @@ static struct intel_fbc *skl_plane_fbc(struct drm_i915_private *dev_priv,enum intel_fbc_id fbc_id =skl_fbc_id_for_pipe (pipe);if (skl_plane_has_fbc (dev_priv, fbc_id, plane_id)) -return dev_priv->fbc[fbc_id]; +return dev_priv->display.fbc[fbc_id];else return NULL ; }
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -40,7 +40,6 @@#include "display/intel_display_core.h" #include "display/intel_display_power.h" #include "display/intel_dsb.h" -#include "display/intel_fbc.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_context_types.h"
@@ -285,8 +284,6 @@ struct drm_i915_private { };u32 pipestat_irq_mask[I915_MAX_PIPES ]; -struct intel_fbc *fbc[I915_MAX_FBCS ]; -bool preserve_bios_swizzle;unsigned int fsb_freq, mem_freq, is_ddr3;
Signature · 1 line
2.34.1
PATCH v2 26/38 drm/i915/vrr: drop window2_delay member from i915
In reply to Jani NikulaThe window2_delay member has been functionally unused (always set to 0) since it was added in commit bb265dbdf38d ("drm/i915/xelpd: Add VRR guardband for VRR CTL"). Replace it with a FIXME comment.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 -- drivers/gpu/drm/i915/display/intel_vrr.c | 14 ++++++++++---- drivers/gpu/drm/i915/i915_drv.h | 3 --- 3 files changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -2
@@ -8690,8 +8690,6 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) i915->flip_wq =alloc_workqueue ("i915_flip" ,WQ_HIGHPRI |WQ_UNBOUND ,WQ_UNBOUND_MAX_ACTIVE ); - i915->window2_delay =0 ;/* No DSB so no window2 delay */ -intel_mode_config_init (i915); ret =intel_cdclk_init (i915);
drivers/gpu/drm/i915/display/intel_vrr.c +10 -4
@@ -142,11 +142,16 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,* For XE_LPD+, we use guardband and pipeline override * is deprecated. */ -if (DISPLAY_VER (i915) >=13 ) +if (DISPLAY_VER (i915) >=13 ) { +/* +* FIXME: Subtract Window2 delay from below value. +* +* Window2 specifies time required to program DSB (Window2) in +* number of scan lines. Assuming 0 for no DSB. +*/ crtc_state->vrr.guardband = - crtc_state->vrr.vmin - adjusted_mode->crtc_vdisplay - - i915->window2_delay; -else + crtc_state->vrr.vmin - adjusted_mode->crtc_vdisplay; + }else {/* * FIXME: s/4/framestart_delay/ to get consistent * earliest/latest points for register latching regardless
@@ -159,6 +164,7 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,*/ crtc_state->vrr.pipeline_full =min (255 , crtc_state->vrr.vmin - adjusted_mode->crtc_vdisplay -4 -1 ); + } crtc_state->mode_flags |=I915_MODE_FLAG_VRR ; }
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -430,9 +430,6 @@ struct drm_i915_private {struct file *mmap_singleton; } gem; -/* Window2 specifies time required to program DSB (Window2) in number of scan lines */ -u8 window2_delay; -u8 pch_ssc_use;/* For i915gm/i945gm vblank irq workaround */
Signature · 1 line
2.34.1
PATCH v2 24/38 drm/i915: move vbt to display.vbt
In reply to Jani NikulaMove display VBT related members under drm_i915_private display sub-struct.
v2: Rebase
--- drivers/gpu/drm/i915/display/intel_bios.c | 212 +++++++++--------- drivers/gpu/drm/i915/display/intel_crt.c | 4 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../gpu/drm/i915/display/intel_display_core.h | 38 ++++ drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll.c | 14 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 18 +- drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- drivers/gpu/drm/i915/display/intel_panel.c | 2 +- .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 18 +- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 8 +- drivers/gpu/drm/i915/i915_drv.h | 37 --- drivers/gpu/drm/i915/intel_pm.c | 2 +- 15 files changed, 188 insertions(+), 187 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.c +106 -106
@@ -159,7 +159,7 @@ find_section(struct drm_i915_private *i915, {struct bdb_block_entry *entry; -list_for_each_entry (entry, &i915->vbt.bdb_blocks, node) { +list_for_each_entry (entry, &i915->display.vbt.bdb_blocks, node) {if (entry->section_id == section_id)return entry->data +3 ; }
@@ -501,7 +501,7 @@ init_bdb_block(struct drm_i915_private *i915,return ; } -list_add_tail (&entry->node, &i915->vbt.bdb_blocks); +list_add_tail (&entry->node, &i915->display.vbt.bdb_blocks); } static void init_bdb_blocks(struct drm_i915_private *i915,
@@ -878,7 +878,7 @@ parse_lfp_data(struct drm_i915_private *i915,if (!tail)return ; -if (i915->vbt.version >=188 ) { +if (i915->display.vbt.version >=188 ) { panel->vbt.seamless_drrs_min_refresh_rate = tail->seamless_drrs_min_refresh_rate[panel_type]; drm_dbg_kms(&i915->drm,
@@ -904,7 +904,7 @@ parse_generic_dtd(struct drm_i915_private *i915,* first on VBT >= 229, but still fall back to trying the old LFP * block if that fails. */ -if (i915->vbt.version <229 ) +if (i915->display.vbt.version <229 )return ; generic_dtd =find_section (i915,BDB_GENERIC_DTD );
@@ -1008,12 +1008,12 @@ parse_lfp_backlight(struct drm_i915_private *i915, } panel->vbt.backlight.type =INTEL_BACKLIGHT_DISPLAY_DDI ; -if (i915->vbt.version >=191 ) { +if (i915->display.vbt.version >=191 ) {size_t exp_size; -if (i915->vbt.version >=236 ) +if (i915->display.vbt.version >=236 ) exp_size =sizeof (struct bdb_lfp_backlight_data ); -else if (i915->vbt.version >=234 ) +else if (i915->display.vbt.version >=234 ) exp_size =EXP_BDB_LFP_BL_DATA_SIZE_REV_234 ;else exp_size =EXP_BDB_LFP_BL_DATA_SIZE_REV_191 ;
@@ -1030,14 +1030,14 @@ parse_lfp_backlight(struct drm_i915_private *i915, panel->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz; panel->vbt.backlight.active_low_pwm = entry->active_low_pwm; -if (i915->vbt.version >=234 ) { +if (i915->display.vbt.version >=234 ) {u16 min_level;bool scale; level = backlight_data->brightness_level[panel_type].level; min_level = backlight_data->brightness_min_level[panel_type].level; -if (i915->vbt.version >=236 ) +if (i915->display.vbt.version >=236 ) scale = backlight_data->brightness_precision_bits[panel_type] ==16 ;else scale = level >255 ;
@@ -1134,37 +1134,37 @@ parse_general_features(struct drm_i915_private *i915)if (!general)return ; - i915->vbt.int_tv_support = general->int_tv_support; + i915->display.vbt.int_tv_support = general->int_tv_support;/* int_crt_support can't be trusted on earlier platforms */ -if (i915->vbt.version >=155 && +if (i915->display.vbt.version >=155 && (HAS_DDI (i915) ||IS_VALLEYVIEW (i915))) - i915->vbt.int_crt_support = general->int_crt_support; - i915->vbt.lvds_use_ssc = general->enable_ssc; - i915->vbt.lvds_ssc_freq = + i915->display.vbt.int_crt_support = general->int_crt_support; + i915->display.vbt.lvds_use_ssc = general->enable_ssc; + i915->display.vbt.lvds_ssc_freq =intel_bios_ssc_frequency (i915, general->ssc_freq); - i915->vbt.display_clock_mode = general->display_clock_mode; - i915->vbt.fdi_rx_polarity_inverted = general->fdi_rx_polarity_inverted; -if (i915->vbt.version >=181 ) { - i915->vbt.orientation = general->rotate_180 ? + i915->display.vbt.display_clock_mode = general->display_clock_mode; + i915->display.vbt.fdi_rx_polarity_inverted = general->fdi_rx_polarity_inverted; +if (i915->display.vbt.version >=181 ) { + i915->display.vbt.orientation = general->rotate_180 ?DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP :DRM_MODE_PANEL_ORIENTATION_NORMAL ; }else { - i915->vbt.orientation =DRM_MODE_PANEL_ORIENTATION_UNKNOWN ; + i915->display.vbt.orientation =DRM_MODE_PANEL_ORIENTATION_UNKNOWN ; } -if (i915->vbt.version >=249 && general->afc_startup_config) { - i915->vbt.override_afc_startup = true; - i915->vbt.override_afc_startup_val = general->afc_startup_config ==0x1 ?0x0 :0x7 ; +if (i915->display.vbt.version >=249 && general->afc_startup_config) { + i915->display.vbt.override_afc_startup = true; + i915->display.vbt.override_afc_startup_val = general->afc_startup_config ==0x1 ?0x0 :0x7 ; }drm_dbg_kms (&i915->drm,"BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d fdi_rx_polarity_inverted %d\n" , - i915->vbt.int_tv_support, - i915->vbt.int_crt_support, - i915->vbt.lvds_use_ssc, - i915->vbt.lvds_ssc_freq, - i915->vbt.display_clock_mode, - i915->vbt.fdi_rx_polarity_inverted); + i915->display.vbt.int_tv_support, + i915->display.vbt.int_crt_support, + i915->display.vbt.lvds_use_ssc, + i915->display.vbt.lvds_ssc_freq, + i915->display.vbt.display_clock_mode, + i915->display.vbt.fdi_rx_polarity_inverted); } static const struct child_device_config *
@@ -1190,7 +1190,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *i915)return ; } -list_for_each_entry (devdata, &i915->vbt.display_devices, node) { +list_for_each_entry (devdata, &i915->display.vbt.display_devices, node) { child = &devdata->child; if (child->slave_addr != SLAVE_ADDR1 &&
@@ -1214,7 +1214,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *i915) child->slave_addr, (child->dvo_port ==DEVICE_PORT_DVOB ) ? "SDVOB" : "SDVOC"); - mapping = &i915->vbt.sdvo_mappings[child->dvo_port -1 ]; + mapping = &i915->display.vbt.sdvo_mappings[child->dvo_port -1 ];if (!mapping->initialized) { mapping->dvo_port = child->dvo_port; mapping->slave_addr = child->slave_addr;
@@ -1265,7 +1265,7 @@ parse_driver_features(struct drm_i915_private *i915)* interpretation, but real world VBTs seem to. */ if (driver->lvds_config !=BDB_DRIVER_FEATURE_INT_LVDS ) - i915->vbt.int_lvds_support =0 ; + i915->display.vbt.int_lvds_support =0 ; }else {/* * FIXME it's not clear which BDB version has the LVDS config
@@ -1278,10 +1278,10 @@ parse_driver_features(struct drm_i915_private *i915)* in the wild with the bits correctly populated. Version * 108 (on i85x) does not have the bits correctly populated. */ -if (i915->vbt.version >=134 && +if (i915->display.vbt.version >=134 && driver->lvds_config !=BDB_DRIVER_FEATURE_INT_LVDS && driver->lvds_config !=BDB_DRIVER_FEATURE_INT_SDVO_LVDS ) - i915->vbt.int_lvds_support =0 ; + i915->display.vbt.int_lvds_support =0 ; } }
@@ -1295,7 +1295,7 @@ parse_panel_driver_features(struct drm_i915_private *i915,if (!driver)return ; -if (i915->vbt.version <228 ) { +if (i915->display.vbt.version <228 ) {drm_dbg_kms (&i915->drm,"DRRS State Enabled:%d\n" , driver->drrs_enabled);/*
@@ -1328,7 +1328,7 @@ parse_power_conservation_features(struct drm_i915_private *i915, panel->vbt.vrr = true;/* matches Windows behaviour */ -if (i915->vbt.version <228 ) +if (i915->display.vbt.version <228 )return ; power =find_section (i915,BDB_LFP_POWER );
@@ -1354,10 +1354,10 @@ parse_power_conservation_features(struct drm_i915_private *i915, panel->vbt.drrs_type =DRRS_TYPE_NONE ; } -if (i915->vbt.version >=232 ) +if (i915->display.vbt.version >=232 ) panel->vbt.edp.hobl =panel_bool (power->hobl, panel_type); -if (i915->vbt.version >=233 ) +if (i915->display.vbt.version >=233 ) panel->vbt.vrr =panel_bool (power->vrr_feature_enabled, panel_type); }
@@ -1393,7 +1393,7 @@ parse_edp(struct drm_i915_private *i915, panel->vbt.edp.pps = *edp_pps; -if (i915->vbt.version >=224 ) { +if (i915->display.vbt.version >=224 ) { panel->vbt.edp.rate = edp->edp_fast_link_training_rate[panel_type] *20 ; }else {
@@ -1472,7 +1472,7 @@ parse_edp(struct drm_i915_private *i915,break ; } -if (i915->vbt.version >=173 ) { +if (i915->display.vbt.version >=173 ) {u8 vswing;/* Don't read from VBT if module parameter has valid value*/
@@ -1488,7 +1488,7 @@ parse_edp(struct drm_i915_private *i915, panel->vbt.edp.drrs_msa_timing_delay =panel_bits (edp->sdrrs_msa_timing_delay, panel_type,2 ); -if (i915->vbt.version >=244 ) +if (i915->display.vbt.version >=244 ) panel->vbt.edp.max_link_rate = edp->edp_max_port_link_rate[panel_type] *20 ; }
@@ -1520,7 +1520,7 @@ parse_psr(struct drm_i915_private *i915,* New psr options 0=500us, 1=100us, 2=2500us, 3=0us * Old decimal value is wake up time in multiples of 100 us. */ -if (i915->vbt.version >=205 && +if (i915->display.vbt.version >=205 && (DISPLAY_VER (i915) >=9 && !IS_BROXTON (i915))) {switch (psr_table->tp1_wakeup_time) {case 0 :
@@ -1566,7 +1566,7 @@ parse_psr(struct drm_i915_private *i915, panel->vbt.psr.tp2_tp3_wakeup_time_us = psr_table->tp2_tp3_wakeup_time *100 ; } -if (i915->vbt.version >=226 ) { +if (i915->display.vbt.version >=226 ) {u32 wakeup_time = psr->psr2_tp2_tp3_wakeup_time; wakeup_time =panel_bits (wakeup_time, panel_type,2 );
@@ -1598,7 +1598,7 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, {enum port port_bc =DISPLAY_VER (i915) >=11 ?PORT_B :PORT_C ; -if (!panel->vbt.dsi.config->dual_link || i915->vbt.version <197 ) { +if (!panel->vbt.dsi.config->dual_link || i915->display.vbt.version <197 ) { panel->vbt.dsi.bl_ports =BIT (port);if (panel->vbt.dsi.config->cabc_supported) panel->vbt.dsi.cabc_ports =BIT (port);
@@ -2053,7 +2053,7 @@ parse_compression_parameters(struct drm_i915_private *i915)u16 block_size;int index; -if (i915->vbt.version <198 ) +if (i915->display.vbt.version <198 )return ; params =find_section (i915,BDB_COMPRESSION_PARAMETERS );
@@ -2073,7 +2073,7 @@ parse_compression_parameters(struct drm_i915_private *i915) } } -list_for_each_entry (devdata, &i915->vbt.display_devices, node) { +list_for_each_entry (devdata, &i915->display.vbt.display_devices, node) { child = &devdata->child;if (!child->compression_enable)
@@ -2207,7 +2207,7 @@ static enum port get_port_by_ddc_pin(struct drm_i915_private *i915, u8 ddc_pin)return PORT_NONE ;for_each_port (port) { - devdata = i915->vbt.ports[port]; + devdata = i915->display.vbt.ports[port];if (devdata && ddc_pin == devdata->child.ddc_pin)return port;
@@ -2256,7 +2256,7 @@ static void sanitize_ddc_pin(struct intel_bios_encoder_data *devdata,* there are real machines (eg. Asrock B250M-HDV) where VBT has both * port A and port E with the same AUX ch and we must pick port E :( */ - child = &i915->vbt.ports[p]->child; + child = &i915->display.vbt.ports[p]->child; child->device_type &= ~DEVICE_TYPE_TMDS_DVI_SIGNALING ; child->device_type |=DEVICE_TYPE_NOT_HDMI_OUTPUT ;
@@ -2273,7 +2273,7 @@ static enum port get_port_by_aux_ch(struct drm_i915_private *i915, u8 aux_ch)return PORT_NONE ;for_each_port (port) { - devdata = i915->vbt.ports[port]; + devdata = i915->display.vbt.ports[port];if (devdata && aux_ch == devdata->child.aux_channel)return port;
@@ -2308,7 +2308,7 @@ static void sanitize_aux_ch(struct intel_bios_encoder_data *devdata,* there are real machines (eg. Asrock B250M-HDV) where VBT has both * port A and port E with the same AUX ch and we must pick port E :( */ - child = &i915->vbt.ports[p]->child; + child = &i915->display.vbt.ports[p]->child; child->device_type &= ~DEVICE_TYPE_DISPLAYPORT_OUTPUT ; child->aux_channel =0 ;
@@ -2482,10 +2482,10 @@ static int parse_bdb_216_dp_max_link_rate(const int vbt_max_link_rate)static int _intel_bios_dp_max_link_rate (const struct intel_bios_encoder_data *devdata) { -if (!devdata || devdata->i915->vbt.version <216 ) +if (!devdata || devdata->i915->display.vbt.version <216 )return 0 ; -if (devdata->i915->vbt.version >=230 ) +if (devdata->i915->display.vbt.version >=230 )return parse_bdb_230_dp_max_link_rate (devdata->child.dp_max_link_rate);else return parse_bdb_216_dp_max_link_rate (devdata->child.dp_max_link_rate);
@@ -2546,7 +2546,7 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata)static int _intel_bios_hdmi_level_shift (const struct intel_bios_encoder_data *devdata) { -if (!devdata || devdata->i915->vbt.version <158 ) +if (!devdata || devdata->i915->display.vbt.version <158 )return -1 ;return devdata->child.hdmi_level_shifter_value;
@@ -2554,7 +2554,7 @@ static int _intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *destatic int _intel_bios_max_tmds_clock (const struct intel_bios_encoder_data *devdata) { -if (!devdata || devdata->i915->vbt.version <204 ) +if (!devdata || devdata->i915->display.vbt.version <204 )return 0 ;switch (devdata->child.hdmi_max_data_rate) {
@@ -2663,7 +2663,7 @@ static void parse_ddi_port(struct intel_bios_encoder_data *devdata)return ; } -if (i915->vbt.ports[port]) { +if (i915->display.vbt.ports[port]) {drm_dbg_kms (&i915->drm,"More than one child device for port %c in VBT, using the first.\n" ,port_name (port));
@@ -2678,7 +2678,7 @@ static void parse_ddi_port(struct intel_bios_encoder_data *devdata)if (intel_bios_encoder_supports_dp (devdata))sanitize_aux_ch (devdata, port); - i915->vbt.ports[port] = devdata; + i915->display.vbt.ports[port] = devdata; }static bool has_ddi_port_info (struct drm_i915_private *i915)
@@ -2694,12 +2694,12 @@ static void parse_ddi_ports(struct drm_i915_private *i915)if (!has_ddi_port_info (i915))return ; -list_for_each_entry (devdata, &i915->vbt.display_devices, node) +list_for_each_entry (devdata, &i915->display.vbt.display_devices, node)parse_ddi_port (devdata);for_each_port (port) { -if (i915->vbt.ports[port]) -print_ddi_port (i915->vbt.ports[port], port); +if (i915->display.vbt.ports[port]) +print_ddi_port (i915->display.vbt.ports[port], port); } }
@@ -2732,33 +2732,33 @@ parse_general_definitions(struct drm_i915_private *i915) bus_pin = defs->crt_ddc_gmbus_pin;drm_dbg_kms (&i915->drm,"crt_ddc_bus_pin: %d\n" , bus_pin);if (intel_gmbus_is_valid_pin (i915, bus_pin)) - i915->vbt.crt_ddc_pin = bus_pin; + i915->display.vbt.crt_ddc_pin = bus_pin; -if (i915->vbt.version <106 ) { +if (i915->display.vbt.version <106 ) { expected_size =22 ; - }else if (i915->vbt.version <111 ) { + }else if (i915->display.vbt.version <111 ) { expected_size =27 ; - }else if (i915->vbt.version <195 ) { + }else if (i915->display.vbt.version <195 ) { expected_size =LEGACY_CHILD_DEVICE_CONFIG_SIZE ; - }else if (i915->vbt.version ==195 ) { + }else if (i915->display.vbt.version ==195 ) { expected_size =37 ; - }else if (i915->vbt.version <=215 ) { + }else if (i915->display.vbt.version <=215 ) { expected_size =38 ; - }else if (i915->vbt.version <=237 ) { + }else if (i915->display.vbt.version <=237 ) { expected_size =39 ; }else { expected_size =sizeof (*child);BUILD_BUG_ON (sizeof (*child) <39 );drm_dbg (&i915->drm,"Expected child device config size for VBT version %u not known; assuming %u\n" , - i915->vbt.version, expected_size); + i915->display.vbt.version, expected_size); }/* Flag an error for unexpected size, but continue anyway. */ if (defs->child_dev_size != expected_size)drm_err (&i915->drm,"Unexpected child device config size %u (expected %u for VBT version %u)\n" , - defs->child_dev_size, expected_size, i915->vbt.version); + defs->child_dev_size, expected_size, i915->display.vbt.version);/* The legacy sized child device config is the minimum we need. */ if (defs->child_dev_size <LEGACY_CHILD_DEVICE_CONFIG_SIZE ) {
@@ -2794,10 +2794,10 @@ parse_general_definitions(struct drm_i915_private *i915)memcpy (&devdata->child, child,min_t (size_t, defs->child_dev_size,sizeof (*child))); -list_add_tail (&devdata->node, &i915->vbt.display_devices); +list_add_tail (&devdata->node, &i915->display.vbt.display_devices); } -if (list_empty (&i915->vbt.display_devices)) +if (list_empty (&i915->display.vbt.display_devices))drm_dbg_kms (&i915->drm,"no child dev is parsed from VBT\n" ); }
@@ -2806,25 +2806,25 @@ parse_general_definitions(struct drm_i915_private *i915)static void init_vbt_defaults (struct drm_i915_private *i915) { - i915->vbt.crt_ddc_pin =GMBUS_PIN_VGADDC ; + i915->display.vbt.crt_ddc_pin =GMBUS_PIN_VGADDC ;/* general features */ - i915->vbt.int_tv_support =1 ; - i915->vbt.int_crt_support =1 ; + i915->display.vbt.int_tv_support =1 ; + i915->display.vbt.int_crt_support =1 ;/* driver features */ - i915->vbt.int_lvds_support =1 ; + i915->display.vbt.int_lvds_support =1 ;/* Default to using SSC */ - i915->vbt.lvds_use_ssc =1 ; + i915->display.vbt.lvds_use_ssc =1 ;/* * Core/SandyBridge/IvyBridge use alternative (120MHz) reference * clock for LVDS. */ - i915->vbt.lvds_ssc_freq =intel_bios_ssc_frequency (i915, - !HAS_PCH_SPLIT (i915)); + i915->display.vbt.lvds_ssc_freq =intel_bios_ssc_frequency (i915, + !HAS_PCH_SPLIT (i915));drm_dbg_kms (&i915->drm,"Set default to SSC at %d kHz\n" , - i915->vbt.lvds_ssc_freq); + i915->display.vbt.lvds_ssc_freq); }/* Common defaults which may be overridden by VBT. */
@@ -2885,7 +2885,7 @@ init_vbt_missing_defaults(struct drm_i915_private *i915)if (port ==PORT_A ) child->device_type |=DEVICE_TYPE_INTERNAL_CONNECTOR ; -list_add_tail (&devdata->node, &i915->vbt.display_devices); +list_add_tail (&devdata->node, &i915->display.vbt.display_devices); drm_dbg_kms(&i915->drm, "Generating default VBT child device with type 0x04%x on port %c\n",
@@ -2893,7 +2893,7 @@ init_vbt_missing_defaults(struct drm_i915_private *i915) }/* Bypass some minimum baseline VBT version checks */ - i915->vbt.version =155 ; + i915->display.vbt.version =155 ; }static const struct bdb_header *get_bdb_header (const struct vbt_header *vbt)
@@ -3084,8 +3084,8 @@ void intel_bios_init(struct drm_i915_private *i915)struct vbt_header *oprom_vbt =NULL ;const struct bdb_header *bdb; -INIT_LIST_HEAD (&i915->vbt.display_devices); -INIT_LIST_HEAD (&i915->vbt.bdb_blocks); +INIT_LIST_HEAD (&i915->display.vbt.display_devices); +INIT_LIST_HEAD (&i915->display.vbt.bdb_blocks);if (!HAS_DISPLAY (i915)) { drm_dbg_kms(&i915->drm,
@@ -3113,11 +3113,11 @@ void intel_bios_init(struct drm_i915_private *i915) goto out; bdb =get_bdb_header (vbt); - i915->vbt.version = bdb->version; + i915->display.vbt.version = bdb->version;drm_dbg_kms (&i915->drm,"VBT signature \"%.*s\", BDB version %d\n" , - (int )sizeof (vbt->signature), vbt->signature, i915->vbt.version); + (int )sizeof (vbt->signature), vbt->signature, i915->display.vbt.version);init_bdb_blocks (i915, bdb);
@@ -3174,13 +3174,13 @@ void intel_bios_driver_remove(struct drm_i915_private *i915)struct intel_bios_encoder_data *devdata, *nd;struct bdb_block_entry *entry, *ne; -list_for_each_entry_safe (devdata, nd, &i915->vbt.display_devices, node) { +list_for_each_entry_safe (devdata, nd, &i915->display.vbt.display_devices, node) {list_del (&devdata->node);kfree (devdata->dsc);kfree (devdata); } -list_for_each_entry_safe (entry, ne, &i915->vbt.bdb_blocks, node) { +list_for_each_entry_safe (entry, ne, &i915->display.vbt.bdb_blocks, node) {list_del (&entry->node);kfree (entry); }
@@ -3214,13 +3214,13 @@ bool intel_bios_is_tv_present(struct drm_i915_private *i915)const struct intel_bios_encoder_data *devdata;const struct child_device_config *child; -if (!i915->vbt.int_tv_support) +if (!i915->display.vbt.int_tv_support)return false; -if (list_empty (&i915->vbt.display_devices)) +if (list_empty (&i915->display.vbt.display_devices))return true; -list_for_each_entry (devdata, &i915->vbt.display_devices, node) { +list_for_each_entry (devdata, &i915->display.vbt.display_devices, node) { child = &devdata->child;/*
@@ -3257,10 +3257,10 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *i915, u8 *i2c_pin)const struct intel_bios_encoder_data *devdata;const struct child_device_config *child; -if (list_empty (&i915->vbt.display_devices)) +if (list_empty (&i915->display.vbt.display_devices))return true; -list_for_each_entry (devdata, &i915->vbt.display_devices, node) { +list_for_each_entry (devdata, &i915->display.vbt.display_devices, node) { child = &devdata->child;/* If the device type is not LFP, continue.
@@ -3306,7 +3306,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *i915, enum port port)if (WARN_ON (!has_ddi_port_info (i915)))return true; -return i915->vbt.ports[port]; +return i915->display.vbt.ports[port]; }/**
@@ -3366,7 +3366,7 @@ bool intel_bios_is_dsi_present(struct drm_i915_private *i915,const struct child_device_config *child;u8 dvo_port; -list_for_each_entry (devdata, &i915->vbt.display_devices, node) { +list_for_each_entry (devdata, &i915->display.vbt.display_devices, node) { child = &devdata->child;if (!(child->device_type &DEVICE_TYPE_MIPI_OUTPUT ))
@@ -3465,7 +3465,7 @@ bool intel_bios_get_dsc_params(struct intel_encoder *encoder,const struct intel_bios_encoder_data *devdata;const struct child_device_config *child; -list_for_each_entry (devdata, &i915->vbt.display_devices, node) { +list_for_each_entry (devdata, &i915->display.vbt.display_devices, node) { child = &devdata->child;if (!(child->device_type &DEVICE_TYPE_MIPI_OUTPUT ))
@@ -3496,7 +3496,7 @@ bool intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915, enum port port) { -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];if (drm_WARN_ON_ONCE (&i915->drm, !IS_GEMINILAKE (i915) && !IS_BROXTON (i915)))
@@ -3516,7 +3516,7 @@ bool intel_bios_is_lspcon_present(const struct drm_i915_private *i915, enum port port) { -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];return HAS_LSPCON (i915) && devdata && devdata->child.lspcon; }
@@ -3532,7 +3532,7 @@ bool intel_bios_is_lane_reversal_needed(const struct drm_i915_private *i915, enum port port) { -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];return devdata && devdata->child.lane_reversal; }
@@ -3540,7 +3540,7 @@ intel_bios_is_lane_reversal_needed(const struct drm_i915_private *i915,enum aux_ch intel_bios_port_aux_ch (struct drm_i915_private *i915,enum port port) { -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[port];enum aux_ch aux_ch;if (!devdata || !devdata->child.aux_channel) {
@@ -3634,7 +3634,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,int intel_bios_max_tmds_clock (struct intel_encoder *encoder) {struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];return _intel_bios_max_tmds_clock (devdata); }
@@ -3643,14 +3643,14 @@ int intel_bios_max_tmds_clock(struct intel_encoder *encoder)int intel_bios_hdmi_level_shift (struct intel_encoder *encoder) {struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];return _intel_bios_hdmi_level_shift (devdata); }int intel_bios_encoder_dp_boost_level (const struct intel_bios_encoder_data *devdata) { -if (!devdata || devdata->i915->vbt.version <196 || !devdata->child.iboost) +if (!devdata || devdata->i915->display.vbt.version <196 || !devdata->child.iboost)return 0 ;return translate_iboost (devdata->child.dp_iboost_level);
@@ -3658,7 +3658,7 @@ int intel_bios_encoder_dp_boost_level(const struct intel_bios_encoder_data *devdint intel_bios_encoder_hdmi_boost_level (const struct intel_bios_encoder_data *devdata) { -if (!devdata || devdata->i915->vbt.version <196 || !devdata->child.iboost) +if (!devdata || devdata->i915->display.vbt.version <196 || !devdata->child.iboost)return 0 ;return translate_iboost (devdata->child.hdmi_iboost_level);
@@ -3667,7 +3667,7 @@ int intel_bios_encoder_hdmi_boost_level(const struct intel_bios_encoder_data *deint intel_bios_dp_max_link_rate (struct intel_encoder *encoder) {struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];return _intel_bios_dp_max_link_rate (devdata); }
@@ -3675,7 +3675,7 @@ int intel_bios_dp_max_link_rate(struct intel_encoder *encoder)int intel_bios_alternate_ddc_pin (struct intel_encoder *encoder) {struct drm_i915_private *i915 =to_i915 (encoder->base.dev); -const struct intel_bios_encoder_data *devdata = i915->vbt.ports[encoder->port]; +const struct intel_bios_encoder_data *devdata = i915->display.vbt.ports[encoder->port];if (!devdata || !devdata->child.ddc_pin)return 0 ;
@@ -3685,16 +3685,16 @@ int intel_bios_alternate_ddc_pin(struct intel_encoder *encoder)bool intel_bios_encoder_supports_typec_usb (const struct intel_bios_encoder_data *devdata) { -return devdata->i915->vbt.version >=195 && devdata->child.dp_usb_type_c; +return devdata->i915->display.vbt.version >=195 && devdata->child.dp_usb_type_c; }bool intel_bios_encoder_supports_tbt (const struct intel_bios_encoder_data *devdata) { -return devdata->i915->vbt.version >=209 && devdata->child.tbt; +return devdata->i915->display.vbt.version >=209 && devdata->child.tbt; }const struct intel_bios_encoder_data *intel_bios_encoder_data_lookup (struct drm_i915_private *i915,enum port port) { -return i915->vbt.ports[port]; +return i915->display.vbt.ports[port]; }
drivers/gpu/drm/i915/display/intel_crt.c +2 -2
@@ -645,7 +645,7 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)BUG_ON (crt->base.type !=INTEL_OUTPUT_ANALOG ); - i2c =intel_gmbus_get_adapter (dev_priv, dev_priv->vbt.crt_ddc_pin); + i2c =intel_gmbus_get_adapter (dev_priv, dev_priv->display.vbt.crt_ddc_pin); edid =intel_crt_get_edid (connector, i2c);if (edid) {
@@ -931,7 +931,7 @@ static int intel_crt_get_modes(struct drm_connector *connector) wakeref =intel_display_power_get (dev_priv, intel_encoder->power_domain); - i2c =intel_gmbus_get_adapter (dev_priv, dev_priv->vbt.crt_ddc_pin); + i2c =intel_gmbus_get_adapter (dev_priv, dev_priv->display.vbt.crt_ddc_pin); ret =intel_crt_ddc_get_modes (connector, i2c);if (ret || !IS_G4X (dev_priv)) goto out;
drivers/gpu/drm/i915/display/intel_display.c +6 -6
@@ -2771,12 +2771,12 @@ static void intel_panel_sanitize_ssc(struct drm_i915_private *dev_priv) PCH_DREF_CONTROL) &DREF_SSC1_ENABLE ; -if (dev_priv->vbt.lvds_use_ssc != bios_lvds_use_ssc) { +if (dev_priv->display.vbt.lvds_use_ssc != bios_lvds_use_ssc) {drm_dbg_kms (&dev_priv->drm,"SSC %s by BIOS, overriding VBT which says %s\n" ,str_enabled_disabled (bios_lvds_use_ssc), -str_enabled_disabled (dev_priv->vbt.lvds_use_ssc)); - dev_priv->vbt.lvds_use_ssc = bios_lvds_use_ssc; +str_enabled_disabled (dev_priv->display.vbt.lvds_use_ssc)); + dev_priv->display.vbt.lvds_use_ssc = bios_lvds_use_ssc; } } }
@@ -4372,7 +4372,7 @@ static int i9xx_pll_refclk(struct drm_device *dev,u32 dpll = pipe_config->dpll_hw_state.dpll;if ((dpll &PLL_REF_INPUT_MASK ) ==PLLB_REF_INPUT_SPREADSPECTRUMIN ) -return dev_priv->vbt.lvds_ssc_freq; +return dev_priv->display.vbt.lvds_ssc_freq;else if (HAS_PCH_SPLIT (dev_priv))return 120000 ;else if (DISPLAY_VER (dev_priv) !=2 )
@@ -7923,7 +7923,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)if (intel_de_read (dev_priv,DDI_BUF_CTL (PORT_A )) &DDI_A_4_LANES )return false; -if (!dev_priv->vbt.int_crt_support) +if (!dev_priv->display.vbt.int_crt_support)return false;return true;
@@ -8058,7 +8058,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {bool has_edp, has_port; -if (IS_VALLEYVIEW (dev_priv) && dev_priv->vbt.int_crt_support) +if (IS_VALLEYVIEW (dev_priv) && dev_priv->display.vbt.int_crt_support)intel_crt_init (dev_priv);/*
drivers/gpu/drm/i915/display/intel_display_core.h +38 -0
@@ -6,11 +6,14 @@#ifndef __INTEL_DISPLAY_CORE_H__#define __INTEL_DISPLAY_CORE_H__ +#include <linux/list.h> #include <linux/mutex.h> #include <linux/types.h> #include <linux/wait.h> #include <linux/workqueue.h> +#include <drm/drm_connector.h> +#include "intel_cdclk.h" #include "intel_display.h" #include "intel_dmc.h"
@@ -25,6 +28,7 @@ struct i915_audio_component;struct i915_hdcp_comp_master ;struct intel_atomic_state ;struct intel_audio_funcs ; +struct intel_bios_encoder_data ;struct intel_cdclk_funcs ;struct intel_cdclk_vals ;struct intel_color_funcs ;
@@ -153,6 +157,39 @@ struct intel_hotplug {struct workqueue_struct *dp_wq; }; +struct intel_vbt_data { +/* bdb version */ +u16 version; + +/* Feature bits */ +unsigned int int_tv_support:1 ; +unsigned int int_crt_support:1 ; +unsigned int lvds_use_ssc:1 ; +unsigned int int_lvds_support:1 ; +unsigned int display_clock_mode:1 ; +unsigned int fdi_rx_polarity_inverted:1 ; +int lvds_ssc_freq; +enum drm_panel_orientation orientation; + +bool override_afc_startup; +u8 override_afc_startup_val; + +int crt_ddc_pin; + +struct list_head display_devices; +struct list_head bdb_blocks; + +struct intel_bios_encoder_data *ports[I915_MAX_PORTS ];/* Non-NULL if port present. */ +struct sdvo_device_mapping { +u8 initialized; +u8 dvo_port; +u8 slave_addr; +u8 dvo_wiring; +u8 i2c_pin; +u8 ddc_pin; + } sdvo_mappings[2 ]; +}; +struct intel_wm {/* * Raw watermark latency values:
@@ -311,6 +348,7 @@ struct intel_display {struct intel_hotplug hotplug;struct intel_opregion opregion;struct intel_overlay *overlay; +struct intel_vbt_data vbt;struct intel_wm wm; };
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -5202,7 +5202,7 @@ intel_edp_add_properties(struct intel_dp *intel_dp)return ;drm_connector_set_panel_orientation_with_quirk (&connector->base, - i915->vbt.orientation, + i915->display.vbt.orientation, fixed_mode->hdisplay, fixed_mode->vdisplay); }
drivers/gpu/drm/i915/display/intel_dpll.c +7 -7
@@ -991,7 +991,7 @@ static void ilk_update_pll_dividers(struct intel_crtc_state *crtc_state, factor =21 ;if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) {if ((intel_panel_use_ssc (dev_priv) && - dev_priv->vbt.lvds_ssc_freq ==100000 ) || + dev_priv->display.vbt.lvds_ssc_freq ==100000 ) || (HAS_PCH_IBX (dev_priv) &&intel_is_dual_link_lvds (dev_priv))) factor =25 ;
@@ -1105,8 +1105,8 @@ static int ilk_crtc_compute_clock(struct intel_atomic_state *state,if (intel_panel_use_ssc (dev_priv)) {drm_dbg_kms (&dev_priv->drm,"using SSC reference clock of %d kHz\n" , - dev_priv->vbt.lvds_ssc_freq); - refclk = dev_priv->vbt.lvds_ssc_freq; + dev_priv->display.vbt.lvds_ssc_freq); + refclk = dev_priv->display.vbt.lvds_ssc_freq; }if (intel_is_dual_link_lvds (dev_priv)) {
@@ -1231,7 +1231,7 @@ static int g4x_crtc_compute_clock(struct intel_atomic_state *state,if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) {if (intel_panel_use_ssc (dev_priv)) { - refclk = dev_priv->vbt.lvds_ssc_freq; + refclk = dev_priv->display.vbt.lvds_ssc_freq;drm_dbg_kms (&dev_priv->drm,"using SSC reference clock of %d kHz\n" , refclk);
@@ -1273,7 +1273,7 @@ static int pnv_crtc_compute_clock(struct intel_atomic_state *state,if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) {if (intel_panel_use_ssc (dev_priv)) { - refclk = dev_priv->vbt.lvds_ssc_freq; + refclk = dev_priv->display.vbt.lvds_ssc_freq;drm_dbg_kms (&dev_priv->drm,"using SSC reference clock of %d kHz\n" , refclk);
@@ -1306,7 +1306,7 @@ static int i9xx_crtc_compute_clock(struct intel_atomic_state *state,if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) {if (intel_panel_use_ssc (dev_priv)) { - refclk = dev_priv->vbt.lvds_ssc_freq; + refclk = dev_priv->display.vbt.lvds_ssc_freq;drm_dbg_kms (&dev_priv->drm,"using SSC reference clock of %d kHz\n" , refclk);
@@ -1339,7 +1339,7 @@ static int i8xx_crtc_compute_clock(struct intel_atomic_state *state,if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) {if (intel_panel_use_ssc (dev_priv)) { - refclk = dev_priv->vbt.lvds_ssc_freq; + refclk = dev_priv->display.vbt.lvds_ssc_freq;drm_dbg_kms (&dev_priv->drm,"using SSC reference clock of %d kHz\n" , refclk);
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +9 -9
@@ -2769,8 +2769,8 @@ static void icl_calc_dpll_state(struct drm_i915_private *i915,else pll_state->cfgcr1 |=DPLL_CFGCR1_CENTRAL_FREQ_8400 ; -if (i915->vbt.override_afc_startup) - pll_state->div0 =TGL_DPLL0_DIV0_AFC_STARTUP (i915->vbt.override_afc_startup_val); +if (i915->display.vbt.override_afc_startup) + pll_state->div0 =TGL_DPLL0_DIV0_AFC_STARTUP (i915->display.vbt.override_afc_startup_val); } static int icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,
@@ -2965,8 +2965,8 @@ static int icl_calc_mg_pll_state(struct intel_crtc_state *crtc_state,DKL_PLL_DIV0_PROP_COEFF (prop_coeff) |DKL_PLL_DIV0_FBPREDIV (m1div) |DKL_PLL_DIV0_FBDIV_INT (m2div_int); -if (dev_priv->vbt.override_afc_startup) { -u8 val = dev_priv->vbt.override_afc_startup_val; +if (dev_priv->display.vbt.override_afc_startup) { +u8 val = dev_priv->display.vbt.override_afc_startup_val; pll_state->mg_pll_div0 |=DKL_PLL_DIV0_AFC_STARTUP (val); }
@@ -3502,7 +3502,7 @@ static bool dkl_pll_get_hw_state(struct drm_i915_private *dev_priv, hw_state->mg_pll_div0 =intel_de_read (dev_priv,DKL_PLL_DIV0 (tc_port)); val =DKL_PLL_DIV0_MASK ; -if (dev_priv->vbt.override_afc_startup) +if (dev_priv->display.vbt.override_afc_startup) val |=DKL_PLL_DIV0_AFC_STARTUP_MASK ; hw_state->mg_pll_div0 &= val;
@@ -3566,7 +3566,7 @@ static bool icl_pll_get_hw_state(struct drm_i915_private *dev_priv, TGL_DPLL_CFGCR0(id)); hw_state->cfgcr1 =intel_de_read (dev_priv,TGL_DPLL_CFGCR1 (id)); -if (dev_priv->vbt.override_afc_startup) { +if (dev_priv->display.vbt.override_afc_startup) { hw_state->div0 =intel_de_read (dev_priv,TGL_DPLL0_DIV0 (id)); hw_state->div0 &=TGL_DPLL0_DIV0_AFC_STARTUP_MASK ; }
@@ -3638,9 +3638,9 @@ static void icl_dpll_write(struct drm_i915_private *dev_priv,intel_de_write (dev_priv, cfgcr0_reg, hw_state->cfgcr0);intel_de_write (dev_priv, cfgcr1_reg, hw_state->cfgcr1); -drm_WARN_ON_ONCE (&dev_priv->drm, dev_priv->vbt.override_afc_startup && +drm_WARN_ON_ONCE (&dev_priv->drm, dev_priv->display.vbt.override_afc_startup && !i915_mmio_reg_valid (div0_reg)); -if (dev_priv->vbt.override_afc_startup && +if (dev_priv->display.vbt.override_afc_startup &&i915_mmio_reg_valid (div0_reg))intel_de_rmw (dev_priv, div0_reg,TGL_DPLL0_DIV0_AFC_STARTUP_MASK , hw_state->div0);
@@ -3732,7 +3732,7 @@ static void dkl_pll_write(struct drm_i915_private *dev_priv,intel_de_write (dev_priv,DKL_CLKTOP2_HSCLKCTL (tc_port), val); val =DKL_PLL_DIV0_MASK ; -if (dev_priv->vbt.override_afc_startup) +if (dev_priv->display.vbt.override_afc_startup) val |=DKL_PLL_DIV0_AFC_STARTUP_MASK ;intel_de_rmw (dev_priv,DKL_PLL_DIV0 (tc_port), val, hw_state->mg_pll_div0);
drivers/gpu/drm/i915/display/intel_dsi.c +1 -1
@@ -106,7 +106,7 @@ intel_dsi_get_panel_orientation(struct intel_connector *connector)if (orientation !=DRM_MODE_PANEL_ORIENTATION_UNKNOWN )return orientation; - orientation = dev_priv->vbt.orientation; + orientation = dev_priv->display.vbt.orientation;if (orientation !=DRM_MODE_PANEL_ORIENTATION_UNKNOWN )return orientation;
drivers/gpu/drm/i915/display/intel_lvds.c +2 -2
@@ -837,12 +837,12 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)/* Skip init on machines we know falsely report LVDS */ if (dmi_check_system (intel_no_lvds)) { -drm_WARN (dev, !dev_priv->vbt.int_lvds_support, +drm_WARN (dev, !dev_priv->display.vbt.int_lvds_support,"Useless DMI match. Internal LVDS support disabled by VBT\n" );return ; } -if (!dev_priv->vbt.int_lvds_support) { +if (!dev_priv->display.vbt.int_lvds_support) {drm_dbg_kms (&dev_priv->drm,"Internal LVDS support disabled by VBT\n" );return ;
drivers/gpu/drm/i915/display/intel_panel.c +1 -1
@@ -42,7 +42,7 @@ bool intel_panel_use_ssc(struct drm_i915_private *i915) {if (i915->params.panel_use_ssc >=0 )return i915->params.panel_use_ssc !=0 ; -return i915->vbt.lvds_use_ssc +return i915->display.vbt.lvds_use_ssc && !(i915->quirks &QUIRK_LVDS_SSC_DISABLE ); }
drivers/gpu/drm/i915/display/intel_pch_refclk.c +1 -1
@@ -514,7 +514,7 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv) }if (HAS_PCH_IBX (dev_priv)) { - has_ck505 = dev_priv->vbt.display_clock_mode; + has_ck505 = dev_priv->display.vbt.display_clock_mode; can_ssc = has_ck505; }else { has_ck505 = false;
drivers/gpu/drm/i915/display/intel_sdvo.c +9 -9
@@ -2016,7 +2016,7 @@ intel_sdvo_get_analog_edid(struct drm_connector *connector)return drm_get_edid (connector,intel_gmbus_get_adapter (dev_priv, - dev_priv->vbt.crt_ddc_pin)); + dev_priv->display.vbt.crt_ddc_pin)); } static enum drm_connector_status
@@ -2581,9 +2581,9 @@ intel_sdvo_select_ddc_bus(struct drm_i915_private *dev_priv,struct sdvo_device_mapping *mapping;if (sdvo->port ==PORT_B ) - mapping = &dev_priv->vbt.sdvo_mappings[0 ]; + mapping = &dev_priv->display.vbt.sdvo_mappings[0 ];else - mapping = &dev_priv->vbt.sdvo_mappings[1 ]; + mapping = &dev_priv->display.vbt.sdvo_mappings[1 ];if (mapping->initialized) sdvo->ddc_bus =1 << ((mapping->ddc_pin &0xf0 ) >>4 );
@@ -2599,9 +2599,9 @@ intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv,u8 pin;if (sdvo->port ==PORT_B ) - mapping = &dev_priv->vbt.sdvo_mappings[0 ]; + mapping = &dev_priv->display.vbt.sdvo_mappings[0 ];else - mapping = &dev_priv->vbt.sdvo_mappings[1 ]; + mapping = &dev_priv->display.vbt.sdvo_mappings[1 ];if (mapping->initialized &&intel_gmbus_is_valid_pin (dev_priv, mapping->i2c_pin))
@@ -2639,11 +2639,11 @@ intel_sdvo_get_slave_addr(struct drm_i915_private *dev_priv,struct sdvo_device_mapping *my_mapping, *other_mapping;if (sdvo->port ==PORT_B ) { - my_mapping = &dev_priv->vbt.sdvo_mappings[0 ]; - other_mapping = &dev_priv->vbt.sdvo_mappings[1 ]; + my_mapping = &dev_priv->display.vbt.sdvo_mappings[0 ]; + other_mapping = &dev_priv->display.vbt.sdvo_mappings[1 ]; }else { - my_mapping = &dev_priv->vbt.sdvo_mappings[1 ]; - other_mapping = &dev_priv->vbt.sdvo_mappings[0 ]; + my_mapping = &dev_priv->display.vbt.sdvo_mappings[1 ]; + other_mapping = &dev_priv->display.vbt.sdvo_mappings[0 ]; }/* If the BIOS described our SDVO device, take advantage of it. */
drivers/gpu/drm/i915/display/intel_vbt_defs.h +4 -4
@@ -362,10 +362,10 @@ enum vbt_gmbus_ddi {* basically any of the fields to ensure the correct interpretation for the BDB * version in question. * -* When we copy the child device configs to dev_priv->vbt.child_dev, we reserve -* space for the full structure below, and initialize the tail not actually -* present in VBT to zeros. Accessing those fields is fine, as long as the -* default zero is taken into account, again according to the BDB version. +* When we copy the child device configs to dev_priv->display.vbt.child_dev, we +* reserve space for the full structure below, and initialize the tail not +* actually present in VBT to zeros. Accessing those fields is fine, as long as +* the default zero is taken into account, again according to the BDB version. * * BDB versions 155 and below are considered legacy, and version 155 seems to be * a baseline for some of the VBT documentation. When adding new fields, please
drivers/gpu/drm/i915/i915_drv.h +0 -37
@@ -34,7 +34,6 @@#include <linux/pm_qos.h> -#include <drm/drm_connector.h> #include <drm/ttm/ttm_device.h> #include "display/intel_display.h"
@@ -90,15 +89,6 @@ struct vlv_s0ix_state; I915_GEM_DOMAIN_INSTRUCTION | \ I915_GEM_DOMAIN_VERTEX) -struct sdvo_device_mapping { -u8 initialized; -u8 dvo_port; -u8 slave_addr; -u8 dvo_wiring; -u8 i2c_pin; -u8 ddc_pin; -}; -#define I915_COLOR_UNEVICTABLE (-1)/* a non-vma sharing the address space */ #define QUIRK_LVDS_SSC_DISABLE (1<<1)
@@ -199,32 +189,6 @@ i915_fence_timeout(const struct drm_i915_private *i915)#define HAS_HW_SAGV_WM (i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915)) -struct intel_vbt_data { -/* bdb version */ -u16 version; - -/* Feature bits */ -unsigned int int_tv_support:1 ; -unsigned int int_crt_support:1 ; -unsigned int lvds_use_ssc:1 ; -unsigned int int_lvds_support:1 ; -unsigned int display_clock_mode:1 ; -unsigned int fdi_rx_polarity_inverted:1 ; -int lvds_ssc_freq; -enum drm_panel_orientation orientation; - -bool override_afc_startup; -u8 override_afc_startup_val; - -int crt_ddc_pin; - -struct list_head display_devices; -struct list_head bdb_blocks; - -struct intel_bios_encoder_data *ports[I915_MAX_PORTS ];/* Non-NULL if port present. */ -struct sdvo_device_mapping sdvo_mappings[2 ]; -}; -struct i915_frontbuffer_tracking {spinlock_t lock;
@@ -322,7 +286,6 @@ struct drm_i915_private {u32 pipestat_irq_mask[I915_MAX_PIPES ];struct intel_fbc *fbc[I915_MAX_FBCS ]; -struct intel_vbt_data vbt;bool preserve_bios_swizzle;
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -7435,7 +7435,7 @@ static void cpt_init_clock_gating(struct drm_i915_private *dev_priv) val =intel_uncore_read (&dev_priv->uncore,TRANS_CHICKEN2 (pipe)); val |=TRANS_CHICKEN2_TIMING_OVERRIDE ; val &= ~TRANS_CHICKEN2_FDI_POLARITY_REVERSED ; -if (dev_priv->vbt.fdi_rx_polarity_inverted) +if (dev_priv->display.vbt.fdi_rx_polarity_inverted) val |=TRANS_CHICKEN2_FDI_POLARITY_REVERSED ; val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_COUNTER ; val &= ~TRANS_CHICKEN2_DISABLE_DEEP_COLOR_MODESWITCH ;
Signature · 1 line
2.34.1
PATCH v2 31/38 drm/i915: move dbuf under display sub-struct
In reply to Jani NikulaMove display dbuf related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_display_core.h | 7 +++++++ drivers/gpu/drm/i915/display/intel_display_power.c | 6 +++--- .../drm/i915/display/intel_display_power_well.c | 2 +- drivers/gpu/drm/i915/display/intel_modeset_setup.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 7 ------- drivers/gpu/drm/i915/intel_pm.c | 14 +++++++------- drivers/gpu/drm/i915/intel_pm.h | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +7 -0
@@ -299,6 +299,13 @@ struct intel_display {unsigned int max_cdclk_freq; } cdclk; +struct { +/* The current hardware dbuf configuration */ +u8 enabled_slices; + +struct intel_global_obj obj; + } dbuf; +struct {/* VLV/CHV/BXT/GLK DSI MMIO register base address */ u32 mmio_base;
drivers/gpu/drm/i915/display/intel_display_power.c +3 -3
@@ -1061,14 +1061,14 @@ void gen9_dbuf_slices_update(struct drm_i915_private *dev_priv,for_each_dbuf_slice (dev_priv, slice)gen9_dbuf_slice_set (dev_priv, slice, req_slices &BIT (slice)); - dev_priv->dbuf.enabled_slices = req_slices; + dev_priv->display.dbuf.enabled_slices = req_slices;mutex_unlock (&power_domains->lock); }static void gen9_dbuf_enable (struct drm_i915_private *dev_priv) { - dev_priv->dbuf.enabled_slices = + dev_priv->display.dbuf.enabled_slices =intel_enabled_dbuf_slices_mask (dev_priv);/*
@@ -1076,7 +1076,7 @@ static void gen9_dbuf_enable(struct drm_i915_private *dev_priv)* figure out later which slices we have and what we need. */ gen9_dbuf_slices_update (dev_priv,BIT (DBUF_S1 ) | - dev_priv->dbuf.enabled_slices); + dev_priv->display.dbuf.enabled_slices); }static void gen9_dbuf_disable (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/display/intel_display_power_well.c +1 -1
@@ -946,7 +946,7 @@ static bool gen9_dc_off_power_well_enabled(struct drm_i915_private *dev_priv,static void gen9_assert_dbuf_enabled (struct drm_i915_private *dev_priv) {u8 hw_enabled_dbuf_slices =intel_enabled_dbuf_slices_mask (dev_priv); -u8 enabled_dbuf_slices = dev_priv->dbuf.enabled_slices; +u8 enabled_dbuf_slices = dev_priv->display.dbuf.enabled_slices; drm_WARN(&dev_priv->drm, hw_enabled_dbuf_slices != enabled_dbuf_slices,
drivers/gpu/drm/i915/display/intel_modeset_setup.c +2 -2
@@ -34,7 +34,7 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc,struct intel_cdclk_state *cdclk_state =to_intel_cdclk_state (i915->display.cdclk.obj.state);struct intel_dbuf_state *dbuf_state = -to_intel_dbuf_state (i915->dbuf.obj.state); +to_intel_dbuf_state (i915->display.dbuf.obj.state);struct intel_crtc_state *crtc_state =to_intel_crtc_state (crtc->base.state);struct intel_plane *plane;
@@ -417,7 +417,7 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915)struct intel_cdclk_state *cdclk_state =to_intel_cdclk_state (i915->display.cdclk.obj.state);struct intel_dbuf_state *dbuf_state = -to_intel_dbuf_state (i915->dbuf.obj.state); +to_intel_dbuf_state (i915->display.dbuf.obj.state);enum pipe pipe;struct intel_crtc *crtc;struct intel_encoder *encoder;
drivers/gpu/drm/i915/i915_drv.h +0 -7
@@ -280,13 +280,6 @@ struct drm_i915_private {unsigned int hpll_freq;unsigned int czclk_freq; -struct { -/* The current hardware dbuf configuration */ -u8 enabled_slices; - -struct intel_global_obj obj; - } dbuf; -/** * wq - Driver workqueue for GEM. *
drivers/gpu/drm/i915/intel_pm.c +7 -7
@@ -6546,7 +6546,7 @@ static void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc,void skl_wm_get_hw_state (struct drm_i915_private *dev_priv) {struct intel_dbuf_state *dbuf_state = -to_intel_dbuf_state (dev_priv->dbuf.obj.state); +to_intel_dbuf_state (dev_priv->display.dbuf.obj.state);struct intel_crtc *crtc;if (HAS_MBUS_JOINING (dev_priv))
@@ -6602,13 +6602,13 @@ void skl_wm_get_hw_state(struct drm_i915_private *dev_priv) str_yes_no(dbuf_state->joined_mbus)); } - dbuf_state->enabled_slices = dev_priv->dbuf.enabled_slices; + dbuf_state->enabled_slices = dev_priv->display.dbuf.enabled_slices; }static bool skl_dbuf_is_misconfigured (struct drm_i915_private *i915) {const struct intel_dbuf_state *dbuf_state = -to_intel_dbuf_state (i915->dbuf.obj.state); +to_intel_dbuf_state (i915->display.dbuf.obj.state);struct skl_ddb_entry entries[I915_MAX_PIPES ] = {};struct intel_crtc *crtc;
@@ -7194,10 +7194,10 @@ void intel_wm_state_verify(struct intel_crtc *crtc, hw_enabled_slices =intel_enabled_dbuf_slices_mask (dev_priv);if (DISPLAY_VER (dev_priv) >=11 && - hw_enabled_slices != dev_priv->dbuf.enabled_slices) + hw_enabled_slices != dev_priv->display.dbuf.enabled_slices)drm_err (&dev_priv->drm,"mismatch in DBUF Slices (expected 0x%x, got 0x%x)\n" , - dev_priv->dbuf.enabled_slices, + dev_priv->display.dbuf.enabled_slices, hw_enabled_slices);for_each_intel_plane_on_crtc (&dev_priv->drm, crtc, plane) {
@@ -8314,7 +8314,7 @@ intel_atomic_get_dbuf_state(struct intel_atomic_state *state)struct drm_i915_private *dev_priv =to_i915 (state->base.dev);struct intel_global_state *dbuf_state; - dbuf_state =intel_atomic_get_global_obj_state (state, &dev_priv->dbuf.obj); + dbuf_state =intel_atomic_get_global_obj_state (state, &dev_priv->display.dbuf.obj);if (IS_ERR (dbuf_state))return ERR_CAST (dbuf_state);
@@ -8329,7 +8329,7 @@ int intel_dbuf_init(struct drm_i915_private *dev_priv)if (!dbuf_state)return -ENOMEM ; -intel_atomic_global_obj_init (dev_priv, &dev_priv->dbuf.obj, +intel_atomic_global_obj_init (dev_priv, &dev_priv->display.dbuf.obj, &dbuf_state->base, &intel_dbuf_funcs);return 0 ;
drivers/gpu/drm/i915/intel_pm.h +2 -2
@@ -77,9 +77,9 @@ intel_atomic_get_dbuf_state(struct intel_atomic_state *state);#define to_intel_dbuf_state (x) container_of((x), struct intel_dbuf_state, base)#define intel_atomic_get_old_dbuf_state (state) \ - to_intel_dbuf_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->dbuf.obj)) + to_intel_dbuf_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj))#define intel_atomic_get_new_dbuf_state (state) \ - to_intel_dbuf_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->dbuf.obj)) + to_intel_dbuf_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj))int intel_dbuf_init (struct drm_i915_private *dev_priv);void intel_dbuf_pre_plane_update (struct intel_atomic_state *state);
Signature · 1 line
2.34.1
PATCH v2 11/38 drm/i915: move and split audio under display.audio and display.funcs
In reply to Jani NikulaMove display audio related members under drm_i915_private display sub-struct.
Split audio funcs to display.funcs to follow the same pattern as all the other display functions.
--- drivers/gpu/drm/i915/display/intel_audio.c | 96 +++++++++---------- .../gpu/drm/i915/display/intel_display_core.h | 26 +++++ .../gpu/drm/i915/display/intel_lpe_audio.c | 42 ++++---- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 26 ----- 5 files changed, 96 insertions(+), 96 deletions(-)
drivers/gpu/drm/i915/display/intel_audio.c +48 -48
@@ -393,7 +393,7 @@ hsw_dp_audio_config_update(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_audio_component *acomp = dev_priv->audio.component; +struct i915_audio_component *acomp = dev_priv->display.audio.component;enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;enum port port = encoder->port;const struct dp_aud_n_m *nm;
@@ -441,7 +441,7 @@ hsw_hdmi_audio_config_update(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_audio_component *acomp = dev_priv->audio.component; +struct i915_audio_component *acomp = dev_priv->display.audio.component;enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;enum port port = encoder->port;int n, rate;
@@ -496,7 +496,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder,enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;u32 tmp; -mutex_lock (&dev_priv->audio.mutex); +mutex_lock (&dev_priv->display.audio.mutex);/* Disable timestamps */ tmp =intel_de_read (dev_priv,HSW_AUD_CFG (cpu_transcoder));
@@ -514,7 +514,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder, tmp &= ~AUDIO_OUTPUT_ENABLE (cpu_transcoder);intel_de_write (dev_priv,HSW_AUD_PIN_ELD_CP_VLD , tmp); -mutex_unlock (&dev_priv->audio.mutex); +mutex_unlock (&dev_priv->display.audio.mutex); } static unsigned int calc_hblank_early_prog(struct intel_encoder *encoder,
@@ -639,7 +639,7 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder,u32 tmp;int len, i; -mutex_lock (&dev_priv->audio.mutex); +mutex_lock (&dev_priv->display.audio.mutex);/* Enable Audio WA for 4k DSC usecases */ if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DP ))
@@ -677,7 +677,7 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder,/* Enable timestamps */ hsw_audio_config_update (encoder, crtc_state); -mutex_unlock (&dev_priv->audio.mutex); +mutex_unlock (&dev_priv->display.audio.mutex); } static void ilk_audio_codec_disable(struct intel_encoder *encoder,
@@ -814,7 +814,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_audio_component *acomp = dev_priv->audio.component; +struct i915_audio_component *acomp = dev_priv->display.audio.component;struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector; const struct drm_display_mode *adjusted_mode =
@@ -838,17 +838,17 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, connector->eld[6 ] =drm_av_sync_delay (connector, adjusted_mode) /2 ; -if (dev_priv->audio.funcs) - dev_priv->audio.funcs->audio_codec_enable (encoder, - crtc_state, - conn_state); +if (dev_priv->display.funcs.audio) + dev_priv->display.funcs.audio->audio_codec_enable (encoder, + crtc_state, + conn_state); -mutex_lock (&dev_priv->audio.mutex); +mutex_lock (&dev_priv->display.audio.mutex); encoder->audio_connector = connector;/* referred in audio callbacks */ - dev_priv->audio.encoder_map[pipe] = encoder; -mutex_unlock (&dev_priv->audio.mutex); + dev_priv->display.audio.encoder_map[pipe] = encoder; +mutex_unlock (&dev_priv->display.audio.mutex);if (acomp && acomp->base.audio_ops && acomp->base.audio_ops->pin_eld_notify) {
@@ -878,7 +878,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_audio_component *acomp = dev_priv->audio.component; +struct i915_audio_component *acomp = dev_priv->display.audio.component;struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_connector *connector = old_conn_state->connector;enum port port = encoder->port;
@@ -891,15 +891,15 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, connector->base.id, connector->name, encoder->base.base.id, encoder->base.name, pipe_name(pipe)); -if (dev_priv->audio.funcs) - dev_priv->audio.funcs->audio_codec_disable (encoder, - old_crtc_state, - old_conn_state); +if (dev_priv->display.funcs.audio) + dev_priv->display.funcs.audio->audio_codec_disable (encoder, + old_crtc_state, + old_conn_state); -mutex_lock (&dev_priv->audio.mutex); +mutex_lock (&dev_priv->display.audio.mutex); encoder->audio_connector =NULL ; - dev_priv->audio.encoder_map[pipe] =NULL ; -mutex_unlock (&dev_priv->audio.mutex); + dev_priv->display.audio.encoder_map[pipe] =NULL ; +mutex_unlock (&dev_priv->display.audio.mutex);if (acomp && acomp->base.audio_ops && acomp->base.audio_ops->pin_eld_notify) {
@@ -935,13 +935,13 @@ static const struct intel_audio_funcs hsw_audio_funcs = {void intel_audio_hooks_init (struct drm_i915_private *dev_priv) {if (IS_G4X (dev_priv)) { - dev_priv->audio.funcs = &g4x_audio_funcs; + dev_priv->display.funcs.audio = &g4x_audio_funcs; }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { - dev_priv->audio.funcs = &ilk_audio_funcs; + dev_priv->display.funcs.audio = &ilk_audio_funcs; }else if (IS_HASWELL (dev_priv) ||DISPLAY_VER (dev_priv) >=8 ) { - dev_priv->audio.funcs = &hsw_audio_funcs; + dev_priv->display.funcs.audio = &hsw_audio_funcs; }else if (HAS_PCH_SPLIT (dev_priv)) { - dev_priv->audio.funcs = &ilk_audio_funcs; + dev_priv->display.funcs.audio = &ilk_audio_funcs; } }
@@ -1046,13 +1046,13 @@ static unsigned long i915_audio_component_get_power(struct device *kdev) ret =intel_display_power_get (dev_priv,POWER_DOMAIN_AUDIO_PLAYBACK ); -if (dev_priv->audio.power_refcount++ ==0 ) { +if (dev_priv->display.audio.power_refcount++ ==0 ) {if (DISPLAY_VER (dev_priv) >=9 ) {intel_de_write (dev_priv,AUD_FREQ_CNTRL , - dev_priv->audio.freq_cntrl); + dev_priv->display.audio.freq_cntrl);drm_dbg_kms (&dev_priv->drm,"restored AUD_FREQ_CNTRL to 0x%x\n" , - dev_priv->audio.freq_cntrl); + dev_priv->display.audio.freq_cntrl); }/* Force CDCLK to 2*BCLK as long as we need audio powered. */
@@ -1073,7 +1073,7 @@ static void i915_audio_component_put_power(struct device *kdev,struct drm_i915_private *dev_priv =kdev_to_i915 (kdev);/* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */ -if (--dev_priv->audio.power_refcount ==0 ) +if (--dev_priv->display.audio.power_refcount ==0 )if (IS_GEMINILAKE (dev_priv))glk_force_audio_cdclk (dev_priv, false);
@@ -1140,10 +1140,10 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,/* MST */ if (pipe >=0 ) {if (drm_WARN_ON (&dev_priv->drm, - pipe >=ARRAY_SIZE (dev_priv->audio.encoder_map))) + pipe >=ARRAY_SIZE (dev_priv->display.audio.encoder_map)))return NULL ; - encoder = dev_priv->audio.encoder_map[pipe]; + encoder = dev_priv->display.audio.encoder_map[pipe];/* * when bootup, audio driver may not know it is * MST or not. So it will poll all the port & pipe
@@ -1159,7 +1159,7 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,return NULL ;for_each_pipe (dev_priv, pipe) { - encoder = dev_priv->audio.encoder_map[pipe]; + encoder = dev_priv->display.audio.encoder_map[pipe];if (encoder ==NULL )continue ;
@@ -1177,7 +1177,7 @@ static int i915_audio_component_sync_audio_rate(struct device *kdev, int port, int pipe, int rate) {struct drm_i915_private *dev_priv =kdev_to_i915 (kdev); -struct i915_audio_component *acomp = dev_priv->audio.component; +struct i915_audio_component *acomp = dev_priv->display.audio.component;struct intel_encoder *encoder;struct intel_crtc *crtc;unsigned long cookie;
@@ -1187,7 +1187,7 @@ static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,return 0 ; cookie =i915_audio_component_get_power (kdev); -mutex_lock (&dev_priv->audio.mutex); +mutex_lock (&dev_priv->display.audio.mutex);/* 1. get the pipe */ encoder =get_saved_enc (dev_priv, port, pipe);
@@ -1206,7 +1206,7 @@ static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,hsw_audio_config_update (encoder, crtc->config); unlock: -mutex_unlock (&dev_priv->audio.mutex); +mutex_unlock (&dev_priv->display.audio.mutex);i915_audio_component_put_power (kdev, cookie);return err; }
@@ -1220,13 +1220,13 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,const u8 *eld;int ret = -EINVAL ; -mutex_lock (&dev_priv->audio.mutex); +mutex_lock (&dev_priv->display.audio.mutex); intel_encoder =get_saved_enc (dev_priv, port, pipe);if (!intel_encoder) {drm_dbg_kms (&dev_priv->drm,"Not valid for port %c\n" ,port_name (port)); -mutex_unlock (&dev_priv->audio.mutex); +mutex_unlock (&dev_priv->display.audio.mutex);return ret; }
@@ -1238,7 +1238,7 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,memcpy (buf, eld,min (max_bytes, ret)); } -mutex_unlock (&dev_priv->audio.mutex); +mutex_unlock (&dev_priv->display.audio.mutex);return ret; }
@@ -1273,7 +1273,7 @@ static int i915_audio_component_bind(struct device *i915_kdev,BUILD_BUG_ON (MAX_PORTS !=I915_MAX_PORTS );for (i =0 ; i <ARRAY_SIZE (acomp->aud_sample_rate); i++) acomp->aud_sample_rate[i] =0 ; - dev_priv->audio.component = acomp; + dev_priv->display.audio.component = acomp;drm_modeset_unlock_all (&dev_priv->drm);return 0 ;
@@ -1288,14 +1288,14 @@ static void i915_audio_component_unbind(struct device *i915_kdev,drm_modeset_lock_all (&dev_priv->drm); acomp->base.ops =NULL ; acomp->base.dev =NULL ; - dev_priv->audio.component =NULL ; + dev_priv->display.audio.component =NULL ;drm_modeset_unlock_all (&dev_priv->drm);device_link_remove (hda_kdev, i915_kdev); -if (dev_priv->audio.power_refcount) +if (dev_priv->display.audio.power_refcount)drm_err (&dev_priv->drm,"audio power refcount %d after unbind\n" , - dev_priv->audio.power_refcount); + dev_priv->display.audio.power_refcount); }static const struct component_ops i915_audio_component_bind_ops = {
@@ -1359,13 +1359,13 @@ static void i915_audio_component_init(struct drm_i915_private *dev_priv)drm_dbg_kms (&dev_priv->drm,"use AUD_FREQ_CNTRL of 0x%x (init value 0x%x)\n" , aud_freq, aud_freq_init); - dev_priv->audio.freq_cntrl = aud_freq; + dev_priv->display.audio.freq_cntrl = aud_freq; }/* init with current cdclk */ intel_audio_cdclk_change_post (dev_priv); - dev_priv->audio.component_registered = true; + dev_priv->display.audio.component_registered = true; }/**
@@ -1377,11 +1377,11 @@ static void i915_audio_component_init(struct drm_i915_private *dev_priv)*/ static void i915_audio_component_cleanup (struct drm_i915_private *dev_priv) { -if (!dev_priv->audio.component_registered) +if (!dev_priv->display.audio.component_registered)return ;component_del (dev_priv->drm.dev, &i915_audio_component_bind_ops); - dev_priv->audio.component_registered = false; + dev_priv->display.audio.component_registered = false; }/**
@@ -1403,7 +1403,7 @@ void intel_audio_init(struct drm_i915_private *dev_priv)*/ void intel_audio_deinit (struct drm_i915_private *dev_priv) { -if ((dev_priv)->audio.lpe.platdev !=NULL ) +if (dev_priv->display.audio.lpe.platdev !=NULL )intel_lpe_audio_teardown (dev_priv);else i915_audio_component_cleanup (dev_priv);
drivers/gpu/drm/i915/display/intel_display_core.h +26 -0
@@ -10,11 +10,14 @@#include <linux/types.h> #include <linux/wait.h> +#include "intel_display.h" #include "intel_dmc.h" #include "intel_gmbus.h" struct drm_i915_private ; +struct i915_audio_component ;struct intel_atomic_state ; +struct intel_audio_funcs ;struct intel_cdclk_funcs ;struct intel_color_funcs ;struct intel_crtc ;
@@ -57,6 +60,25 @@ struct intel_wm_funcs {int (*compute_global_watermarks)(struct intel_atomic_state *state); }; +struct intel_audio { +/* hda/i915 audio component */ +struct i915_audio_component *component; +bool component_registered; +/* mutex for audio/video sync */ +struct mutex mutex; +int power_refcount; +u32 freq_cntrl; + +/* Used to save the pipe-to-encoder mapping for audio */ +struct intel_encoder *encoder_map[I915_MAX_PIPES ]; + +/* necessary resource sharing with HDMI LPE audio driver. */ +struct { +struct platform_device *platdev; +int irq; + } lpe; +}; + struct intel_display { /* Display functions */ struct {
@@ -80,6 +102,9 @@ struct intel_display {/* Display internal color functions */ const struct intel_color_funcs *color; + +/* Display internal audio functions */ +const struct intel_audio_funcs *audio; } funcs;/* Grouping using anonymous structs. Keep sorted. */
@@ -109,6 +134,7 @@ struct intel_display { } pps;/* Grouping using named structs. Keep sorted. */ +struct intel_audio audio;struct intel_dmc dmc; };
drivers/gpu/drm/i915/display/intel_lpe_audio.c +21 -21
115 lines not on this page · raw message
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -335,7 +335,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)mutex_init (&dev_priv->sb_lock);cpu_latency_qos_add_request (&dev_priv->sb_qos,PM_QOS_DEFAULT_VALUE ); -mutex_init (&dev_priv->audio.mutex); +mutex_init (&dev_priv->display.audio.mutex);mutex_init (&dev_priv->wm.wm_mutex);mutex_init (&dev_priv->display.pps.mutex);mutex_init (&dev_priv->hdcp_comp_mutex);
drivers/gpu/drm/i915/i915_drv.h +0 -26
@@ -79,7 +79,6 @@ struct dpll;struct drm_i915_clock_gating_funcs ;struct drm_i915_gem_object ;struct drm_i915_private ; -struct intel_audio_funcs ;struct intel_cdclk_config ;struct intel_cdclk_state ;struct intel_cdclk_vals ;
@@ -307,29 +306,6 @@ struct i915_selftest_stash {struct ida mock_region_instances; }; -/* intel_audio.c private */ -struct intel_audio_private { -/* Display internal audio functions */ -const struct intel_audio_funcs *funcs; - -/* hda/i915 audio component */ -struct i915_audio_component *component; -bool component_registered; -/* mutex for audio/video sync */ -struct mutex mutex; -int power_refcount; -u32 freq_cntrl; - -/* Used to save the pipe-to-encoder mapping for audio */ -struct intel_encoder *encoder_map[I915_MAX_PIPES ]; - -/* necessary resource sharing with HDMI LPE audio driver. */ -struct { -struct platform_device *platdev; -int irq; - } lpe; -}; -struct drm_i915_private {struct drm_device drm;
@@ -675,8 +651,6 @@ struct drm_i915_private {bool ipc_enabled; -struct intel_audio_private audio; -struct i915_pmu pmu;struct i915_drm_clients clients;
Signature · 1 line
2.34.1
PATCH v2 32/38 drm/i915: move and group modeset_wq and flip_wq under display.wq
In reply to Jani NikulaMove display workqueue related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_display.c | 20 +++++++++---------- .../gpu/drm/i915/display/intel_display_core.h | 8 ++++++++ drivers/gpu/drm/i915/i915_drv.h | 5 ----- 3 files changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +10 -10
@@ -7812,12 +7812,12 @@ static int intel_atomic_commit(struct drm_device *dev,i915_sw_fence_commit (&state->commit_ready);if (nonblock && state->modeset) { -queue_work (dev_priv->modeset_wq, &state->base.commit_work); +queue_work (dev_priv->display.wq.modeset, &state->base.commit_work); }else if (nonblock) { -queue_work (dev_priv->flip_wq, &state->base.commit_work); +queue_work (dev_priv->display.wq.flip, &state->base.commit_work); }else {if (state->modeset) -flush_workqueue (dev_priv->modeset_wq); +flush_workqueue (dev_priv->display.wq.modeset);intel_atomic_commit_tail (state); }
@@ -8686,9 +8686,9 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)intel_dmc_ucode_init (i915); - i915->modeset_wq =alloc_ordered_workqueue ("i915_modeset" ,0 ); - i915->flip_wq =alloc_workqueue ("i915_flip" ,WQ_HIGHPRI | -WQ_UNBOUND ,WQ_UNBOUND_MAX_ACTIVE ); + i915->display.wq.modeset =alloc_ordered_workqueue ("i915_modeset" ,0 ); + i915->display.wq.flip =alloc_workqueue ("i915_flip" ,WQ_HIGHPRI | +WQ_UNBOUND ,WQ_UNBOUND_MAX_ACTIVE );intel_mode_config_init (i915);
@@ -8995,8 +8995,8 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915)if (!HAS_DISPLAY (i915))return ; -flush_workqueue (i915->flip_wq); -flush_workqueue (i915->modeset_wq); +flush_workqueue (i915->display.wq.flip); +flush_workqueue (i915->display.wq.modeset);flush_work (&i915->atomic_helper.free_work);drm_WARN_ON (&i915->drm, !llist_empty (&i915->atomic_helper.free_list));
@@ -9037,8 +9037,8 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)intel_gmbus_teardown (i915); -destroy_workqueue (i915->flip_wq); -destroy_workqueue (i915->modeset_wq); +destroy_workqueue (i915->display.wq.flip); +destroy_workqueue (i915->display.wq.modeset);intel_fbc_cleanup (i915); }
drivers/gpu/drm/i915/display/intel_display_core.h +8 -0
@@ -376,6 +376,14 @@ struct intel_display {u32 block_time_us; } sagv; +struct { +/* ordered wq for modesets */ +struct workqueue_struct *modeset; + +/* unbound hipri wq for page flips/plane updates */ +struct workqueue_struct *flip; + } wq; +/* Grouping using named structs. Keep sorted. */ struct intel_audio audio;struct intel_dmc dmc;
drivers/gpu/drm/i915/i915_drv.h +0 -5
@@ -289,11 +289,6 @@ struct drm_i915_private {*/ struct workqueue_struct *wq; -/* ordered wq for modesets */ -struct workqueue_struct *modeset_wq; -/* unbound hipri wq for page flips/plane updates */ -struct workqueue_struct *flip_wq; -/* pm private clock gating functions */ const struct drm_i915_clock_gating_funcs *clock_gating_funcs;
Signature · 1 line
2.34.1
PATCH v2 30/38 drm/i915: move INTEL_FRONTBUFFER_* macros to intel_frontbuffer.h
In reply to Jani NikulaThe macros clearly don't belong in i915_drv.h. Move to intel_frontbuffer.h.
Also split the BUILD_BUG_ON()s to intel_frontbuffer_track() to avoid depending on some other macros in the header.
--- .../gpu/drm/i915/display/intel_frontbuffer.c | 2 ++ .../gpu/drm/i915/display/intel_frontbuffer.h | 18 +++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 20 ------------------- 3 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/display/intel_frontbuffer.c +2 -0
@@ -311,6 +311,8 @@ void intel_frontbuffer_track(struct intel_frontbuffer *old,*/ BUILD_BUG_ON (INTEL_FRONTBUFFER_BITS_PER_PIPE *I915_MAX_PIPES >BITS_PER_TYPE (atomic_t)); +BUILD_BUG_ON (INTEL_FRONTBUFFER_BITS_PER_PIPE *I915_MAX_PIPES >32 ); +BUILD_BUG_ON (I915_MAX_PLANES >INTEL_FRONTBUFFER_BITS_PER_PIPE );if (old) { drm_WARN_ON(old->obj->base.dev,
drivers/gpu/drm/i915/display/intel_frontbuffer.h +18 -0
@@ -25,6 +25,7 @@#define __INTEL_FRONTBUFFER_H__#include <linux/atomic.h> +#include <linux/bits.h> #include <linux/kref.h> #include "gem/i915_gem_object_types.h"
@@ -48,6 +49,23 @@ struct intel_frontbuffer {struct rcu_head rcu; }; +/* +* Frontbuffer tracking bits. Set in obj->frontbuffer_bits while a gem bo is +* considered to be the frontbuffer for the given plane interface-wise. This +* doesn't mean that the hw necessarily already scans it out, but that any +* rendering (by the cpu or gpu) will land in the frontbuffer eventually. +* +* We have one bit per pipe and per scanout plane type. +*/ +#define INTEL_FRONTBUFFER_BITS_PER_PIPE 8 +#define INTEL_FRONTBUFFER (pipe, plane_id) \ + BIT((plane_id) + INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)); +#define INTEL_FRONTBUFFER_OVERLAY (pipe) \ + BIT(INTEL_FRONTBUFFER_BITS_PER_PIPE - 1 + INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)) +#define INTEL_FRONTBUFFER_ALL_MASK (pipe) \ + GENMASK(INTEL_FRONTBUFFER_BITS_PER_PIPE * ((pipe) + 1) - 1, \ + INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)) +void intel_frontbuffer_flip_prepare (struct drm_i915_private *i915,unsigned frontbuffer_bits); void intel_frontbuffer_flip_complete(struct drm_i915_private *i915,
drivers/gpu/drm/i915/i915_drv.h +0 -20
@@ -487,26 +487,6 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)#define I915_GTT_OFFSET_NONE ((u32)-1) -/* -* Frontbuffer tracking bits. Set in obj->frontbuffer_bits while a gem bo is -* considered to be the frontbuffer for the given plane interface-wise. This -* doesn't mean that the hw necessarily already scans it out, but that any -* rendering (by the cpu or gpu) will land in the frontbuffer eventually. -* -* We have one bit per pipe and per scanout plane type. -*/ -#define INTEL_FRONTBUFFER_BITS_PER_PIPE 8 -#define INTEL_FRONTBUFFER (pipe, plane_id) ({ \ - BUILD_BUG_ON(INTEL_FRONTBUFFER_BITS_PER_PIPE * I915_MAX_PIPES > 32); \ - BUILD_BUG_ON(I915_MAX_PLANES > INTEL_FRONTBUFFER_BITS_PER_PIPE); \ - BIT((plane_id) + INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)); \ -}) -#define INTEL_FRONTBUFFER_OVERLAY (pipe) \ - BIT(INTEL_FRONTBUFFER_BITS_PER_PIPE - 1 + INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)) -#define INTEL_FRONTBUFFER_ALL_MASK (pipe) \ - GENMASK(INTEL_FRONTBUFFER_BITS_PER_PIPE * ((pipe) + 1) - 1, \ - INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe)) -#define INTEL_INFO (dev_priv) (&(dev_priv)->__info)#define RUNTIME_INFO (dev_priv) (&(dev_priv)->__runtime)#define DRIVER_CAPS (dev_priv) (&(dev_priv)->caps)
Signature · 1 line
2.34.1
PATCH v2 36/38 drm/i915: move quirks under display sub-struct
In reply to Jani NikulaMove display quirk related members under drm_i915_private display sub-struct.
Prefer adding anonymous sub-structs even for single members that aren't our own structs.
--- drivers/gpu/drm/i915/display/intel_display_core.h | 4 ++++ drivers/gpu/drm/i915/display/intel_quirks.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 1 - 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +4 -0
@@ -365,6 +365,10 @@ struct intel_display {struct mutex mutex; } pps; +struct { +unsigned long mask; + } quirks; + struct { enum { I915_SAGV_UNKNOWN = 0,
drivers/gpu/drm/i915/display/intel_quirks.c +2 -2
@@ -11,7 +11,7 @@static void intel_set_quirk (struct drm_i915_private *i915,enum intel_quirk_id quirk) { - i915->quirks |=BIT (quirk); + i915->display.quirks.mask |=BIT (quirk); }/*
@@ -221,5 +221,5 @@ void intel_init_quirks(struct drm_i915_private *i915)bool intel_has_quirk (struct drm_i915_private *i915,enum intel_quirk_id quirk) { -return i915->quirks &BIT (quirk); +return i915->display.quirks.mask &BIT (quirk); }
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -291,7 +291,6 @@ struct drm_i915_private {unsigned short pch_id;unsigned long gem_quirks; -unsigned long quirks;struct drm_atomic_state *modeset_restore_state;struct drm_modeset_acquire_ctx reset_ctx;
Signature · 1 line
2.34.1
PATCH v2 29/38 drm/i915: move fb_tracking under display sub-struct
In reply to Jani NikulaMove display frontbuffer tracking related members under drm_i915_private display sub-struct.
Rename struct i915_frontbuffer_tracking to intel_frontbuffer_tracking while at it.
FIXME: fb_tracking.lock mutex init should be moved away from i915_gem_init_early().
--- .../gpu/drm/i915/display/intel_display_core.h | 12 +++++ .../drm/i915/display/intel_display_debugfs.c | 4 +- .../gpu/drm/i915/display/intel_frontbuffer.c | 54 +++++++++---------- drivers/gpu/drm/i915/i915_drv.h | 14 ----- drivers/gpu/drm/i915/i915_gem.c | 2 +- 5 files changed, 42 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +12 -0
@@ -120,6 +120,17 @@ struct intel_dpll { } ref_clks; }; +struct intel_frontbuffer_tracking { +spinlock_t lock; + +/* +* Tracking bits for delayed frontbuffer flushing du to gpu activity or +* scheduled flips. +*/ +unsigned busy_bits; +unsigned flip_bits; +}; +struct intel_hotplug {struct delayed_work hotplug_work;
@@ -363,6 +374,7 @@ struct intel_display {struct intel_dmc dmc;struct intel_dpll dpll;struct intel_fbc *fbc[I915_MAX_FBCS ]; +struct intel_frontbuffer_tracking fb_tracking;struct intel_hotplug hotplug;struct intel_opregion opregion;struct intel_overlay *overlay;
drivers/gpu/drm/i915/display/intel_display_debugfs.c +2 -2
@@ -37,10 +37,10 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)struct drm_i915_private *dev_priv =node_to_i915 (m->private);seq_printf (m,"FB tracking busy bits: 0x%08x\n" , - dev_priv->fb_tracking.busy_bits); + dev_priv->display.fb_tracking.busy_bits);seq_printf (m,"FB tracking flip bits: 0x%08x\n" , - dev_priv->fb_tracking.flip_bits); + dev_priv->display.fb_tracking.flip_bits);return 0 ; }
drivers/gpu/drm/i915/display/intel_frontbuffer.c +27 -27
124 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +0 -14
@@ -39,7 +39,6 @@#include "display/intel_display.h" #include "display/intel_display_core.h" #include "display/intel_dsb.h" -#include "display/intel_frontbuffer.h" #include "gem/i915_gem_context_types.h" #include "gem/i915_gem_lmem.h"
@@ -187,17 +186,6 @@ i915_fence_timeout(const struct drm_i915_private *i915)#define HAS_HW_SAGV_WM (i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915)) -struct i915_frontbuffer_tracking { -spinlock_t lock; - -/* -* Tracking bits for delayed frontbuffer flushing du to gpu activity or -* scheduled flips. -*/ -unsigned busy_bits; -unsigned flip_bits; -}; -struct i915_virtual_gpu {struct mutex lock;/* serialises sending of g2v_notify command pkts */ bool active;
@@ -331,8 +319,6 @@ struct drm_i915_private {struct list_head global_obj_list; -struct i915_frontbuffer_tracking fb_tracking; -struct intel_atomic_helper {struct llist_head free_list;struct work_struct free_work;
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -1212,7 +1212,7 @@ void i915_gem_init_early(struct drm_i915_private *dev_priv)i915_gem_init__mm (dev_priv);i915_gem_init__contexts (dev_priv); -spin_lock_init (&dev_priv->fb_tracking.lock); +spin_lock_init (&dev_priv->display.fb_tracking.lock); }void i915_gem_cleanup_early (struct drm_i915_private *dev_priv)
Signature · 1 line
2.34.1
PATCH v2 35/38 drm/i915/quirks: abstract quirks further by making quirk ids an enum
In reply to Jani NikulaTurn the quirk ids to enums instead of bits, and hide the masking inside intel_quirks.c. Define the enums in intel_quirks.h to declutter i915_drv.h while at it.
--- drivers/gpu/drm/i915/display/intel_quirks.c | 21 +++++++++++++-------- drivers/gpu/drm/i915/display/intel_quirks.h | 11 ++++++++++- drivers/gpu/drm/i915/i915_drv.h | 7 ------- 3 files changed, 23 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/display/intel_quirks.c +13 -8
@@ -9,12 +9,17 @@#include "intel_display_types.h" #include "intel_quirks.h" +static void intel_set_quirk (struct drm_i915_private *i915,enum intel_quirk_id quirk) +{ + i915->quirks |=BIT (quirk); +} +/* * Some machines (Lenovo U160) do not work with SSC on LVDS for some reason */ static void quirk_ssc_force_disable (struct drm_i915_private *i915) { - i915->quirks |=QUIRK_LVDS_SSC_DISABLE ; +intel_set_quirk (i915,QUIRK_LVDS_SSC_DISABLE );drm_info (&i915->drm,"applying lvds SSC disable quirk\n" ); }
@@ -24,14 +29,14 @@ static void quirk_ssc_force_disable(struct drm_i915_private *i915)*/ static void quirk_invert_brightness (struct drm_i915_private *i915) { - i915->quirks |=QUIRK_INVERT_BRIGHTNESS ; +intel_set_quirk (i915,QUIRK_INVERT_BRIGHTNESS );drm_info (&i915->drm,"applying inverted panel brightness quirk\n" ); }/* Some VBT's incorrectly indicate no backlight is present */ static void quirk_backlight_present (struct drm_i915_private *i915) { - i915->quirks |=QUIRK_BACKLIGHT_PRESENT ; +intel_set_quirk (i915,QUIRK_BACKLIGHT_PRESENT );drm_info (&i915->drm,"applying backlight present quirk\n" ); }
@@ -40,7 +45,7 @@ static void quirk_backlight_present(struct drm_i915_private *i915)*/ static void quirk_increase_t12_delay (struct drm_i915_private *i915) { - i915->quirks |=QUIRK_INCREASE_T12_DELAY ; +intel_set_quirk (i915,QUIRK_INCREASE_T12_DELAY );drm_info (&i915->drm,"Applying T12 delay quirk\n" ); }
@@ -50,13 +55,13 @@ static void quirk_increase_t12_delay(struct drm_i915_private *i915)*/ static void quirk_increase_ddi_disabled_time (struct drm_i915_private *i915) { - i915->quirks |=QUIRK_INCREASE_DDI_DISABLED_TIME ; +intel_set_quirk (i915,QUIRK_INCREASE_DDI_DISABLED_TIME );drm_info (&i915->drm,"Applying Increase DDI Disabled quirk\n" ); }static void quirk_no_pps_backlight_power_hook (struct drm_i915_private *i915) { - i915->quirks |=QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK ; +intel_set_quirk (i915,QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK );drm_info (&i915->drm,"Applying no pps backlight power quirk\n" ); }
@@ -214,7 +219,7 @@ void intel_init_quirks(struct drm_i915_private *i915) } } -bool intel_has_quirk (struct drm_i915_private *i915,unsigned long quirk) +bool intel_has_quirk (struct drm_i915_private *i915,enum intel_quirk_id quirk) { -return i915->quirks & quirk; +return i915->quirks &BIT (quirk); }
drivers/gpu/drm/i915/display/intel_quirks.h +10 -1
@@ -10,7 +10,16 @@struct drm_i915_private ; +enum intel_quirk_id { +QUIRK_BACKLIGHT_PRESENT , +QUIRK_INCREASE_DDI_DISABLED_TIME , +QUIRK_INCREASE_T12_DELAY , +QUIRK_INVERT_BRIGHTNESS , +QUIRK_LVDS_SSC_DISABLE , +QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK , +}; +void intel_init_quirks (struct drm_i915_private *i915); -bool intel_has_quirk (struct drm_i915_private *i915,unsigned long quirk); +bool intel_has_quirk (struct drm_i915_private *i915,enum intel_quirk_id quirk);#endif /* __INTEL_QUIRKS_H__ */
drivers/gpu/drm/i915/i915_drv.h +0 -7
@@ -90,13 +90,6 @@ struct vlv_s0ix_state;#define GEM_QUIRK_PIN_SWIZZLED_PAGES BIT(0) -#define QUIRK_LVDS_SSC_DISABLE (1<<1) -#define QUIRK_INVERT_BRIGHTNESS (1<<2) -#define QUIRK_BACKLIGHT_PRESENT (1<<3) -#define QUIRK_INCREASE_T12_DELAY (1<<6) -#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7) -#define QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK (1<<8) -struct i915_suspend_saved_registers {u32 saveDSPARB;u32 saveSWF0[16 ];
Signature · 1 line
2.34.1
PATCH v2 33/38 drm/i915: split gem quirks from display quirks
In reply to Jani NikulaThe lone gem quirk is an outlier, not even handled by the common quirk code. Split it to a separate gem_quirks member.
--- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 ++-- drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gem.c | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_pages.c +1 -1
@@ -66,7 +66,7 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, shrinkable =i915_gem_object_is_shrinkable (obj);if (i915_gem_object_is_tiled (obj) && - i915->quirks &QUIRK_PIN_SWIZZLED_PAGES ) { + i915->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES ) {GEM_BUG_ON (i915_gem_object_has_tiling_quirk (obj));i915_gem_object_set_tiling_quirk (obj);GEM_BUG_ON (!list_empty (&obj->mm.link));
drivers/gpu/drm/i915/gem/i915_gem_tiling.c +2 -2
@@ -278,7 +278,7 @@ i915_gem_object_set_tiling(struct drm_i915_gem_object *obj,*/ if (i915_gem_object_has_pages (obj) && obj->mm.madv ==I915_MADV_WILLNEED && - i915->quirks &QUIRK_PIN_SWIZZLED_PAGES ) { + i915->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES ) {if (tiling ==I915_TILING_NONE ) {GEM_BUG_ON (!i915_gem_object_has_tiling_quirk (obj));i915_gem_object_clear_tiling_quirk (obj);
@@ -458,7 +458,7 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data, }/* Hide bit 17 from the user -- see comment in i915_gem_set_tiling */ -if (dev_priv->quirks &QUIRK_PIN_SWIZZLED_PAGES ) +if (dev_priv->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES ) args->phys_swizzle_mode =I915_BIT_6_SWIZZLE_UNKNOWN ;else args->phys_swizzle_mode = args->swizzle_mode;
drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +1 -1
@@ -711,7 +711,7 @@ static bool bad_swizzling(struct drm_i915_private *i915) {struct i915_ggtt *ggtt =to_gt (i915)->ggtt; -if (i915->quirks &QUIRK_PIN_SWIZZLED_PAGES ) +if (i915->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES )return true; if (has_bit17_swizzle(ggtt->bit_6_swizzle_x) ||
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +2 -2
@@ -367,7 +367,7 @@ static int igt_partial_tiling(void *arg)unsigned int pitch;struct tile tile; -if (i915->quirks &QUIRK_PIN_SWIZZLED_PAGES ) +if (i915->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES )/* * The swizzling pattern is actually unknown as it * varies based on physical address of each page.
@@ -464,7 +464,7 @@ static int igt_smoke_tiling(void *arg)* Remember to look at the st_seed if we see a flip-flop in BAT! */ -if (i915->quirks &QUIRK_PIN_SWIZZLED_PAGES ) +if (i915->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES )return 0 ; obj = huge_gem_object(i915,
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +1 -1
@@ -727,7 +727,7 @@ static void detect_bit_6_swizzle(struct i915_ggtt *ggtt)* bit17 dependent, and so we need to also prevent the pages * from being moved. */ - i915->quirks |=QUIRK_PIN_SWIZZLED_PAGES ; + i915->gem_quirks |=GEM_QUIRK_PIN_SWIZZLED_PAGES ; swizzle_x =I915_BIT_6_SWIZZLE_NONE ; swizzle_y =I915_BIT_6_SWIZZLE_NONE ; }
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -410,7 +410,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)seq_printf (m,"bit6 swizzle for Y-tiling = %s\n" ,swizzle_string (to_gt (dev_priv)->ggtt->bit_6_swizzle_y)); -if (dev_priv->quirks &QUIRK_PIN_SWIZZLED_PAGES ) +if (dev_priv->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES )seq_puts (m,"L-shaped memory detected\n" );/* On BDW+, swizzling is not used. See detect_bit_6_swizzle() */
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -88,10 +88,11 @@ struct vlv_s0ix_state;#define I915_COLOR_UNEVICTABLE (-1)/* a non-vma sharing the address space */ +#define GEM_QUIRK_PIN_SWIZZLED_PAGES BIT(0) +#define QUIRK_LVDS_SSC_DISABLE (1<<1)#define QUIRK_INVERT_BRIGHTNESS (1<<2)#define QUIRK_BACKLIGHT_PRESENT (1<<3) -#define QUIRK_PIN_SWIZZLED_PAGES (1<<5)#define QUIRK_INCREASE_T12_DELAY (1<<6)#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)#define QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK (1<<8)
@@ -296,6 +297,7 @@ struct drm_i915_private {enum intel_pch pch_type;unsigned short pch_id; +unsigned long gem_quirks;unsigned long quirks;struct drm_atomic_state *modeset_restore_state;
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -1035,7 +1035,7 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data,if (i915_gem_object_has_pages (obj) &&i915_gem_object_is_tiled (obj) && - i915->quirks &QUIRK_PIN_SWIZZLED_PAGES ) { + i915->gem_quirks &GEM_QUIRK_PIN_SWIZZLED_PAGES ) {if (obj->mm.madv ==I915_MADV_WILLNEED ) {GEM_BUG_ON (!i915_gem_object_has_tiling_quirk (obj));i915_gem_object_clear_tiling_quirk (obj);
Signature · 1 line
2.34.1
PATCH v2 28/38 drm/i915: move and group fdi members under display.fdi
In reply to Jani NikulaMove display fdi related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_crt.c | 4 ++-- drivers/gpu/drm/i915/display/intel_display_core.h | 5 +++++ drivers/gpu/drm/i915/display/intel_fdi.c | 10 +++++----- drivers/gpu/drm/i915/i915_drv.h | 3 --- 4 files changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_crt.c +2 -2
@@ -1110,8 +1110,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv)u32 fdi_config =FDI_RX_POLARITY_REVERSED_LPT |FDI_RX_LINK_REVERSAL_OVERRIDE ; - dev_priv->fdi_rx_config =intel_de_read (dev_priv, -FDI_RX_CTL (PIPE_A )) & fdi_config; + dev_priv->display.fdi.rx_config =intel_de_read (dev_priv, +FDI_RX_CTL (PIPE_A )) & fdi_config; }intel_crt_reset (&crt->base.base);
drivers/gpu/drm/i915/display/intel_display_core.h +5 -0
@@ -299,6 +299,11 @@ struct intel_display {struct work_struct suspend_work; } fbdev; +struct { +unsigned int pll_freq; +u32 rx_config; + } fdi; +struct {/* * Base address of where the gmbus and gpio blocks are located
drivers/gpu/drm/i915/display/intel_fdi.c +5 -5
@@ -210,14 +210,14 @@ void intel_fdi_pll_freq_update(struct drm_i915_private *i915)u32 fdi_pll_clk =intel_de_read (i915,FDI_PLL_BIOS_0 ) &FDI_PLL_FB_CLOCK_MASK ; - i915->fdi_pll_freq = (fdi_pll_clk +2 ) *10000 ; + i915->display.fdi.pll_freq = (fdi_pll_clk +2 ) *10000 ; }else if (IS_SANDYBRIDGE (i915) ||IS_IVYBRIDGE (i915)) { - i915->fdi_pll_freq =270000 ; + i915->display.fdi.pll_freq =270000 ; }else {return ; } -drm_dbg (&i915->drm,"FDI PLL freq=%d\n" , i915->fdi_pll_freq); +drm_dbg (&i915->drm,"FDI PLL freq=%d\n" , i915->display.fdi.pll_freq); } int intel_fdi_link_freq(struct drm_i915_private *i915,
@@ -226,7 +226,7 @@ int intel_fdi_link_freq(struct drm_i915_private *i915,if (HAS_DDI (i915))return pipe_config->port_clock;/* SPLL */ else -return i915->fdi_pll_freq; +return i915->display.fdi.pll_freq; } int ilk_fdi_compute_config(struct intel_crtc *crtc,
@@ -789,7 +789,7 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2) | FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);/* Enable the PCH Receiver FDI PLL */ - rx_ctl_val = dev_priv->fdi_rx_config |FDI_RX_ENHANCE_FRAME_ENABLE | + rx_ctl_val = dev_priv->display.fdi.rx_config |FDI_RX_ENHANCE_FRAME_ENABLE |FDI_RX_PLL_ENABLE |FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes);intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val);
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -290,7 +290,6 @@ struct drm_i915_private {unsigned int max_dotclk_freq;unsigned int hpll_freq; -unsigned int fdi_pll_freq;unsigned int czclk_freq;struct {
@@ -362,8 +361,6 @@ struct drm_i915_private {struct drm_property *broadcast_rgb_property;struct drm_property *force_audio_property; -u32 fdi_rx_config; -/* * Shadows for CHV DPLL_MD regs to keep the state * checker somewhat working in the presence hardware
Signature · 1 line
2.34.1
PATCH v2 17/38 drm/i915: move overlay to display.overlay
In reply to Jani NikulaMove display overlay related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_display_core.h | 2 ++ drivers/gpu/drm/i915/display/intel_overlay.c | 12 ++++++------ drivers/gpu/drm/i915/i915_drv.h | 4 ---- drivers/gpu/drm/i915/i915_getparam.c | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +2 -0
@@ -32,6 +32,7 @@ struct intel_fbdev;struct intel_fdi_funcs ;struct intel_hotplug_funcs ;struct intel_initial_plane_config ; +struct intel_overlay ;struct intel_display_funcs {/*
@@ -251,6 +252,7 @@ struct intel_display {struct intel_dmc dmc;struct intel_dpll dpll;struct intel_hotplug hotplug; +struct intel_overlay *overlay;struct intel_wm wm; };
drivers/gpu/drm/i915/display/intel_overlay.c +6 -6
@@ -487,7 +487,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)void intel_overlay_reset (struct drm_i915_private *dev_priv) { -struct intel_overlay *overlay = dev_priv->overlay; +struct intel_overlay *overlay = dev_priv->display.overlay;if (!overlay)return ;
@@ -1113,7 +1113,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,struct drm_i915_gem_object *new_bo;int ret; - overlay = dev_priv->overlay; + overlay = dev_priv->display.overlay;if (!overlay) {drm_dbg (&dev_priv->drm,"userspace bug: no overlay\n" );return -ENODEV ;
@@ -1273,7 +1273,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,struct intel_overlay *overlay;int ret; - overlay = dev_priv->overlay; + overlay = dev_priv->display.overlay;if (!overlay) {drm_dbg (&dev_priv->drm,"userspace bug: no overlay\n" );return -ENODEV ;
@@ -1416,7 +1416,7 @@ void intel_overlay_setup(struct drm_i915_private *dev_priv)update_polyphase_filter (overlay->regs);update_reg_attrs (overlay, overlay->regs); - dev_priv->overlay = overlay; + dev_priv->display.overlay = overlay;drm_info (&dev_priv->drm,"Initialized overlay support.\n" );return ;
@@ -1428,7 +1428,7 @@ void intel_overlay_cleanup(struct drm_i915_private *dev_priv) {struct intel_overlay *overlay; - overlay =fetch_and_zero (&dev_priv->overlay); + overlay =fetch_and_zero (&dev_priv->display.overlay);if (!overlay)return ;
@@ -1457,7 +1457,7 @@ struct intel_overlay_error_state {struct intel_overlay_error_state *intel_overlay_capture_error_state (struct drm_i915_private *dev_priv) { -struct intel_overlay *overlay = dev_priv->overlay; +struct intel_overlay *overlay = dev_priv->display.overlay;struct intel_overlay_error_state *error;if (!overlay || !overlay->active)
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -83,7 +83,6 @@ struct intel_connector;struct intel_dp ;struct intel_encoder ;struct intel_limit ; -struct intel_overlay ;struct intel_overlay_error_state ;struct vlv_s0ix_state ;
@@ -343,9 +342,6 @@ struct drm_i915_private {bool preserve_bios_swizzle; -/* overlay */ -struct intel_overlay *overlay; -/* backlight registers and fields in struct intel_panel */ struct mutex backlight_lock;
drivers/gpu/drm/i915/i915_getparam.c +1 -1
@@ -36,7 +36,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, value =to_gt (i915)->ggtt->num_fences;break ;case I915_PARAM_HAS_OVERLAY : - value = !!i915->overlay; + value = !!i915->display.overlay;break ;case I915_PARAM_HAS_BSD : value = !!intel_engine_lookup_user(i915,
Signature · 1 line
2.34.1
PATCH v2 14/38 drm/i915: move wm to display.wm
In reply to Jani NikulaMove display watermark related members under drm_i915_private display sub-struct.
It's a bit arbitrary when to define a named struct for grouping, but clearly intel_wm is big enough to warrant a separate definition.
--- .../gpu/drm/i915/display/intel_display_core.h | 38 ++++ .../drm/i915/display/intel_display_debugfs.c | 24 +-- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 37 ---- drivers/gpu/drm/i915/intel_pm.c | 166 +++++++++--------- 5 files changed, 134 insertions(+), 133 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +38 -0
@@ -15,6 +15,7 @@#include "intel_dmc.h" #include "intel_dpll_mgr.h" #include "intel_gmbus.h" +#include "intel_pm_types.h" struct drm_i915_private ;struct i915_audio_component ;
@@ -101,6 +102,42 @@ struct intel_dpll { } ref_clks; }; +struct intel_wm { +/* +* Raw watermark latency values: +* in 0.1us units for WM0, +* in 0.5us units for WM1+. +*/ +/* primary */ +u16 pri_latency[5 ]; +/* sprite */ +u16 spr_latency[5 ]; +/* cursor */ +u16 cur_latency[5 ]; +/* +* Raw watermark memory latency values +* for SKL for all 8 levels +* in 1us units. +*/ +u16 skl_latency[8 ]; + +/* current hardware state */ +union { +struct ilk_wm_values hw; +struct vlv_wm_values vlv; +struct g4x_wm_values g4x; + }; + +u8 max_level; + +/* +* Should be held around atomic WM register writing; also +* protects * intel_crtc->wm.active and +* crtc_state->wm.need_postvbl_update. +*/ +struct mutex wm_mutex; +}; + struct intel_display { /* Display functions */ struct {
@@ -165,6 +202,7 @@ struct intel_display {struct intel_audio audio;struct intel_dmc dmc;struct intel_dpll dpll; + struct intel_wm wm; };#endif /* __INTEL_DISPLAY_CORE_H__ */
drivers/gpu/drm/i915/display/intel_display_debugfs.c +12 -12
@@ -1428,9 +1428,9 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)const u16 *latencies;if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->wm.skl_latency; + latencies = dev_priv->display.wm.skl_latency;else - latencies = dev_priv->wm.pri_latency; + latencies = dev_priv->display.wm.pri_latency;wm_latency_show (m, latencies);
@@ -1443,9 +1443,9 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)const u16 *latencies;if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->wm.skl_latency; + latencies = dev_priv->display.wm.skl_latency;else - latencies = dev_priv->wm.spr_latency; + latencies = dev_priv->display.wm.spr_latency;wm_latency_show (m, latencies);
@@ -1458,9 +1458,9 @@ static int cur_wm_latency_show(struct seq_file *m, void *data)const u16 *latencies;if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->wm.skl_latency; + latencies = dev_priv->display.wm.skl_latency;else - latencies = dev_priv->wm.cur_latency; + latencies = dev_priv->display.wm.cur_latency;wm_latency_show (m, latencies);
@@ -1551,9 +1551,9 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf,u16 *latencies;if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->wm.skl_latency; + latencies = dev_priv->display.wm.skl_latency;else - latencies = dev_priv->wm.pri_latency; + latencies = dev_priv->display.wm.pri_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -1566,9 +1566,9 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf,u16 *latencies;if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->wm.skl_latency; + latencies = dev_priv->display.wm.skl_latency;else - latencies = dev_priv->wm.spr_latency; + latencies = dev_priv->display.wm.spr_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -1581,9 +1581,9 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,u16 *latencies;if (DISPLAY_VER (dev_priv) >=9 ) - latencies = dev_priv->wm.skl_latency; + latencies = dev_priv->display.wm.skl_latency;else - latencies = dev_priv->wm.cur_latency; + latencies = dev_priv->display.wm.cur_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -336,7 +336,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)cpu_latency_qos_add_request (&dev_priv->sb_qos,PM_QOS_DEFAULT_VALUE );mutex_init (&dev_priv->display.audio.mutex); -mutex_init (&dev_priv->wm.wm_mutex); +mutex_init (&dev_priv->display.wm.wm_mutex);mutex_init (&dev_priv->display.pps.mutex);mutex_init (&dev_priv->hdcp_comp_mutex);
drivers/gpu/drm/i915/i915_drv.h +0 -37
@@ -68,7 +68,6 @@#include "intel_device_info.h" #include "intel_memory_region.h" #include "intel_pch.h" -#include "intel_pm_types.h" #include "intel_runtime_pm.h" #include "intel_step.h" #include "intel_uncore.h"
@@ -505,42 +504,6 @@ struct drm_i915_private {u32 sagv_block_time_us; -struct { -/* -* Raw watermark latency values: -* in 0.1us units for WM0, -* in 0.5us units for WM1+. -*/ -/* primary */ -u16 pri_latency[5 ]; -/* sprite */ -u16 spr_latency[5 ]; -/* cursor */ -u16 cur_latency[5 ]; -/* -* Raw watermark memory latency values -* for SKL for all 8 levels -* in 1us units. -*/ -u16 skl_latency[8 ]; - -/* current hardware state */ -union { -struct ilk_wm_values hw; -struct vlv_wm_values vlv; -struct g4x_wm_values g4x; - }; - -u8 max_level; - -/* -* Should be held around atomic WM register writing; also -* protects * intel_crtc->wm.active and -* crtc_state->wm.need_postvbl_update. -*/ -struct mutex wm_mutex; - } wm; -struct dram_info {bool wm_lv_0_adjust_needed;u8 num_channels;
drivers/gpu/drm/i915/intel_pm.c +83 -83
430 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 37/38 drm/i915: move atomic_helper under display sub-struct
In reply to Jani NikulaMove display atomic helper related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++------- drivers/gpu/drm/i915/display/intel_display_core.h | 6 ++++++ drivers/gpu/drm/i915/i915_drv.h | 5 ----- 3 files changed, 13 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +7 -7
@@ -7408,7 +7408,7 @@ static void intel_atomic_helper_free_state(struct drm_i915_private *dev_priv)struct intel_atomic_state *state, *next;struct llist_node *freed; - freed =llist_del_all (&dev_priv->atomic_helper.free_list); + freed =llist_del_all (&dev_priv->display.atomic_helper.free_list);llist_for_each_entry_safe (state, next, freed, freed)drm_atomic_state_put (&state->base); }
@@ -7416,7 +7416,7 @@ static void intel_atomic_helper_free_state(struct drm_i915_private *dev_priv)static void intel_atomic_helper_free_state_worker (struct work_struct *work) {struct drm_i915_private *dev_priv = -container_of (work,typeof (*dev_priv), atomic_helper.free_work); +container_of (work,typeof (*dev_priv), display.atomic_helper.free_work);intel_atomic_helper_free_state (dev_priv); }
@@ -7709,7 +7709,7 @@ intel_atomic_commit_ready(struct i915_sw_fence *fence,case FENCE_FREE : {struct intel_atomic_helper *helper = - &to_i915 (state->base.dev)->atomic_helper; + &to_i915 (state->base.dev)->display.atomic_helper;if (llist_add (&state->freed, &helper->free_list))schedule_work (&helper->free_work);
@@ -8704,8 +8704,8 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)if (ret) goto cleanup_vga_client_pw_domain_dmc; -init_llist_head (&i915->atomic_helper.free_list); -INIT_WORK (&i915->atomic_helper.free_work, +init_llist_head (&i915->display.atomic_helper.free_list); +INIT_WORK (&i915->display.atomic_helper.free_work, intel_atomic_helper_free_state_worker);intel_init_quirks (i915);
@@ -8998,8 +8998,8 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915)flush_workqueue (i915->display.wq.flip);flush_workqueue (i915->display.wq.modeset); -flush_work (&i915->atomic_helper.free_work); -drm_WARN_ON (&i915->drm, !llist_empty (&i915->atomic_helper.free_list)); +flush_work (&i915->display.atomic_helper.free_work); +drm_WARN_ON (&i915->drm, !llist_empty (&i915->display.atomic_helper.free_list)); }/* part #2: call after irq uninstall */
drivers/gpu/drm/i915/display/intel_display_core.h +6 -0
@@ -7,6 +7,7 @@#define __INTEL_DISPLAY_CORE_H__#include <linux/list.h> +#include <linux/llist.h> #include <linux/mutex.h> #include <linux/types.h> #include <linux/wait.h>
@@ -268,6 +269,11 @@ struct intel_display { } funcs;/* Grouping using anonymous structs. Keep sorted. */ +struct intel_atomic_helper { +struct llist_head free_list; +struct work_struct free_work; + } atomic_helper; +struct {/* backlight registers and fields in struct intel_panel */ struct mutex lock;
drivers/gpu/drm/i915/i915_drv.h +0 -5
@@ -301,11 +301,6 @@ struct drm_i915_private {struct list_head global_obj_list; -struct intel_atomic_helper { -struct llist_head free_list; -struct work_struct free_work; - } atomic_helper; -bool mchbar_need_disable;struct intel_l3_parity l3_parity;
Signature · 1 line
2.34.1
PATCH v2 38/38 drm/i915: move and group properties under display.properties
In reply to Jani NikulaMove display property related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 8 ++++---- drivers/gpu/drm/i915/display/intel_connector.c | 8 ++++---- drivers/gpu/drm/i915/display/intel_display_core.h | 6 ++++++ drivers/gpu/drm/i915/i915_drv.h | 3 --- 4 files changed, 14 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +4 -4
@@ -62,9 +62,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (state); -if (property == dev_priv->force_audio_property) +if (property == dev_priv->display.properties.force_audio) *val = intel_conn_state->force_audio; -else if (property == dev_priv->broadcast_rgb_property) +else if (property == dev_priv->display.properties.broadcast_rgb) *val = intel_conn_state->broadcast_rgb;else { drm_dbg_atomic(&dev_priv->drm,
@@ -95,12 +95,12 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (state); -if (property == dev_priv->force_audio_property) { +if (property == dev_priv->display.properties.force_audio) { intel_conn_state->force_audio = val;return 0 ; } -if (property == dev_priv->broadcast_rgb_property) { +if (property == dev_priv->display.properties.broadcast_rgb) { intel_conn_state->broadcast_rgb = val;return 0 ; }
drivers/gpu/drm/i915/display/intel_connector.c +4 -4
@@ -229,7 +229,7 @@ intel_attach_force_audio_property(struct drm_connector *connector)struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_property *prop; - prop = dev_priv->force_audio_property; + prop = dev_priv->display.properties.force_audio;if (prop ==NULL ) { prop = drm_property_create_enum(dev, 0, "audio",
@@ -238,7 +238,7 @@ intel_attach_force_audio_property(struct drm_connector *connector)if (prop ==NULL )return ; - dev_priv->force_audio_property = prop; + dev_priv->display.properties.force_audio = prop; }drm_object_attach_property (&connector->base, prop,0 ); }
@@ -256,7 +256,7 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_property *prop; - prop = dev_priv->broadcast_rgb_property; + prop = dev_priv->display.properties.broadcast_rgb;if (prop ==NULL ) { prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, "Broadcast RGB",
@@ -265,7 +265,7 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)if (prop ==NULL )return ; - dev_priv->broadcast_rgb_property = prop; + dev_priv->display.properties.broadcast_rgb = prop; }drm_object_attach_property (&connector->base, prop,0 );
drivers/gpu/drm/i915/display/intel_display_core.h +6 -0
@@ -27,6 +27,7 @@#include "intel_pm_types.h" struct drm_i915_private ; +struct drm_property ;struct i915_audio_component ;struct i915_hdcp_comp_master ;struct intel_atomic_state ;
@@ -371,6 +372,11 @@ struct intel_display {struct mutex mutex; } pps; +struct { +struct drm_property *broadcast_rgb; +struct drm_property *force_audio; + } properties; +struct {unsigned long mask; } quirks;
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -321,9 +321,6 @@ struct drm_i915_private {struct i915_gpu_error gpu_error; -struct drm_property *broadcast_rgb_property; -struct drm_property *force_audio_property; -/* * Shadows for CHV DPLL_MD regs to keep the state * checker somewhat working in the presence hardware
Signature · 1 line
2.34.1
PATCH v2 12/38 drm/i915: move dpll under display.dpll
In reply to Jani NikulaMove display dpll related members under drm_i915_private display sub-struct.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 12 +- drivers/gpu/drm/i915/display/intel_ddi.c | 24 ++-- drivers/gpu/drm/i915/display/intel_display.c | 4 +- .../gpu/drm/i915/display/intel_display_core.h | 21 ++++ .../drm/i915/display/intel_display_debugfs.c | 8 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 112 +++++++++--------- .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- drivers/gpu/drm/i915/gvt/handlers.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 21 ---- 9 files changed, 104 insertions(+), 104 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +6 -6
@@ -642,13 +642,13 @@ static void gen11_dsi_gate_clocks(struct intel_encoder *encoder)u32 tmp;enum phy phy; -mutex_lock (&dev_priv->dpll.lock); +mutex_lock (&dev_priv->display.dpll.lock); tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp |=ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy);intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->dpll.lock); +mutex_unlock (&dev_priv->display.dpll.lock); }static void gen11_dsi_ungate_clocks (struct intel_encoder *encoder)
@@ -658,13 +658,13 @@ static void gen11_dsi_ungate_clocks(struct intel_encoder *encoder)u32 tmp;enum phy phy; -mutex_lock (&dev_priv->dpll.lock); +mutex_lock (&dev_priv->display.dpll.lock); tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy);intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->dpll.lock); +mutex_unlock (&dev_priv->display.dpll.lock); }static bool gen11_dsi_is_clock_enabled (struct intel_encoder *encoder)
@@ -694,7 +694,7 @@ static void gen11_dsi_map_pll(struct intel_encoder *encoder,enum phy phy;u32 val; -mutex_lock (&dev_priv->dpll.lock); +mutex_lock (&dev_priv->display.dpll.lock); val =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) {
@@ -710,7 +710,7 @@ static void gen11_dsi_map_pll(struct intel_encoder *encoder,intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 ); -mutex_unlock (&dev_priv->dpll.lock); +mutex_unlock (&dev_priv->display.dpll.lock); } static void
drivers/gpu/drm/i915/display/intel_ddi.c +12 -12
@@ -1425,7 +1425,7 @@ hsw_set_signal_levels(struct intel_encoder *encoder,static void _icl_ddi_enable_clock (struct drm_i915_private *i915,i915_reg_t reg,u32 clk_sel_mask,u32 clk_sel,u32 clk_off) { -mutex_lock (&i915->dpll.lock); +mutex_lock (&i915->display.dpll.lock);intel_de_rmw (i915, reg, clk_sel_mask, clk_sel);
@@ -1435,17 +1435,17 @@ static void _icl_ddi_enable_clock(struct drm_i915_private *i915, i915_reg_t reg,*/ intel_de_rmw (i915, reg, clk_off,0 ); -mutex_unlock (&i915->dpll.lock); +mutex_unlock (&i915->display.dpll.lock); }static void _icl_ddi_disable_clock (struct drm_i915_private *i915,i915_reg_t reg,u32 clk_off) { -mutex_lock (&i915->dpll.lock); +mutex_lock (&i915->display.dpll.lock);intel_de_rmw (i915, reg,0 , clk_off); -mutex_unlock (&i915->dpll.lock); +mutex_unlock (&i915->display.dpll.lock); } static bool _icl_ddi_is_clock_enabled(struct drm_i915_private *i915, i915_reg_t reg,
@@ -1720,12 +1720,12 @@ static void icl_ddi_tc_enable_clock(struct intel_encoder *encoder,intel_de_write (i915,DDI_CLK_SEL (port),icl_pll_to_ddi_clk_sel (encoder, crtc_state)); -mutex_lock (&i915->dpll.lock); +mutex_lock (&i915->display.dpll.lock);intel_de_rmw (i915,ICL_DPCLKA_CFGCR0 ,ICL_DPCLKA_CFGCR0_TC_CLK_OFF (tc_port),0 ); -mutex_unlock (&i915->dpll.lock); +mutex_unlock (&i915->display.dpll.lock); }static void icl_ddi_tc_disable_clock (struct intel_encoder *encoder)
@@ -1734,12 +1734,12 @@ static void icl_ddi_tc_disable_clock(struct intel_encoder *encoder)enum tc_port tc_port =intel_port_to_tc (i915, encoder->port);enum port port = encoder->port; -mutex_lock (&i915->dpll.lock); +mutex_lock (&i915->display.dpll.lock);intel_de_rmw (i915,ICL_DPCLKA_CFGCR0 ,0 ,ICL_DPCLKA_CFGCR0_TC_CLK_OFF (tc_port)); -mutex_unlock (&i915->dpll.lock); +mutex_unlock (&i915->display.dpll.lock);intel_de_write (i915,DDI_CLK_SEL (port),DDI_CLK_SEL_NONE ); }
@@ -1824,7 +1824,7 @@ static void skl_ddi_enable_clock(struct intel_encoder *encoder,if (drm_WARN_ON (&i915->drm, !pll))return ; -mutex_lock (&i915->dpll.lock); +mutex_lock (&i915->display.dpll.lock); intel_de_rmw(i915, DPLL_CTRL2, DPLL_CTRL2_DDI_CLK_OFF(port) |
@@ -1832,7 +1832,7 @@ static void skl_ddi_enable_clock(struct intel_encoder *encoder,DPLL_CTRL2_DDI_CLK_SEL (pll->info->id, port) | DPLL_CTRL2_DDI_SEL_OVERRIDE(port)); -mutex_unlock (&i915->dpll.lock); +mutex_unlock (&i915->display.dpll.lock); }static void skl_ddi_disable_clock (struct intel_encoder *encoder)
@@ -1840,12 +1840,12 @@ static void skl_ddi_disable_clock(struct intel_encoder *encoder)struct drm_i915_private *i915 =to_i915 (encoder->base.dev);enum port port = encoder->port; -mutex_lock (&i915->dpll.lock); +mutex_lock (&i915->display.dpll.lock);intel_de_rmw (i915,DPLL_CTRL2 ,0 ,DPLL_CTRL2_DDI_CLK_OFF (port)); -mutex_unlock (&i915->dpll.lock); +mutex_unlock (&i915->display.dpll.lock); }static bool skl_ddi_is_clock_enabled (struct intel_encoder *encoder)
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -1486,7 +1486,7 @@ static void intel_encoders_update_prepare(struct intel_atomic_state *state)* Make sure the DPLL state is up-to-date for fastset TypeC ports after non-blocking commits. * TODO: Update the DPLL state for all cases in the encoder->update_prepare() hook. */ -if (i915->dpll.mgr) { +if (i915->display.dpll.mgr) {for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {if (intel_crtc_needs_modeset (new_crtc_state))continue ;
@@ -5838,7 +5838,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_BOOL (double_wide); -if (dev_priv->dpll.mgr) { +if (dev_priv->display.dpll.mgr) {PIPE_CONF_CHECK_P (shared_dpll);PIPE_CONF_CHECK_X (dpll_hw_state.dpll);
drivers/gpu/drm/i915/display/intel_display_core.h +21 -0
@@ -12,6 +12,7 @@#include "intel_display.h" #include "intel_dmc.h" +#include "intel_dpll_mgr.h" #include "intel_gmbus.h" struct drm_i915_private ;
@@ -23,6 +24,7 @@ struct intel_color_funcs;struct intel_crtc ;struct intel_crtc_state ;struct intel_dpll_funcs ; +struct intel_dpll_mgr ;struct intel_fdi_funcs ;struct intel_hotplug_funcs ;struct intel_initial_plane_config ;
@@ -79,6 +81,24 @@ struct intel_audio { } lpe; }; +/* +* 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 intel_dpll { +struct mutex lock; + +int num_shared_dpll; +struct intel_shared_dpll shared_dplls[I915_NUM_PLLS ]; +const struct intel_dpll_mgr *mgr; + +struct { +int nssc; +int ssc; + } ref_clks; +}; + struct intel_display { /* Display functions */ struct {
@@ -136,6 +156,7 @@ struct intel_display {/* Grouping using named structs. Keep sorted. */ struct intel_audio audio;struct intel_dmc dmc; + struct intel_dpll dpll; };#endif /* __INTEL_DISPLAY_CORE_H__ */
drivers/gpu/drm/i915/display/intel_display_debugfs.c +4 -4
@@ -933,11 +933,11 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)drm_modeset_lock_all (dev);seq_printf (m,"PLL refclks: non-SSC: %d kHz, SSC: %d kHz\n" , - dev_priv->dpll.ref_clks.nssc, - dev_priv->dpll.ref_clks.ssc); + dev_priv->display.dpll.ref_clks.nssc, + dev_priv->display.dpll.ref_clks.ssc); -for (i =0 ; i < dev_priv->dpll.num_shared_dpll; i++) { -struct intel_shared_dpll *pll = &dev_priv->dpll.shared_dplls[i]; +for (i =0 ; i < dev_priv->display.dpll.num_shared_dpll; i++) { +struct intel_shared_dpll *pll = &dev_priv->display.dpll.shared_dplls[i];seq_printf (m,"DPLL%i: %s, id: %i\n" , i, pll->info->name, pll->info->id);
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +56 -56
357 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_pch_refclk.c +1 -1
@@ -522,7 +522,7 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv) }/* Check if any DPLLs are using the SSC source */ -for (i =0 ; i < dev_priv->dpll.num_shared_dpll; i++) { +for (i =0 ; i < dev_priv->display.dpll.num_shared_dpll; i++) {u32 temp =intel_de_read (dev_priv,PCH_DPLL (i));if (!(temp &DPLL_VCO_ENABLE ))
drivers/gpu/drm/i915/gvt/handlers.c +2 -2
@@ -498,7 +498,7 @@ static u32 bdw_vgpu_get_dp_bitrate(struct intel_vgpu *vgpu, enum port port)switch (wrpll_ctl &WRPLL_REF_MASK ) {case WRPLL_REF_PCH_SSC : - refclk = vgpu->gvt->gt->i915->dpll.ref_clks.ssc; + refclk = vgpu->gvt->gt->i915->display.dpll.ref_clks.ssc;break ;case WRPLL_REF_LCPLL : refclk =2700000 ;
@@ -529,7 +529,7 @@ static u32 bdw_vgpu_get_dp_bitrate(struct intel_vgpu *vgpu, enum port port)static u32 bxt_vgpu_get_dp_bitrate (struct intel_vgpu *vgpu,enum port port) {u32 dp_br =0 ; -int refclk = vgpu->gvt->gt->i915->dpll.ref_clks.nssc; +int refclk = vgpu->gvt->gt->i915->display.dpll.ref_clks.nssc;enum dpio_phy phy =DPIO_PHY0 ;enum dpio_channel ch =DPIO_CH0 ;struct dpll clock = {0 };
drivers/gpu/drm/i915/i915_drv.h +0 -21
@@ -41,7 +41,6 @@#include "display/intel_display.h" #include "display/intel_display_core.h" #include "display/intel_display_power.h" -#include "display/intel_dpll_mgr.h" #include "display/intel_dsb.h" #include "display/intel_fbc.h" #include "display/intel_frontbuffer.h"
@@ -75,7 +74,6 @@#include "intel_uncore.h" #include "intel_wopcm.h" -struct dpll ;struct drm_i915_clock_gating_funcs ;struct drm_i915_gem_object ;struct drm_i915_private ;
@@ -449,25 +447,6 @@ struct drm_i915_private {/* Kernel Modesetting */ -/** -* 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 { -struct mutex lock; - -int num_shared_dpll; -struct intel_shared_dpll shared_dplls[I915_NUM_PLLS ]; -const struct intel_dpll_mgr *mgr; - -struct { -int nssc; -int ssc; - } ref_clks; - } dpll; -struct list_head global_obj_list;struct i915_frontbuffer_tracking fb_tracking;
Signature · 1 line
2.34.1
PATCH v2 27/38 drm/i915: move and group power related members under display.power
In reply to Jani NikulaMove display power related members under drm_i915_private display sub-struct.
Arguably chv_phy_control and chv_phy_assert could be placed in a phy substruct, but they are only used in the power code.
--- .../gpu/drm/i915/display/intel_display_core.h | 11 ++ .../drm/i915/display/intel_display_power.c | 114 +++++++++--------- .../i915/display/intel_display_power_map.c | 4 +- .../i915/display/intel_display_power_well.c | 56 ++++----- .../i915/display/intel_display_power_well.h | 12 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 20 +-- 8 files changed, 111 insertions(+), 110 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +11 -0
@@ -16,6 +16,7 @@#include "intel_cdclk.h" #include "intel_display.h" +#include "intel_display_power.h" #include "intel_dmc.h" #include "intel_dpll_mgr.h" #include "intel_fbc.h"
@@ -324,6 +325,16 @@ struct intel_display {struct mutex comp_mutex; } hdcp; +struct { +struct i915_power_domains domains; + +/* Shadow for DISPLAY_PHY_CONTROL which can't be safely read */ +u32 chv_phy_control; + +/* perform PHY state sanity checks? */ +bool chv_phy_assert[2 ]; + } power; +struct {u32 mmio_base;
drivers/gpu/drm/i915/display/intel_display_power.c +57 -57
397 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_map.c +2 -2
@@ -1388,7 +1388,7 @@ __set_power_wells(struct i915_power_domains *power_domains, {struct drm_i915_private *i915 =container_of (power_domains, struct drm_i915_private, - power_domains); + display.power.domains);u64 power_well_ids =0 ;const struct i915_power_well_desc_list *desc_list;const struct i915_power_well_desc *desc;
@@ -1447,7 +1447,7 @@ int intel_display_power_map_init(struct i915_power_domains *power_domains) {struct drm_i915_private *i915 =container_of (power_domains, struct drm_i915_private, - power_domains); + display.power.domains);/* * The enabling order will be from lower to higher indexed wells, * the disabling order is reversed.
drivers/gpu/drm/i915/display/intel_display_power_well.c +28 -28
168 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_well.h +6 -6
@@ -14,15 +14,15 @@ struct drm_i915_private;struct i915_power_well ;#define for_each_power_well (__dev_priv, __power_well) \ - for ((__power_well) = (__dev_priv)->power_domains.power_wells; \ - (__power_well) - (__dev_priv)->power_domains.power_wells < \ - (__dev_priv)->power_domains.power_well_count; \ + for ((__power_well) = (__dev_priv)->display.power.domains.power_wells; \ + (__power_well) - (__dev_priv)->display.power.domains.power_wells < \ + (__dev_priv)->display.power.domains.power_well_count; \ (__power_well)++)#define for_each_power_well_reverse (__dev_priv, __power_well) \ - for ((__power_well) = (__dev_priv)->power_domains.power_wells + \ - (__dev_priv)->power_domains.power_well_count - 1; \ - (__power_well) - (__dev_priv)->power_domains.power_wells >= 0; \ + for ((__power_well) = (__dev_priv)->display.power.domains.power_wells + \ + (__dev_priv)->display.power.domains.power_well_count - 1; \ + (__power_well) - (__dev_priv)->display.power.domains.power_wells >= 0; \ (__power_well)--)/*
drivers/gpu/drm/i915/display/intel_dpio_phy.c +1 -1
@@ -484,7 +484,7 @@ void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy)enum dpio_phy rcomp_phy = phy_info->rcomp_phy;bool was_enabled; -lockdep_assert_held (&dev_priv->power_domains.lock); +lockdep_assert_held (&dev_priv->display.power.domains.lock); was_enabled = true;if (rcomp_phy !=-1 )
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -492,7 +492,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)seq_puts (m,"Runtime power management not supported\n" );seq_printf (m,"Runtime power status: %s\n" , -str_enabled_disabled (!dev_priv->power_domains.init_wakeref)); +str_enabled_disabled (!dev_priv->display.power.domains.init_wakeref));seq_printf (m,"GPU idle: %s\n" ,str_yes_no (!to_gt (dev_priv)->awake)); seq_printf(m, "IRQs disabled: %s\n",
drivers/gpu/drm/i915/i915_drv.h +5 -15
@@ -38,7 +38,6 @@#include "display/intel_display.h" #include "display/intel_display_core.h" -#include "display/intel_display_power.h" #include "display/intel_dsb.h" #include "display/intel_frontbuffer.h"
@@ -358,8 +357,6 @@ struct drm_i915_private {*/ u32 edram_size_mb; -struct i915_power_domains power_domains; -struct i915_gpu_error gpu_error;struct drm_property *broadcast_rgb_property;
@@ -367,8 +364,6 @@ struct drm_i915_private {u32 fdi_rx_config; -/* Shadow for DISPLAY_PHY_CONTROL which can't be safely read */ -u32 chv_phy_control;/* * Shadows for CHV DPLL_MD regs to keep the state * checker somewhat working in the presence hardware
@@ -437,16 +432,11 @@ struct drm_i915_private {bool irq_enabled; -union { -/* perform PHY state sanity checks? */ -bool chv_phy_assert[2 ]; - -/* -* DG2: Mask of PHYs that were not calibrated by the firmware -* and should not be used. -*/ -u8 snps_phy_failed_calibration; - }; +/* +* DG2: Mask of PHYs that were not calibrated by the firmware +* and should not be used. +*/ +u8 snps_phy_failed_calibration;bool ipc_enabled;
Signature · 1 line
2.34.1
PATCH v2 34/38 drm/i915/quirks: abstract checking for display quirks
In reply to Jani NikulaAdd intel_has_quirk() for checking if a display quirk is present. Avoid accessing i915->quirks all over the place.
v2: Rebase
--- drivers/gpu/drm/i915/display/intel_backlight.c | 9 +++++---- drivers/gpu/drm/i915/display/intel_ddi.c | 3 ++- drivers/gpu/drm/i915/display/intel_panel.c | 5 +++-- drivers/gpu/drm/i915/display/intel_pps.c | 3 ++- drivers/gpu/drm/i915/display/intel_quirks.c | 5 +++++ drivers/gpu/drm/i915/display/intel_quirks.h | 5 ++++- 6 files changed, 21 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_backlight.c +5 -4
@@ -18,6 +18,7 @@#include "intel_panel.h" #include "intel_pci_config.h" #include "intel_pps.h" +#include "intel_quirks.h" /** * scale - scale values from one range to another
@@ -88,7 +89,7 @@ u32 intel_backlight_invert_pwm_level(struct intel_connector *connector, u32 val)return val;if (dev_priv->params.invert_brightness >0 || - dev_priv->quirks &QUIRK_INVERT_BRIGHTNESS ) { +intel_has_quirk (dev_priv,QUIRK_INVERT_BRIGHTNESS )) {return panel->backlight.pwm_level_max - val + panel->backlight.pwm_level_min; }
@@ -128,7 +129,7 @@ u32 intel_backlight_level_from_pwm(struct intel_connector *connector, u32 val) panel->backlight.max == 0 || panel->backlight.pwm_level_max == 0);if (dev_priv->params.invert_brightness >0 || - (dev_priv->params.invert_brightness ==0 && dev_priv->quirks &QUIRK_INVERT_BRIGHTNESS )) + (dev_priv->params.invert_brightness ==0 &&intel_has_quirk (dev_priv,QUIRK_INVERT_BRIGHTNESS ))) val = panel->backlight.pwm_level_max - (val - panel->backlight.pwm_level_min); return scale(val, panel->backlight.pwm_level_min, panel->backlight.pwm_level_max,
@@ -1605,7 +1606,7 @@ int intel_backlight_setup(struct intel_connector *connector, enum pipe pipe)int ret;if (!connector->panel.vbt.backlight.present) { -if (dev_priv->quirks &QUIRK_BACKLIGHT_PRESENT ) { +if (intel_has_quirk (dev_priv,QUIRK_BACKLIGHT_PRESENT )) {drm_dbg_kms (&dev_priv->drm,"no backlight present per VBT, but present per quirk\n" ); }else {
@@ -1777,7 +1778,7 @@ void intel_backlight_init_funcs(struct intel_panel *panel)if (intel_dp_aux_init_backlight_funcs (connector) ==0 )return ; -if (!(dev_priv->quirks &QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK )) +if (!intel_has_quirk (dev_priv,QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK )) connector->panel.backlight.power = intel_pps_backlight_power; }
drivers/gpu/drm/i915/display/intel_ddi.c +2 -1
@@ -57,6 +57,7 @@#include "intel_lspcon.h" #include "intel_pps.h" #include "intel_psr.h" +#include "intel_quirks.h" #include "intel_snps_phy.h" #include "intel_sprite.h" #include "intel_tc.h"
@@ -631,7 +632,7 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_stateintel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), ctl); -if (dev_priv->quirks &QUIRK_INCREASE_DDI_DISABLED_TIME && +if (intel_has_quirk (dev_priv,QUIRK_INCREASE_DDI_DISABLED_TIME ) &&intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) {drm_dbg_kms (&dev_priv->drm,"Quirk Increase DDI disabled time\n" );
drivers/gpu/drm/i915/display/intel_panel.c +3 -2
@@ -37,13 +37,14 @@#include "intel_display_types.h" #include "intel_drrs.h" #include "intel_panel.h" +#include "intel_quirks.h" bool intel_panel_use_ssc (struct drm_i915_private *i915) {if (i915->params.panel_use_ssc >=0 )return i915->params.panel_use_ssc !=0 ; -return i915->display.vbt.lvds_use_ssc - && !(i915->quirks &QUIRK_LVDS_SSC_DISABLE ); +return i915->display.vbt.lvds_use_ssc && + !intel_has_quirk (i915,QUIRK_LVDS_SSC_DISABLE ); } const struct drm_display_mode *
drivers/gpu/drm/i915/display/intel_pps.c +2 -1
@@ -12,6 +12,7 @@#include "intel_dpll.h" #include "intel_lvds.h" #include "intel_pps.h" +#include "intel_quirks.h" static void vlv_steal_power_sequencer (struct drm_i915_private *dev_priv,enum pipe pipe);
@@ -1202,7 +1203,7 @@ static void pps_init_delays_vbt(struct intel_dp *intel_dp,* just fails to power back on. Increasing the delay to 800ms * seems sufficient to avoid this problem. */ -if (dev_priv->quirks &QUIRK_INCREASE_T12_DELAY ) { +if (intel_has_quirk (dev_priv,QUIRK_INCREASE_T12_DELAY )) { vbt->t11_t12 =max_t (u16, vbt->t11_t12,1300 *10 ); drm_dbg_kms(&dev_priv->drm, "Increasing T12 panel delay as per the quirk to %d\n",
drivers/gpu/drm/i915/display/intel_quirks.c +5 -0
@@ -213,3 +213,8 @@ void intel_init_quirks(struct drm_i915_private *i915) intel_dmi_quirks[i].hook (i915); } } + +bool intel_has_quirk (struct drm_i915_private *i915,unsigned long quirk) +{ +return i915->quirks & quirk; +}
drivers/gpu/drm/i915/display/intel_quirks.h +4 -1
@@ -6,8 +6,11 @@#ifndef __INTEL_QUIRKS_H__#define __INTEL_QUIRKS_H__ +#include <linux/types.h> +struct drm_i915_private ; -void intel_init_quirks (struct drm_i915_private *dev_priv); +void intel_init_quirks (struct drm_i915_private *i915); +bool intel_has_quirk (struct drm_i915_private *i915,unsigned long quirk);#endif /* __INTEL_QUIRKS_H__ */
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: add display sub-struct to drm_i915_private (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add display sub-struct to drm_i915_private (rev2)
URL : https://patchwork.freedesktop.org/series/107170/
State : warning
== Summary ==
Error: dim checkpatch failed9a1bed4062a5 drm/i915: add display sub-struct to drm_i915_private
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:131: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #131:
new file mode 100644
-:156: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_crtc *' should also have an identifier name #156: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:21:
+ bool (*get_pipe_config)(struct intel_crtc *,
-:156: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_crtc_state *' should also have an identifier name #156: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:21:
+ bool (*get_pipe_config)(struct intel_crtc *,
-:158: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_crtc *' should also have an identifier name #158: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:23:
+ void (*get_initial_plane_config)(struct intel_crtc *,
-:158: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_initial_plane_config *' should also have an identifier name #158: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:23:
+ void (*get_initial_plane_config)(struct intel_crtc *,
total: 0 errors, 5 warnings, 0 checks, 200 lines checked d4a407cf1033 drm/i915: move cdclk_funcs to display.funcs fe54bc0c24f6 drm/i915: move dpll_funcs to display.funcs 113faf7227a9 drm/i915: move hotplug_funcs to display.funcs 4194d36eed7d drm/i915: move wm_disp funcs to display.funcs 79d01f148a2a drm/i915: move fdi_funcs to display.funcs 2837ed6eeba0 drm/i915: move color_funcs to display.funcs edb551fbe1f5 drm/i915: move and group gmbus members under display.gmbus -:350: WARNING:LONG_LINE_COMMENT: line length of 105 exceeds 100 columns #350: FILE: drivers/gpu/drm/i915/i915_reg.h:1485:
+#define GMBUS0 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5100) /* clock/port select */
-:359: WARNING:LONG_LINE_COMMENT: line length of 102 exceeds 100 columns #359: FILE: drivers/gpu/drm/i915/i915_reg.h:1494:
+#define GMBUS1 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5104) /* command/status */
-:378: WARNING:LONG_LINE_COMMENT: line length of 109 exceeds 100 columns #378: FILE: drivers/gpu/drm/i915/i915_reg.h:1517:
+#define GMBUS3 _MMIO(dev_priv->display.gmbus.mmio_base + 0x510c) /* data buffer bytes 3-0 */
-:379: WARNING:LONG_LINE_COMMENT: line length of 114 exceeds 100 columns #379: FILE: drivers/gpu/drm/i915/i915_reg.h:1518:
+#define GMBUS4 _MMIO(dev_priv->display.gmbus.mmio_base + 0x5110) /* interrupt mask (Pineview+) */
total: 0 errors, 4 warnings, 0 checks, 320 lines checked a1b28ae9d5cd drm/i915: move and group pps members under display.pps 057aa99ba01a drm/i915: move dmc to display.dmc
-:209: WARNING:LONG_LINE: line length of 115 exceeds 100 columns #209: FILE: drivers/gpu/drm/i915/display/intel_dmc.c:485:
+ !intel_de_read(i915, DMC_PROGRAM(i915->display.dmc.dmc_info[DMC_FW_MAIN].start_mmioaddr, 0)),
total: 0 errors, 1 warnings, 0 checks, 339 lines checkeda669551d9465 drm/i915: move and split audio under display.audio and display.funcs
-:321: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "dev_priv->display.audio.lpe.platdev" #321: FILE: drivers/gpu/drm/i915/display/intel_audio.c:1406:
+ if (dev_priv->display.audio.lpe.platdev != NULL)
-:397: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "display.audio.lpe.platdev" #397: FILE: drivers/gpu/drm/i915/display/intel_lpe_audio.c:78:
+#define HAS_LPE_AUDIO(dev_priv) ((dev_priv)->display.audio.lpe.platdev != NULL)
-:406: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #406: FILE: drivers/gpu/drm/i915/display/intel_lpe_audio.c:100:
+ rsc[0].start = rsc[0].end = dev_priv->display.audio.lpe.irq;
total: 0 errors, 0 warnings, 3 checks, 501 lines checked 9056098aa186 drm/i915: move dpll under display.dpll
-:215: CHECK:UNCOMMENTED_DEFINITION: struct mutex definition without comment #215: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:90:
+ struct mutex lock;
-:564: WARNING:AVOID_BUG: Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON() #564: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:4210:
+ BUG_ON(dev_priv->display.dpll.num_shared_dpll > I915_NUM_PLLS);
total: 0 errors, 1 warnings, 1 checks, 628 lines checked 92fae085c786 drm/i915: move and group fbdev under display.fbdev 8130ecfbc806 drm/i915: move wm to display.wm 734acd7ef942 drm/i915: move and group hdcp under display.hdcp 492b2cb39483 drm/i915: move hotplug to display.hotplug -:438: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #438: FILE: drivers/gpu/drm/i915/display/intel_hotplug.c:570:
+ queue_work(dev_priv->display.hotplug.dp_wq, &dev_priv->display.hotplug.dig_port_work);
-:594: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!dev_priv->display.hotplug.dp_wq" #594: FILE: drivers/gpu/drm/i915/i915_driver.c:256:
+ if (dev_priv->display.hotplug.dp_wq == NULL)
total: 0 errors, 1 warnings, 1 checks, 738 lines checked b5142ae6d27a drm/i915: move overlay to display.overlay 380c411f7947 drm/i915: move and group sagv under display.sagv -:212: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #212: FILE: drivers/gpu/drm/i915/intel_pm.c:5599:
+ latency = dev_priv->display.sagv.block_time_us + dev_priv->display.wm.skl_latency[0];
total: 0 errors, 1 warnings, 0 checks, 174 lines checked 60ce69f27813 drm/i915: move and group max_bw and bw_obj under display.bw 790a6af2372b drm/i915: move opregion to display.opregion 698834f622b2 drm/i915: move and group cdclk under display.cdclk -:43: WARNING:LONG_LINE: line length of 104 exceeds 100 columns #43: FILE: drivers/gpu/drm/i915/display/intel_audio.c:974:
+ get_aud_ts_cdclk_m_n(i915->display.cdclk.hw.ref, i915->display.cdclk.hw.cdclk, &aud_ts);
-:704: WARNING:LONG_LINE: line length of 120 exceeds 100 columns #704: FILE: drivers/gpu/drm/i915/display/intel_cdclk.h:80:
+ to_intel_cdclk_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.cdclk.obj))
-:707: WARNING:LONG_LINE: line length of 120 exceeds 100 columns #707: FILE: drivers/gpu/drm/i915/display/intel_cdclk.h:82:
+ to_intel_cdclk_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->display.cdclk.obj))
-:735: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #735: FILE: drivers/gpu/drm/i915/display/intel_display.c:8401:
+ cdclk_state->logical = cdclk_state->actual = i915->display.cdclk.hw;
total: 0 errors, 3 warnings, 1 checks, 815 lines checked b1345b665fd6 drm/i915: move backlight to display.backlight a9c6638db00c drm/i915: move mipi_mmio_base to display.dsi 5d899384cd2c drm/i915: move vbt to display.vbt
-:124: WARNING:LONG_LINE: line length of 108 exceeds 100 columns #124: FILE: drivers/gpu/drm/i915/display/intel_bios.c:1157:
+ i915->display.vbt.override_afc_startup_val = general->afc_startup_config == 0x1 ? 0x0 : 0x7;
-:931: WARNING:LONG_LINE: line length of 105 exceeds 100 columns #931: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:2773:
+ pll_state->div0 = TGL_DPLL0_DIV0_AFC_STARTUP(i915->display.vbt.override_afc_startup_val);
total: 0 errors, 2 warnings, 0 checks, 1031 lines checked 812d95cf947b drm/i915: move fbc to display.fbc9af3ab932b5c drm/i915/vrr: drop window2_delay member from i915 0698e0ea5853 drm/i915: move and group power related members under display.power -:388: WARNING:LONG_LINE: line length of 105 exceeds 100 columns #388: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:1913:
+ POWER_DOMAIN_INIT);
-:403: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #403: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:1939:
+ fetch_and_zero(&i915->display.power.domains.disable_wakeref));
-:448: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #448: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:2060:
+ fetch_and_zero(&i915->display.power.domains.disable_wakeref));
total: 0 errors, 3 warnings, 0 checks, 685 lines checked 62b27d441a54 drm/i915: move and group fdi members under display.fdi f051db40e588 drm/i915: move fb_tracking under display sub-struct -:27: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #27: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:124:
+ spinlock_t lock;
-:33: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #33: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:130:
+ unsigned busy_bits;
-:34: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #34: FILE: drivers/gpu/drm/i915/display/intel_display_core.h:131:
+ unsigned flip_bits;
total: 0 errors, 2 warnings, 1 checks, 200 lines checked 6c78804ee366 drm/i915: move INTEL_FRONTBUFFER_* macros to intel_frontbuffer.h -:54: WARNING:TRAILING_SEMICOLON: macros should not use a trailing semicolon #54: FILE: drivers/gpu/drm/i915/display/intel_frontbuffer.h:61:
+#define INTEL_FRONTBUFFER(pipe, plane_id) \
+ BIT((plane_id) + INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe));
-:58: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'pipe' - possible side-effects? #58: FILE: drivers/gpu/drm/i915/display/intel_frontbuffer.h:65:
+#define INTEL_FRONTBUFFER_ALL_MASK(pipe) \
+ GENMASK(INTEL_FRONTBUFFER_BITS_PER_PIPE * ((pipe) + 1) - 1, \
+ INTEL_FRONTBUFFER_BITS_PER_PIPE * (pipe))
total: 0 errors, 1 warnings, 1 checks, 64 lines checked 3907b566a8f9 drm/i915: move dbuf under display sub-struct -:182: WARNING:LONG_LINE: line length of 118 exceeds 100 columns #182: FILE: drivers/gpu/drm/i915/intel_pm.h:80:
+ to_intel_dbuf_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj))
-:185: WARNING:LONG_LINE: line length of 118 exceeds 100 columns #185: FILE: drivers/gpu/drm/i915/intel_pm.h:82:
+ to_intel_dbuf_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj))
total: 0 errors, 2 warnings, 0 checks, 136 lines checked bab2c0c1d4a0 drm/i915: move and group modeset_wq and flip_wq under display.wq f628bd3eb49b drm/i915: split gem quirks from display quirks 1dc959bce6d1 drm/i915/quirks: abstract checking for display quirks -:40: WARNING:LONG_LINE: line length of 108 exceeds 100 columns #40: FILE: drivers/gpu/drm/i915/display/intel_backlight.c:132:
+ (dev_priv->params.invert_brightness == 0 && intel_has_quirk(dev_priv, QUIRK_INVERT_BRIGHTNESS)))
total: 0 errors, 1 warnings, 0 checks, 105 lines checked 5429dedbf012 drm/i915/quirks: abstract quirks further by making quirk ids an enum e29b8e68f4b8 drm/i915: move quirks under display sub-struct cbf9474f026b drm/i915: move atomic_helper under display sub-struct 45a4f0d60277 drm/i915: move and group properties under display.properties
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: add display sub-struct to drm_i915_private (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add display sub-struct to drm_i915_private (rev2)
URL : https://patchwork.freedesktop.org/series/107170/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: add display sub-struct to drm_i915_private (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add display sub-struct to drm_i915_private (rev2)
URL : https://patchwork.freedesktop.org/series/107170/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12022 -> Patchwork_107170v2
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/index.html
Participating hosts (37 -> 35)
------------------------------
Missing (2): bat-dg2-9 bat-jsl-3
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_107170v2:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@gt_engines:
- {bat-dg2-10}: NOTRUN -> [DMESG-FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/bat-dg2-10/igt@i915_selftest@live@gt_engines.html
Known issues
------------
Here are the changes found in Patchwork_107170v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gem:
- fi-pnv-d510: [PASS][2] -> [DMESG-FAIL][3] ([i915#4528])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/fi-pnv-d510/igt@i915_selftest@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-pnv-d510/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-hsw-g3258: [PASS][4] -> [INCOMPLETE][5] ([i915#3303] / [i915#4785])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/fi-hsw-g3258/igt@i915_selftest@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-hsw-g3258/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-hsw-4770: NOTRUN -> [INCOMPLETE][6] ([i915#4817] / [i915#6598])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-hsw-4770/igt@[email protected]
* igt@runner@aborted:
- fi-pnv-d510: NOTRUN -> [FAIL][7] ([fdo#109271] / [i915#2403] / [i915#4312])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-pnv-d510/igt@[email protected]
- fi-hsw-g3258: NOTRUN -> [FAIL][8] ([fdo#109271] / [i915#4312] / [i915#6246])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-hsw-g3258/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- {bat-dg2-10}: [INCOMPLETE][9] -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/bat-dg2-10/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/bat-dg2-10/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][11] ([i915#4785]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/fi-hsw-4770/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-hsw-4770/igt@i915_selftest@[email protected]
- {fi-jsl-1}: [INCOMPLETE][13] ([i915#5134]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/fi-jsl-1/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-jsl-1/igt@i915_selftest@[email protected]
- bat-dg1-5: [DMESG-FAIL][15] ([i915#4494] / [i915#4957]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/bat-dg1-5/igt@i915_selftest@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/bat-dg1-5/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_suspend@basic-s3-without-i915:
- fi-elk-e7500: [INCOMPLETE][17] ([i915#6598] / [i915#6601] / [i915#6648]) -> [INCOMPLETE][18] ([i915#6598] / [i915#6648])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/fi-elk-e7500/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/fi-elk-e7500/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#5134]: https://gitlab.freedesktop.org/drm/intel/issues/5134
[i915#6246]: https://gitlab.freedesktop.org/drm/intel/issues/6246
[i915#6598]: https://gitlab.freedesktop.org/drm/intel/issues/6598
[i915#6601]: https://gitlab.freedesktop.org/drm/intel/issues/6601
[i915#6642]: https://gitlab.freedesktop.org/drm/intel/issues/6642
[i915#6648]: https://gitlab.freedesktop.org/drm/intel/issues/6648
Build changes
-------------
* Linux: CI_DRM_12022 -> Patchwork_107170v2
CI-20190529: 20190529
CI_DRM_12022: 7d700aafd2532afd10b5bd0d1fd76eb3a0d6610a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6636: 1298b5f0e1b3e010657ffba41d2e775fab028e08 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107170v2: 7d700aafd2532afd10b5bd0d1fd76eb3a0d6610a @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
12b413e7b7f5 drm/i915: move and group properties under display.properties 839094fecb0b drm/i915: move atomic_helper under display sub-struct 2a6159e24a43 drm/i915: move quirks under display sub-struct 12ac4a7df853 drm/i915/quirks: abstract quirks further by making quirk ids an enum c3cc0d97fdf3 drm/i915/quirks: abstract checking for display quirks 4ca466d1ac2d drm/i915: split gem quirks from display quirks 164a1a3dea4b drm/i915: move and group modeset_wq and flip_wq under display.wq 04c199fbb4e6 drm/i915: move dbuf under display sub-struct 3d7ef009b985 drm/i915: move INTEL_FRONTBUFFER_* macros to intel_frontbuffer.h 22a2eb2405bb drm/i915: move fb_tracking under display sub-struct e7f9757b4603 drm/i915: move and group fdi members under display.fdi 23712bfa5952 drm/i915: move and group power related members under display.power db9262abc048 drm/i915/vrr: drop window2_delay member from i915 8fdf54a31898 drm/i915: move fbc to display.fbcfa11ca506b9a drm/i915: move vbt to display.vbtbf9338f3e18b drm/i915: move mipi_mmio_base to display.dsi 9c36ca0cf95a drm/i915: move backlight to display.backlight 8a119bc72545 drm/i915: move and group cdclk under display.cdclk 9f4bd9d2a97c drm/i915: move opregion to display.opregion 982102c645fe drm/i915: move and group max_bw and bw_obj under display.bw d18df7ed56ac drm/i915: move and group sagv under display.sagv f03f1d347023 drm/i915: move overlay to display.overlayba19b4cb8db6 drm/i915: move hotplug to display.hotplug5bc5c67fe059 drm/i915: move and group hdcp under display.hdcp d6b9203cf903 drm/i915: move wm to display.wm6e32bc612229 drm/i915: move and group fbdev under display.fbdev a80dd2d7e23b drm/i915: move dpll under display.dpll71216a276fcd drm/i915: move and split audio under display.audio and display.funcs 15433cccd651 drm/i915: move dmc to display.dmce3ab5532f6df drm/i915: move and group pps members under display.pps 94426157ce7f drm/i915: move and group gmbus members under display.gmbus 19d5163f95b9 drm/i915: move color_funcs to display.funcs 5458d61a5b6b drm/i915: move fdi_funcs to display.funcsa46024b51bcd drm/i915: move wm_disp funcs to display.funcs 5b545ebb8ffc drm/i915: move hotplug_funcs to display.funcs 71603c7393bb drm/i915: move dpll_funcs to display.funcs674c5d6e47cd drm/i915: move cdclk_funcs to display.funcs 3d89f0a26142 drm/i915: add display sub-struct to drm_i915_private
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: add display sub-struct to drm_i915_private (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add display sub-struct to drm_i915_private (rev2)
URL : https://patchwork.freedesktop.org/series/107170/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12022_full -> Patchwork_107170v2_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (12 -> 11)
------------------------------
Missing (1): shard-rkl
Known issues
------------
Here are the changes found in Patchwork_107170v2_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@kms:
- shard-tglb: [PASS][1] -> [FAIL][2] ([i915#5784])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-tglb6/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb5/igt@[email protected]
* igt@gem_exec_balancer@parallel-bb-first:
- shard-iclb: [PASS][3] -> [SKIP][4] ([i915#4525]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb6/igt@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: NOTRUN -> [FAIL][5] ([i915#2842])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk8/igt@gem_exec_fair@[email protected]
- shard-tglb: [PASS][6] -> [FAIL][7] ([i915#2842])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-tglb8/igt@gem_exec_fair@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-kbl: [PASS][8] -> [FAIL][9] ([i915#2842]) +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-kbl4/igt@gem_exec_fair@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_lmem_swapping@heavy-verify-random-ccs:
- shard-tglb: NOTRUN -> [SKIP][10] ([i915#4613]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random:
- shard-kbl: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#4613])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl1/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-verify:
- shard-glk: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#4613])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk8/igt@[email protected]
* igt@gem_pxp@reject-modify-context-protection-off-2:
- shard-tglb: NOTRUN -> [SKIP][13] ([i915#4270])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@gem_workarounds@suspend-resume-fd:
- shard-kbl: [PASS][14] -> [DMESG-WARN][15] ([i915#180]) +4 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-kbl4/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl1/igt@[email protected]
- shard-apl: [PASS][16] -> [DMESG-WARN][17] ([i915#180])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-apl8/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-apl6/igt@[email protected]
* igt@i915_query@test-query-geometry-subslices:
- shard-tglb: NOTRUN -> [SKIP][18] ([i915#5723])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-hflip-async-flip:
- shard-tglb: NOTRUN -> [SKIP][19] ([i915#5286]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-hflip-async-flip.html
* igt@kms_big_fb@y-tiled-64bpp-rotate-90:
- shard-tglb: NOTRUN -> [SKIP][20] ([fdo#111614])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_big_fb@yf-tiled-addfb-size-offset-overflow:
- shard-tglb: NOTRUN -> [SKIP][21] ([fdo#111615]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-pixel-format-4_tiled_dg2_rc_ccs:
- shard-tglb: NOTRUN -> [SKIP][22] ([i915#3689] / [i915#6095]) +2 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_ccs@pipe-a-bad-pixel-format-4_tiled_dg2_rc_ccs.html
* igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#3886]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl1/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-basic-4_tiled_dg2_rc_ccs_cc:
- shard-tglb: NOTRUN -> [SKIP][24] ([i915#6095])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_ccs@pipe-b-crc-primary-basic-4_tiled_dg2_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][25] ([i915#3689] / [i915#3886])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-bad-rotation-90-4_tiled_dg2_rc_ccs_cc:
- shard-tglb: NOTRUN -> [SKIP][26] ([i915#3689])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_ccs@pipe-d-bad-rotation-90-4_tiled_dg2_rc_ccs_cc.html
* igt@kms_ccs@pipe-d-bad-rotation-90-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][27] ([fdo#111615] / [i915#3689])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_ccs@pipe-d-bad-rotation-90-yf_tiled_ccs.html
* igt@kms_cdclk@mode-transition-all-outputs:
- shard-tglb: NOTRUN -> [SKIP][28] ([i915#3742])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_chamelium@dp-audio-edid:
- shard-snb: NOTRUN -> [SKIP][29] ([fdo#109271] / [fdo#111827])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-snb4/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-with-enabled-mode:
- shard-kbl: NOTRUN -> [SKIP][30] ([fdo#109271] / [fdo#111827])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl1/igt@[email protected]
* igt@kms_chamelium@vga-hpd-after-suspend:
- shard-tglb: NOTRUN -> [SKIP][31] ([fdo#109284] / [fdo#111827]) +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_chamelium@vga-hpd-enable-disable-mode:
- shard-glk: NOTRUN -> [SKIP][32] ([fdo#109271] / [fdo#111827]) +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk8/igt@[email protected]
* igt@kms_content_protection@srm:
- shard-kbl: NOTRUN -> [TIMEOUT][33] ([i915#1319] / [i915#6637])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl1/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor@varying-size:
- shard-iclb: [PASS][34] -> [FAIL][35] ([i915#2346]) +2 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb1/igt@kms_cursor_legacy@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb7/igt@kms_cursor_legacy@[email protected]
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-4tiled:
- shard-tglb: NOTRUN -> [SKIP][36] ([i915#5287])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_flip@2x-plain-flip-fb-recreate:
- shard-tglb: NOTRUN -> [SKIP][37] ([fdo#109274] / [fdo#111825] / [i915#3637])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2:
- shard-glk: [PASS][38] -> [FAIL][39] ([i915#79]) +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-glk5/igt@kms_flip@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk7/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-16bpp-xtile-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][40] ([i915#3555]) +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-16bpp-xtile-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-32bpp-yftile-downscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][41] ([i915#2672]) +6 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb6/igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-32bpp-yftile-downscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][42] ([i915#2672] / [i915#3555])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb1/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-onoff:
- shard-tglb: NOTRUN -> [SKIP][43] ([fdo#109280] / [fdo#111825]) +6 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-wc:
- shard-kbl: NOTRUN -> [SKIP][44] ([fdo#109271]) +31 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-blt:
- shard-tglb: NOTRUN -> [SKIP][45] ([i915#6497]) +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt:
- shard-glk: NOTRUN -> [SKIP][46] ([fdo#109271]) +44 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk8/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render:
- shard-snb: NOTRUN -> [SKIP][47] ([fdo#109271]) +13 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-snb4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-render.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-tglb: NOTRUN -> [SKIP][48] ([i915#3555])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_plane_lowres@tiling-yf:
- shard-tglb: NOTRUN -> [SKIP][49] ([fdo#112054])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_plane_multiple@atomic-pipe-d-tiling-4:
- shard-tglb: NOTRUN -> [SKIP][50] ([i915#5288])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1:
- shard-iclb: [PASS][51] -> [SKIP][52] ([i915#5235]) +2 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb1/igt@kms_plane_scaling@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb2/igt@kms_plane_scaling@[email protected]
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
- shard-tglb: NOTRUN -> [SKIP][53] ([i915#2920])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_gtt:
- shard-iclb: [PASS][54] -> [SKIP][55] ([fdo#109441]) +1 similar issue
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_gtt.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb6/igt@kms_psr@psr2_cursor_mmap_gtt.html
* igt@kms_psr@psr2_suspend:
- shard-tglb: NOTRUN -> [FAIL][56] ([i915#132] / [i915#3467]) +1 similar issue
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@kms_psr@psr2_suspend.html
* igt@kms_psr_stress_test@flip-primary-invalidate-overlay:
- shard-iclb: [PASS][57] -> [SKIP][58] ([i915#5519])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb3/igt@[email protected]
* igt@kms_writeback@writeback-invalid-parameters:
- shard-tglb: NOTRUN -> [SKIP][59] ([i915#2437])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
* igt@prime_nv_pcopy@test3_5:
- shard-tglb: NOTRUN -> [SKIP][60] ([fdo#109291])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@prime_nv_pcopy@test3_5.html
* igt@sysfs_clients@fair-7:
- shard-glk: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#2994])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk8/igt@[email protected]
* igt@sysfs_clients@split-50:
- shard-tglb: NOTRUN -> [SKIP][62] ([i915#2994])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb7/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_balancer@parallel-balancer:
- shard-iclb: [SKIP][63] ([i915#4525]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb5/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb2/igt@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][65] ([i915#2842]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-apl8/igt@gem_exec_fair@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-apl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vecs0:
- shard-kbl: [FAIL][67] ([i915#2842]) -> [PASS][68] +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-kbl7/igt@gem_exec_fair@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl7/igt@gem_exec_fair@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][69] ([i915#454]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb2/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb1/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- shard-snb: [INCOMPLETE][71] ([i915#3921]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-snb4/igt@i915_selftest@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-snb4/igt@i915_selftest@[email protected]
* igt@i915_suspend@debugfs-reader:
- shard-kbl: [DMESG-WARN][73] ([i915#180]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-kbl1/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl1/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-glk: [FAIL][75] ([i915#2346]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-glk3/igt@kms_cursor_legacy@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk1/igt@kms_cursor_legacy@[email protected]
* igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][77] ([i915#2122]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-glk6/igt@kms_flip@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-glk6/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-tglb: [FAIL][79] ([i915#79]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-tglb6/igt@kms_flip@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-tglb8/igt@kms_flip@[email protected]
* igt@kms_hdr@bpc-switch-suspend@pipe-a-dp-1:
- shard-kbl: [FAIL][81] ([i915#1188]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-kbl4/igt@kms_hdr@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-kbl4/igt@kms_hdr@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][83] ([fdo#109441]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb6/igt@kms_psr@psr2_sprite_plane_move.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
#### Warnings ####
* igt@kms_cursor_crc@cursor-suspend@pipe-a-dp-1:
- shard-apl: [INCOMPLETE][85] ([i915#6598]) -> [INCOMPLETE][86] ([i915#180] / [i915#6598])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-apl7/igt@kms_cursor_crc@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-apl1/igt@kms_cursor_crc@[email protected]
* igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf:
- shard-iclb: [SKIP][87] ([i915#2920]) -> [SKIP][88] ([i915#658])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb2/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb6/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-iclb: [SKIP][89] ([i915#2920]) -> [SKIP][90] ([fdo#111068] / [i915#658])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb2/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb1/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb:
- shard-iclb: [SKIP][91] ([i915#658]) -> [SKIP][92] ([i915#2920]) +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-iclb1/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-iclb2/igt@[email protected]
* igt@runner@aborted:
- shard-apl: [FAIL][93] ([i915#3002] / [i915#4312] / [i915#5257] / [i915#6599]) -> ([FAIL][94], [FAIL][95]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#4312] / [i915#5257] / [i915#6599])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12022/shard-apl7/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-apl6/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/shard-apl1/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1063]: https://gitlab.freedesktop.org/drm/intel/issues/1063
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2410]: https://gitlab.freedesktop.org/drm/intel/issues/2410
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3467]: https://gitlab.freedesktop.org/drm/intel/issues/3467
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4941]: https://gitlab.freedesktop.org/drm/intel/issues/4941
[i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5287]: https://gitlab.freedesktop.org/drm/intel/issues/5287
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5519]: https://gitlab.freedesktop.org/drm/intel/issues/5519
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#5982]: https://gitlab.freedesktop.org/drm/intel/issues/5982
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6598]: https://gitlab.freedesktop.org/drm/intel/issues/6598
[i915#6599]: https://gitlab.freedesktop.org/drm/intel/issues/6599
[i915#6637]: https://gitlab.freedesktop.org/drm/intel/issues/6637
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12022 -> Patchwork_107170v2
CI-20190529: 20190529
CI_DRM_12022: 7d700aafd2532afd10b5bd0d1fd76eb3a0d6610a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6636: 1298b5f0e1b3e010657ffba41d2e775fab028e08 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107170v2: 7d700aafd2532afd10b5bd0d1fd76eb3a0d6610a @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107170v2/index.html