refactor intel_display.c + a bit more
Subsystems (3)
Dave Airlie
maintainerThis is a repost of the last series, rebased to include the VRR and GEN12 CCS changes.
It also has to scaler and ddi pll state movement patches that need review, I think the rest should be pretty good to push sooner so I don't fall into any more rebase traps.
Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 1/10 drm/i915: refactor ddi translations into a separate file (v2)
From: Dave Airlie <[email protected]>
Ville suggested this, these tables are probably better being standalone.
This fixes up the cnl/bxt interfaces to be like the others, the intel one I left alone since it has a few extra entrypoints.
v2: add back missing rocketlake bits.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_ddi.c | 1417 +---------------- .../drm/i915/display/intel_ddi_buf_trans.c | 1394 ++++++++++++++++ .../drm/i915/display/intel_ddi_buf_trans.h | 100 ++ 4 files changed, 1507 insertions(+), 1405 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c create mode 100644 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -241,6 +241,7 @@ i915-y += \ display/icl_dsi.o \ display/intel_crt.o \ display/intel_ddi.o \ + display/intel_ddi_buf_trans.o \ display/intel_dp.o \ display/intel_dp_aux.o \ display/intel_dp_aux_backlight.o \
drivers/gpu/drm/i915/display/intel_ddi.c +12 -1405
1,479 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c new file +1394 -0
1,394 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h new file +100 -0
100 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 2/10 drm/i915: migrate hsw fdi code to new file.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
Daniel asked for this, but it's a bit messy and I'm not sure how best to clean it up yet.
--- drivers/gpu/drm/i915/display/intel_crt.c | 1 + drivers/gpu/drm/i915/display/intel_ddi.c | 151 ++--------------------- drivers/gpu/drm/i915/display/intel_ddi.h | 8 +- drivers/gpu/drm/i915/display/intel_fdi.c | 139 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_fdi.h | 3 + 5 files changed, 156 insertions(+), 146 deletions(-)
drivers/gpu/drm/i915/display/intel_crt.c +1 -0
@@ -38,6 +38,7 @@#include "intel_crt.h" #include "intel_ddi.h" #include "intel_display_types.h" +#include "intel_fdi.h" #include "intel_fifo_underrun.h" #include "intel_gmbus.h" #include "intel_hotplug.h"
drivers/gpu/drm/i915/display/intel_ddi.c +7 -144
184 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_ddi.h +6 -2
@@ -17,6 +17,7 @@ struct intel_crtc_state;struct intel_dp ;struct intel_dpll_hw_state ;struct intel_encoder ; +struct intel_shared_dpll ;enum transcoder ; i915_reg_t dp_tp_ctl_reg(struct intel_encoder *encoder,
@@ -27,8 +28,11 @@ void intel_ddi_fdi_post_disable(struct intel_atomic_state *state,struct intel_encoder *intel_encoder, const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state); -void hsw_fdi_link_train (struct intel_encoder *encoder, -const struct intel_crtc_state *crtc_state); +u32 hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll); +void intel_prepare_dp_ddi_buffers (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state); +void intel_wait_ddi_buf_idle (struct drm_i915_private *dev_priv, +enum port port);void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);bool intel_ddi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe); void intel_ddi_enable_transcoder_func(struct intel_encoder *encoder,
drivers/gpu/drm/i915/display/intel_fdi.c +139 -0
151 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_fdi.h +3 -0
@@ -9,6 +9,7 @@struct drm_i915_private ;struct intel_crtc ;struct intel_crtc_state ; +struct intel_encoder ;#define I915_DISPLAY_CONFIG_RETRY 1 int ilk_fdi_compute_config(struct intel_crtc *intel_crtc,
@@ -18,5 +19,7 @@ void ilk_fdi_disable(struct intel_crtc *crtc);void ilk_fdi_pll_disable (struct intel_crtc *intel_crtc);void ilk_fdi_pll_enable (const struct intel_crtc_state *crtc_state);void intel_fdi_init_hook (struct drm_i915_private *dev_priv); +void hsw_fdi_link_train (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);#endif
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 3/10 drm/i915: migrate skl planes code new file (v5)
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
Rework the plane init calls to do the gen test one level higher.
Rework some of the plane helpers so they can live in new file, there is still some scope to clean up the plane/fb interactions later.
v2: drop atomic code back, rename file to Ville suggestions, add header file.
v3: move scaler bits back
v4: drop wrong new includes (Ville)
v5: integrate the ccs gen12 changes
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/display/i9xx_plane.c | 4 - drivers/gpu/drm/i915/display/icl_dsi.c | 1 + drivers/gpu/drm/i915/display/intel_crtc.c | 13 +- drivers/gpu/drm/i915/display/intel_ddi.c | 1 + drivers/gpu/drm/i915/display/intel_display.c | 964 +------ drivers/gpu/drm/i915/display/intel_display.h | 27 +- .../drm/i915/display/intel_display_types.h | 27 + drivers/gpu/drm/i915/display/intel_psr.c | 1 + drivers/gpu/drm/i915/display/intel_sprite.c | 1376 +--------- drivers/gpu/drm/i915/display/intel_sprite.h | 6 +- .../drm/i915/display/skl_universal_plane.c | 2304 +++++++++++++++++ .../drm/i915/display/skl_universal_plane.h | 33 + drivers/gpu/drm/i915/intel_pm.c | 1 + 14 files changed, 2424 insertions(+), 2337 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.c create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane.h
drivers/gpu/drm/i915/Makefile +2 -1
@@ -223,7 +223,8 @@ i915-y += \ display/intel_sprite.o \ display/intel_tc.o \ display/intel_vga.o \ - display/i9xx_plane.o + display/i9xx_plane.o \ + display/skl_universal_plane.o i915-$(CONFIG_ACPI) += \ display/intel_acpi.o \ display/intel_opregion.o
drivers/gpu/drm/i915/display/i9xx_plane.c +0 -4
@@ -578,10 +578,6 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)int num_formats;int ret, zpos; -if (INTEL_GEN (dev_priv) >=9 ) -return skl_universal_plane_create (dev_priv, pipe, -PLANE_PRIMARY ); - plane =intel_plane_alloc ();if (IS_ERR (plane))return plane;
drivers/gpu/drm/i915/display/icl_dsi.c +1 -0
@@ -35,6 +35,7 @@#include "intel_dsi.h" #include "intel_panel.h" #include "intel_vdsc.h" +#include "skl_universal_plane.h" static int header_credits_available (struct drm_i915_private *dev_priv,enum transcoder dsi_trans)
drivers/gpu/drm/i915/display/intel_crtc.c +11 -2
@@ -20,6 +20,7 @@#include "intel_pipe_crc.h" #include "intel_sprite.h" #include "i9xx_plane.h" +#include "skl_universal_plane.h" static void assert_vblank_disabled (struct drm_crtc *crtc) {
@@ -243,7 +244,11 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) crtc->pipe = pipe; crtc->num_scalers =RUNTIME_INFO (dev_priv)->num_scalers[pipe]; - primary =intel_primary_plane_create (dev_priv, pipe); +if (INTEL_GEN (dev_priv) >=9 ) + primary =skl_universal_plane_create (dev_priv, pipe, +PLANE_PRIMARY ); +else + primary =intel_primary_plane_create (dev_priv, pipe);if (IS_ERR (primary)) { ret =PTR_ERR (primary); goto fail;
@@ -253,7 +258,11 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)for_each_sprite (dev_priv, pipe, sprite) {struct intel_plane *plane; - plane =intel_sprite_plane_create (dev_priv, pipe, sprite); +if (INTEL_GEN (dev_priv) >=9 ) + plane =skl_universal_plane_create (dev_priv, pipe, +PLANE_SPRITE0 + sprite); +else + plane =intel_sprite_plane_create (dev_priv, pipe, sprite);if (IS_ERR (plane)) { ret =PTR_ERR (plane); goto fail;
drivers/gpu/drm/i915/display/intel_ddi.c +1 -0
@@ -54,6 +54,7 @@#include "intel_tc.h" #include "intel_vdsc.h" #include "intel_vrr.h" +#include "skl_universal_plane.h" static const u8 index_to_dp_signal_levels[] = { [0 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 |DP_TRAIN_PRE_EMPH_LEVEL_0 ,
drivers/gpu/drm/i915/display/intel_display.c +25 -939
1,079 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +14 -13
@@ -52,6 +52,7 @@ struct intel_crtc_state;struct intel_digital_port ;struct intel_dp ;struct intel_encoder ; +struct intel_initial_plane_config ;struct intel_load_detect_pipe ;struct intel_plane ;struct intel_plane_state ;
@@ -508,7 +509,6 @@ void intel_link_compute_m_n(u16 bpp, int nlanes,struct intel_link_m_n *m_n, bool constant_n, bool fec_enable);bool is_ccs_modifier (u64 modifier); -int intel_main_to_aux_plane (const struct drm_framebuffer *fb,int main_plane);void lpt_disable_clkout_dp (struct drm_i915_private *dev_priv);u32 intel_plane_fb_max_stride (struct drm_i915_private *dev_priv,u32 pixel_format,u64 modifier);
@@ -620,18 +620,7 @@ u32 skl_scaler_get_filter_select(enum drm_scaling_filter filter, int set);void skl_scaler_setup_filter (struct drm_i915_private *dev_priv,enum pipe pipe,int id,int set,enum drm_scaling_filter filter);void ilk_pfit_disable (const struct intel_crtc_state *old_crtc_state); -u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state); -u32 glk_plane_color_ctl_crtc (const struct intel_crtc_state *crtc_state); -u32 skl_plane_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state); -u32 skl_plane_ctl_crtc (const struct intel_crtc_state *crtc_state); -u32 skl_plane_stride (const struct intel_plane_state *plane_state, -int plane); -int skl_check_plane_surface (struct intel_plane_state *plane_state); -int skl_calc_main_surface_offset (const struct intel_plane_state *plane_state, -int *x,int *y,u32 *offset); -int skl_format_to_fourcc (int format,bool rgb_order,bool alpha); +int bdw_get_pipemisc_bpp (struct intel_crtc *crtc);unsigned int intel_plane_fence_y_offset (const struct intel_plane_state *plane_state);
@@ -654,6 +643,18 @@ struct intel_encoder * intel_get_crtc_new_encoder(const struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state); +unsigned int intel_surf_alignment (const struct drm_framebuffer *fb, +int color_plane); +void intel_fb_plane_get_subsampling (int *hsub,int *vsub, +const struct drm_framebuffer *fb, +int color_plane); +u32 intel_plane_adjust_aligned_offset (int *x,int *y, +const struct intel_plane_state *state, +int color_plane, +u32 old_offset,u32 new_offset); +unsigned int intel_tile_width_bytes (const struct drm_framebuffer *fb,int color_plane); +unsigned int intel_tile_height (const struct drm_framebuffer *fb,int color_plane); +/* modesetting */ void intel_modeset_init_hw (struct drm_i915_private *i915);int intel_modeset_init_noirq (struct drm_i915_private *i915);
drivers/gpu/drm/i915/display/intel_display_types.h +27 -0
@@ -37,6 +37,7 @@#include <drm/drm_dp_mst_helper.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_probe_helper.h> #include <drm/drm_rect.h> #include <drm/drm_vblank.h>
@@ -1894,4 +1895,30 @@ static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv, return dev_priv->fdi_pll_freq; } +static inline bool is_ccs_plane (const struct drm_framebuffer *fb,int plane) +{ +if (!is_ccs_modifier (fb->modifier)) +return false; + +return plane >= fb->format->num_planes /2 ; +} + +static inline bool is_gen12_ccs_modifier (u64 modifier) +{ +return modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS || + modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC || + modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ; +} + +static inline bool is_gen12_ccs_plane (const struct drm_framebuffer *fb,int plane) +{ +return is_gen12_ccs_modifier (fb->modifier) &&is_ccs_plane (fb, plane); +} + +static inline bool is_gen12_ccs_cc_plane (const struct drm_framebuffer *fb,int plane) +{ +return fb->modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC && + plane ==2 ; +} +#endif /* __INTEL_DISPLAY_TYPES_H__ */
drivers/gpu/drm/i915/display/intel_psr.c +1 -0
@@ -32,6 +32,7 @@#include "intel_hdmi.h" #include "intel_psr.h" #include "intel_sprite.h" +#include "skl_universal_plane.h" /** * DOC: Panel Self Refresh (PSR/SRD)
drivers/gpu/drm/i915/display/intel_sprite.c +1 -1375
1,418 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_sprite.h +3 -3
@@ -38,9 +38,6 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state);int intel_plane_check_stride (const struct intel_plane_state *plane_state);int intel_plane_check_src_coordinates (struct intel_plane_state *plane_state);int chv_plane_check_rotation (const struct intel_plane_state *plane_state); -struct intel_plane * -skl_universal_plane_create (struct drm_i915_private *dev_priv, -enum pipe pipe,enum plane_id plane_id);static inline u8 icl_hdr_plane_mask (void ) {
@@ -59,4 +56,7 @@ int hsw_plane_min_cdclk(const struct intel_crtc_state *crtc_state,int vlv_plane_min_cdclk (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); +void skl_program_scaler (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state);#endif /* __INTEL_SPRITE_H__ */
drivers/gpu/drm/i915/display/skl_universal_plane.c new file +2304 -0
328 lines not on this page · raw message
drivers/gpu/drm/i915/display/skl_universal_plane.h new file +33 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
Dave Airlie
maintainerPATCH 4/10 drm/i915: move pipe update code into crtc. (v2)
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
Daniel suggested this should move here.
v2: move vrr code.
--- drivers/gpu/drm/i915/display/intel_crtc.c | 245 ++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_sprite.c | 242 ------------------- 2 files changed, 245 insertions(+), 242 deletions(-)
drivers/gpu/drm/i915/display/intel_crtc.c +245 -0
@@ -10,6 +10,9 @@#include <drm/drm_plane.h> #include <drm/drm_plane_helper.h> +#include "i915_trace.h" +#include "i915_vgpu.h" +#include "intel_atomic.h" #include "intel_atomic_plane.h" #include "intel_color.h"
@@ -17,8 +20,11 @@#include "intel_cursor.h" #include "intel_display_debugfs.h" #include "intel_display_types.h" +#include "intel_dsi.h" #include "intel_pipe_crc.h" +#include "intel_psr.h" #include "intel_sprite.h" +#include "intel_vrr.h" #include "i9xx_plane.h" #include "skl_universal_plane.h"
@@ -332,3 +338,242 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)return ret; } + +int intel_usecs_to_scanlines (const struct drm_display_mode *adjusted_mode, +int usecs) +{ +/* paranoia */ +if (!adjusted_mode->crtc_htotal) +return 1 ; + +return DIV_ROUND_UP (usecs * adjusted_mode->crtc_clock, +1000 * adjusted_mode->crtc_htotal); +} + +static int intel_mode_vblank_start (const struct drm_display_mode *mode) +{ +int vblank_start = mode->crtc_vblank_start; + +if (mode->flags &DRM_MODE_FLAG_INTERLACE ) + vblank_start =DIV_ROUND_UP (vblank_start,2 ); + +return vblank_start; +} + +/** +* intel_pipe_update_start() - start update of a set of display registers +* @new_crtc_state: the new crtc state +* +* Mark the start of an update to pipe registers that should be updated +* atomically regarding vblank. If the next vblank will happens within +* the next 100 us, this function waits until the vblank passes. +* +* After a successful call to this function, interrupts will be disabled +* until a subsequent call to intel_pipe_update_end(). That is done to +* avoid random delays. +*/ +void intel_pipe_update_start (const struct intel_crtc_state *new_crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +const struct drm_display_mode *adjusted_mode = &new_crtc_state->hw.adjusted_mode; +long timeout =msecs_to_jiffies_timeout (1 ); +int scanline, min, max, vblank_start; +wait_queue_head_t *wq =drm_crtc_vblank_waitqueue (&crtc->base); +bool need_vlv_dsi_wa = (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) && +intel_crtc_has_type (new_crtc_state,INTEL_OUTPUT_DSI ); +DEFINE_WAIT (wait); +u32 psr_status; + +if (new_crtc_state->uapi.async_flip) +return ; + +if (new_crtc_state->vrr.enable) + vblank_start =intel_vrr_vmax_vblank_start (new_crtc_state); +else + vblank_start =intel_mode_vblank_start (adjusted_mode); + +/* FIXME needs to be calibrated sensibly */ + min = vblank_start -intel_usecs_to_scanlines (adjusted_mode, +VBLANK_EVASION_TIME_US ); + max = vblank_start -1 ; + +if (min <=0 || max <=0 ) + goto irq_disable; + +if (drm_WARN_ON (&dev_priv->drm,drm_crtc_vblank_get (&crtc->base))) + goto irq_disable; + +/* +* Wait for psr to idle out after enabling the VBL interrupts +* VBL interrupts will start the PSR exit and prevent a PSR +* re-entry as well. +*/ +if (intel_psr_wait_for_idle (new_crtc_state, &psr_status)) +drm_err (&dev_priv->drm, +"PSR idle timed out 0x%x, atomic update may fail\n" , + psr_status); + +local_irq_disable (); + + crtc->debug.min_vbl = min; + crtc->debug.max_vbl = max; +trace_intel_pipe_update_start (crtc); + +for (;;) { +/* +* prepare_to_wait() has a memory barrier, which guarantees +* other CPUs can see the task state update by the time we +* read the scanline. +*/ +prepare_to_wait (wq, &wait,TASK_UNINTERRUPTIBLE ); + + scanline =intel_get_crtc_scanline (crtc); +if (scanline < min || scanline > max) +break ; + +if (!timeout) { +drm_err (&dev_priv->drm, +"Potential atomic update failure on pipe %c\n" , +pipe_name (crtc->pipe)); +break ; + } + +local_irq_enable (); + + timeout =schedule_timeout (timeout); + +local_irq_disable (); + } + +finish_wait (wq, &wait); + +drm_crtc_vblank_put (&crtc->base); + +/* +* On VLV/CHV DSI the scanline counter would appear to +* increment approx. 1/3 of a scanline before start of vblank. +* The registers still get latched at start of vblank however. +* This means we must not write any registers on the first +* line of vblank (since not the whole line is actually in +* vblank). And unfortunately we can't use the interrupt to +* wait here since it will fire too soon. We could use the +* frame start interrupt instead since it will fire after the +* critical scanline, but that would require more changes +* in the interrupt code. So for now we'll just do the nasty +* thing and poll for the bad scanline to pass us by. +* +* FIXME figure out if BXT+ DSI suffers from this as well +*/ +while (need_vlv_dsi_wa && scanline == vblank_start) + scanline =intel_get_crtc_scanline (crtc); + + crtc->debug.scanline_start = scanline; + crtc->debug.start_vbl_time =ktime_get (); + crtc->debug.start_vbl_count =intel_crtc_get_vblank_counter (crtc); + +trace_intel_pipe_update_vblank_evaded (crtc); +return ; + +irq_disable: +local_irq_disable (); +} + +#if IS_ENABLED (CONFIG_DRM_I915_DEBUG_VBLANK_EVADE ) +static void dbg_vblank_evade (struct intel_crtc *crtc,ktime_t end) +{ +u64 delta =ktime_to_ns (ktime_sub (end, crtc->debug.start_vbl_time)); +unsigned int h; + + h =ilog2 (delta >>9 ); +if (h >=ARRAY_SIZE (crtc->debug.vbl.times)) + h =ARRAY_SIZE (crtc->debug.vbl.times) -1 ; + crtc->debug.vbl.times[h]++; + + crtc->debug.vbl.sum += delta; +if (!crtc->debug.vbl.min || delta < crtc->debug.vbl.min) + crtc->debug.vbl.min = delta; +if (delta > crtc->debug.vbl.max) + crtc->debug.vbl.max = delta; + +if (delta >1000 *VBLANK_EVASION_TIME_US ) { +drm_dbg_kms (crtc->base.dev, +"Atomic update on pipe (%c) took %lld us, max time under evasion is %u us\n" , +pipe_name (crtc->pipe), +div_u64 (delta,1000 ), +VBLANK_EVASION_TIME_US ); + crtc->debug.vbl.over++; + } +} +#else +static void dbg_vblank_evade (struct intel_crtc *crtc,ktime_t end) {} +#endif + +/** +* intel_pipe_update_end() - end update of a set of display registers +* @new_crtc_state: the new crtc state +* +* Mark the end of an update started with intel_pipe_update_start(). This +* re-enables interrupts and verifies the update was actually completed +* before a vblank. +*/ +void intel_pipe_update_end (struct intel_crtc_state *new_crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc); +enum pipe pipe = crtc->pipe; +int scanline_end =intel_get_crtc_scanline (crtc); +u32 end_vbl_count =intel_crtc_get_vblank_counter (crtc); +ktime_t end_vbl_time =ktime_get (); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); + +if (new_crtc_state->uapi.async_flip) +return ; + +trace_intel_pipe_update_end (crtc, end_vbl_count, scanline_end); + +/* +* Incase of mipi dsi command mode, we need to set frame update +* request for every commit. +*/ +if (INTEL_GEN (dev_priv) >=11 && +intel_crtc_has_type (new_crtc_state,INTEL_OUTPUT_DSI )) +icl_dsi_frame_update (new_crtc_state); + +/* We're still in the vblank-evade critical section, this can't race. +* Would be slightly nice to just grab the vblank count and arm the +* event outside of the critical section - the spinlock might spin for a +* while ... */ +if (new_crtc_state->uapi.event) { +drm_WARN_ON (&dev_priv->drm, +drm_crtc_vblank_get (&crtc->base) !=0 ); + +spin_lock (&crtc->base.dev->event_lock); +drm_crtc_arm_vblank_event (&crtc->base, + new_crtc_state->uapi.event); +spin_unlock (&crtc->base.dev->event_lock); + + new_crtc_state->uapi.event =NULL ; + } + +local_irq_enable (); + +/* Send VRR Push to terminate Vblank */ +intel_vrr_send_push (new_crtc_state); + +if (intel_vgpu_active (dev_priv)) +return ; + +if (crtc->debug.start_vbl_count && + crtc->debug.start_vbl_count != end_vbl_count) { +drm_err (&dev_priv->drm, +"Atomic update failure on pipe %c (start=%u end=%u) time %lld us, min %d, max %d, scanline start %d, end %d\n" , +pipe_name (pipe), crtc->debug.start_vbl_count, + end_vbl_count, +ktime_us_delta (end_vbl_time, + crtc->debug.start_vbl_time), + crtc->debug.min_vbl, crtc->debug.max_vbl, + crtc->debug.scanline_start, scanline_end); + } + +dbg_vblank_evade (crtc, end_vbl_time); +}
drivers/gpu/drm/i915/display/intel_sprite.c +0 -242
252 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 5/10 drm/i915: split fb scalable checks into g4x and skl versions
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This just cleans these up a bit.
--- drivers/gpu/drm/i915/display/intel_sprite.c | 7 +++---- drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +3 -4
@@ -1346,19 +1346,18 @@ g4x_plane_get_hw_state(struct intel_plane *plane,return ret; } -static bool intel_fb_scalable (const struct drm_framebuffer *fb) +static bool g4x_fb_scalable (const struct drm_framebuffer *fb) {if (!fb)return false;switch (fb->format->format) {case DRM_FORMAT_C8 : -return false;case DRM_FORMAT_XRGB16161616F :case DRM_FORMAT_ARGB16161616F :case DRM_FORMAT_XBGR16161616F :case DRM_FORMAT_ABGR16161616F : -return INTEL_GEN (to_i915 (fb->dev)) >=11 ; +return false;default :return true; }
@@ -1435,7 +1434,7 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,int max_scale =DRM_PLANE_HELPER_NO_SCALING ;int ret; -if (intel_fb_scalable (plane_state->hw.fb)) { +if (g4x_fb_scalable (plane_state->hw.fb)) {if (INTEL_GEN (dev_priv) <7 ) { min_scale =1 ; max_scale =16 <<16 ;
drivers/gpu/drm/i915/display/skl_universal_plane.c +2 -2
@@ -1657,7 +1657,7 @@ static int skl_check_plane_surface(struct intel_plane_state *plane_state)return 0 ; } -static bool intel_fb_scalable (const struct drm_framebuffer *fb) +static bool skl_fb_scalable (const struct drm_framebuffer *fb) {if (!fb)return false;
@@ -1690,7 +1690,7 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,return ret;/* use scaler when colorkey is not required */ -if (!plane_state->ckey.flags &&intel_fb_scalable (fb)) { +if (!plane_state->ckey.flags &&skl_fb_scalable (fb)) { min_scale =1 ; max_scale =skl_plane_max_scale (dev_priv, fb); }
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 6/10 drm/i915: move is_ccs_modifier to an inline
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
There is no need for this to be out of line.
--- drivers/gpu/drm/i915/display/intel_display.c | 9 --------- drivers/gpu/drm/i915/display/intel_display.h | 1 - drivers/gpu/drm/i915/display/intel_display_types.h | 9 +++++++++ 3 files changed, 9 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -9
@@ -1821,15 +1821,6 @@ intel_get_format_info(const struct drm_mode_fb_cmd2 *cmd) } } -bool is_ccs_modifier (u64 modifier) -{ -return modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS || - modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC || - modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS || - modifier ==I915_FORMAT_MOD_Y_TILED_CCS || - modifier == I915_FORMAT_MOD_Yf_TILED_CCS; -} -static int gen12_ccs_aux_stride (struct drm_framebuffer *fb,int ccs_plane) { return DIV_ROUND_UP(fb->pitches[skl_ccs_to_main_plane(fb, ccs_plane)],
drivers/gpu/drm/i915/display/intel_display.h +0 -1
@@ -508,7 +508,6 @@ void intel_link_compute_m_n(u16 bpp, int nlanes, int pixel_clock, int link_clock, struct intel_link_m_n *m_n, bool constant_n, bool fec_enable); -bool is_ccs_modifier (u64 modifier);void lpt_disable_clkout_dp (struct drm_i915_private *dev_priv);u32 intel_plane_fb_max_stride (struct drm_i915_private *dev_priv,u32 pixel_format,u64 modifier);
drivers/gpu/drm/i915/display/intel_display_types.h +9 -0
@@ -1895,6 +1895,15 @@ static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,return dev_priv->fdi_pll_freq; } +static inline bool is_ccs_modifier (u64 modifier) +{ +return modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS || + modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC || + modifier ==I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS || + modifier ==I915_FORMAT_MOD_Y_TILED_CCS || + modifier == I915_FORMAT_MOD_Yf_TILED_CCS; +} +static inline bool is_ccs_plane (const struct drm_framebuffer *fb,int plane) {if (!is_ccs_modifier (fb->modifier))
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 7/10 drm/i915: migrate pll enable/disable code to intel_dpll.[ch]
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This moves the older i9xx/vlv/chv enable/disable to dpll file.
--- drivers/gpu/drm/i915/display/intel_display.c | 512 ------------------- drivers/gpu/drm/i915/display/intel_display.h | 3 - drivers/gpu/drm/i915/display/intel_dp.c | 1 + drivers/gpu/drm/i915/display/intel_dpll.c | 509 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dpll.h | 18 + drivers/gpu/drm/i915/display/intel_pps.c | 1 + 6 files changed, 529 insertions(+), 515 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -512
@@ -113,10 +113,6 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);static void ilk_set_pipeconf (const struct intel_crtc_state *crtc_state);static void hsw_set_pipeconf (const struct intel_crtc_state *crtc_state);static void bdw_set_pipemisc (const struct intel_crtc_state *crtc_state); -static void vlv_prepare_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config); -static void chv_prepare_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config);static void ilk_pfit_enable (const struct intel_crtc_state *crtc_state);static void intel_modeset_setup_hw_state (struct drm_device *dev,struct drm_modeset_acquire_ctx *ctx);
@@ -569,224 +565,6 @@ static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv,assert_pch_hdmi_disabled (dev_priv, pipe,PORT_D ,PCH_HDMID ); } -static void _vlv_enable_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum pipe pipe = crtc->pipe; - -intel_de_write (dev_priv,DPLL (pipe), pipe_config->dpll_hw_state.dpll); -intel_de_posting_read (dev_priv,DPLL (pipe)); -udelay (150 ); - -if (intel_de_wait_for_set (dev_priv,DPLL (pipe),DPLL_LOCK_VLV ,1 )) -drm_err (&dev_priv->drm,"DPLL %d failed to lock\n" , pipe); -} - -static void vlv_enable_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum pipe pipe = crtc->pipe; - -assert_pipe_disabled (dev_priv, pipe_config->cpu_transcoder); - -/* PLL is protected by panel, make sure we can write it */ -assert_panel_unlocked (dev_priv, pipe); - -if (pipe_config->dpll_hw_state.dpll &DPLL_VCO_ENABLE ) -_vlv_enable_pll (crtc, pipe_config); - -intel_de_write (dev_priv,DPLL_MD (pipe), - pipe_config->dpll_hw_state.dpll_md); -intel_de_posting_read (dev_priv,DPLL_MD (pipe)); -} - - -static void _chv_enable_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum pipe pipe = crtc->pipe; -enum dpio_channel port =vlv_pipe_to_channel (pipe); -u32 tmp; - -vlv_dpio_get (dev_priv); - -/* Enable back the 10bit clock to display controller */ - tmp =vlv_dpio_read (dev_priv, pipe,CHV_CMN_DW14 (port)); - tmp |=DPIO_DCLKP_EN ; -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW14 (port), tmp); - -vlv_dpio_put (dev_priv); - -/* -* Need to wait > 100ns between dclkp clock enable bit and PLL enable. -*/ -udelay (1 ); - -/* Enable PLL */ -intel_de_write (dev_priv,DPLL (pipe), pipe_config->dpll_hw_state.dpll); - -/* Check PLL is locked */ -if (intel_de_wait_for_set (dev_priv,DPLL (pipe),DPLL_LOCK_VLV ,1 )) -drm_err (&dev_priv->drm,"PLL %d failed to lock\n" , pipe); -} - -static void chv_enable_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum pipe pipe = crtc->pipe; - -assert_pipe_disabled (dev_priv, pipe_config->cpu_transcoder); - -/* PLL is protected by panel, make sure we can write it */ -assert_panel_unlocked (dev_priv, pipe); - -if (pipe_config->dpll_hw_state.dpll &DPLL_VCO_ENABLE ) -_chv_enable_pll (crtc, pipe_config); - -if (pipe !=PIPE_A ) { -/* -* WaPixelRepeatModeFixForC0:chv -* -* DPLLCMD is AWOL. Use chicken bits to propagate -* the value from DPLLBMD to either pipe B or C. -*/ -intel_de_write (dev_priv,CBR4_VLV ,CBR_DPLLBMD_PIPE (pipe)); -intel_de_write (dev_priv,DPLL_MD (PIPE_B ), - pipe_config->dpll_hw_state.dpll_md); -intel_de_write (dev_priv,CBR4_VLV ,0 ); - dev_priv->chv_dpll_md[pipe] = pipe_config->dpll_hw_state.dpll_md; - -/* -* DPLLB VGA mode also seems to cause problems. -* We should always have it disabled. -*/ -drm_WARN_ON (&dev_priv->drm, - (intel_de_read (dev_priv,DPLL (PIPE_B )) & -DPLL_VGA_MODE_DIS ) ==0 ); - }else { -intel_de_write (dev_priv,DPLL_MD (pipe), - pipe_config->dpll_hw_state.dpll_md); -intel_de_posting_read (dev_priv,DPLL_MD (pipe)); - } -} - -static bool i9xx_has_pps (struct drm_i915_private *dev_priv) -{ -if (IS_I830 (dev_priv)) -return false; - -return IS_PINEVIEW (dev_priv) ||IS_MOBILE (dev_priv); -} - -static void i9xx_enable_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -i915_reg_t reg =DPLL (crtc->pipe); -u32 dpll = crtc_state->dpll_hw_state.dpll; -int i; - -assert_pipe_disabled (dev_priv, crtc_state->cpu_transcoder); - -/* PLL is protected by panel, make sure we can write it */ -if (i9xx_has_pps (dev_priv)) -assert_panel_unlocked (dev_priv, crtc->pipe); - -/* -* Apparently we need to have VGA mode enabled prior to changing -* the P1/P2 dividers. Otherwise the DPLL will keep using the old -* dividers, even though the register value does change. -*/ -intel_de_write (dev_priv, reg, dpll & ~DPLL_VGA_MODE_DIS ); -intel_de_write (dev_priv, reg, dpll); - -/* Wait for the clocks to stabilize. */ -intel_de_posting_read (dev_priv, reg); -udelay (150 ); - -if (INTEL_GEN (dev_priv) >=4 ) { -intel_de_write (dev_priv,DPLL_MD (crtc->pipe), - crtc_state->dpll_hw_state.dpll_md); - }else { -/* The pixel multiplier can only be updated once the -* DPLL is enabled and the clocks are stable. -* -* So write it again. -*/ -intel_de_write (dev_priv, reg, dpll); - } - -/* We do this three times for luck */ -for (i =0 ; i <3 ; i++) { -intel_de_write (dev_priv, reg, dpll); -intel_de_posting_read (dev_priv, reg); -udelay (150 );/* wait for warmup */ - } -} - -static void i9xx_disable_pll (const struct intel_crtc_state *crtc_state) -{ -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum pipe pipe = crtc->pipe; - -/* Don't disable pipe or pipe PLLs if needed */ -if (IS_I830 (dev_priv)) -return ; - -/* Make sure the pipe isn't still relying on us */ -assert_pipe_disabled (dev_priv, crtc_state->cpu_transcoder); - -intel_de_write (dev_priv,DPLL (pipe),DPLL_VGA_MODE_DIS ); -intel_de_posting_read (dev_priv,DPLL (pipe)); -} - -static void vlv_disable_pll (struct drm_i915_private *dev_priv,enum pipe pipe) -{ -u32 val; - -/* Make sure the pipe isn't still relying on us */ -assert_pipe_disabled (dev_priv, (enum transcoder )pipe); - - val =DPLL_INTEGRATED_REF_CLK_VLV | -DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; -if (pipe !=PIPE_A ) - val |=DPLL_INTEGRATED_CRI_CLK_VLV ; - -intel_de_write (dev_priv,DPLL (pipe), val); -intel_de_posting_read (dev_priv,DPLL (pipe)); -} - -static void chv_disable_pll (struct drm_i915_private *dev_priv,enum pipe pipe) -{ -enum dpio_channel port =vlv_pipe_to_channel (pipe); -u32 val; - -/* Make sure the pipe isn't still relying on us */ -assert_pipe_disabled (dev_priv, (enum transcoder )pipe); - - val =DPLL_SSC_REF_CLK_CHV | -DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; -if (pipe !=PIPE_A ) - val |=DPLL_INTEGRATED_CRI_CLK_VLV ; - -intel_de_write (dev_priv,DPLL (pipe), val); -intel_de_posting_read (dev_priv,DPLL (pipe)); - -vlv_dpio_get (dev_priv); - -/* Disable 10bit clock to display controller */ - val =vlv_dpio_read (dev_priv, pipe,CHV_CMN_DW14 (port)); - val &= ~DPIO_DCLKP_EN ; -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW14 (port), val); - -vlv_dpio_put (dev_priv); -} -void vlv_wait_port_ready (struct drm_i915_private *dev_priv,struct intel_digital_port *dig_port,unsigned int expected_mask)
@@ -5767,35 +5545,6 @@ static void intel_panel_sanitize_ssc(struct drm_i915_private *dev_priv) } } -static void vlv_pllb_recal_opamp (struct drm_i915_private *dev_priv,enum pipe - pipe) -{ -u32 reg_val; - -/* -* PLLB opamp always calibrates to max value of 0x3f, force enable it -* and set it to a reasonable value instead. -*/ - reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW9 (1 )); - reg_val &=0xffffff00 ; - reg_val |=0x00000030 ; -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW9 (1 ), reg_val); - - reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW13 ); - reg_val &=0x00ffffff ; - reg_val |=0x8c000000 ; -vlv_dpio_write (dev_priv, pipe,VLV_REF_DW13 , reg_val); - - reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW9 (1 )); - reg_val &=0xffffff00 ; -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW9 (1 ), reg_val); - - reg_val =vlv_dpio_read (dev_priv, pipe,VLV_REF_DW13 ); - reg_val &=0x00ffffff ; - reg_val |=0xb0000000 ; -vlv_dpio_write (dev_priv, pipe,VLV_REF_DW13 , reg_val); -} -static void intel_pch_transcoder_set_m_n (const struct intel_crtc_state *crtc_state,const struct intel_link_m_n *m_n) {
@@ -5891,267 +5640,6 @@ void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state, enum link_m_n_sintel_cpu_transcoder_set_m_n (crtc_state, dp_m_n, dp_m2_n2); } -static void vlv_prepare_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = crtc->pipe; -u32 mdiv; -u32 bestn, bestm1, bestm2, bestp1, bestp2; -u32 coreclk, reg_val; - -/* Enable Refclk */ -intel_de_write (dev_priv,DPLL (pipe), - pipe_config->dpll_hw_state.dpll & ~(DPLL_VCO_ENABLE |DPLL_EXT_BUFFER_ENABLE_VLV )); - -/* No need to actually set up the DPLL with DSI */ -if ((pipe_config->dpll_hw_state.dpll &DPLL_VCO_ENABLE ) ==0 ) -return ; - -vlv_dpio_get (dev_priv); - - bestn = pipe_config->dpll.n; - bestm1 = pipe_config->dpll.m1; - bestm2 = pipe_config->dpll.m2; - bestp1 = pipe_config->dpll.p1; - bestp2 = pipe_config->dpll.p2; - -/* See eDP HDMI DPIO driver vbios notes doc */ - -/* PLL B needs special handling */ -if (pipe ==PIPE_B ) -vlv_pllb_recal_opamp (dev_priv, pipe); - -/* Set up Tx target for periodic Rcomp update */ -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW9_BCAST ,0x0100000f ); - -/* Disable target IRef on PLL */ - reg_val =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW8 (pipe)); - reg_val &=0x00ffffff ; -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW8 (pipe), reg_val); - -/* Disable fast lock */ -vlv_dpio_write (dev_priv, pipe,VLV_CMN_DW0 ,0x610 ); - -/* Set idtafcrecal before PLL is enabled */ - mdiv = ((bestm1 <<DPIO_M1DIV_SHIFT ) | (bestm2 &DPIO_M2DIV_MASK )); - mdiv |= ((bestp1 <<DPIO_P1_SHIFT ) | (bestp2 <<DPIO_P2_SHIFT )); - mdiv |= ((bestn <<DPIO_N_SHIFT )); - mdiv |= (1 <<DPIO_K_SHIFT ); - -/* -* Post divider depends on pixel clock rate, DAC vs digital (and LVDS, -* but we don't support that). -* Note: don't use the DAC post divider as it seems unstable. -*/ - mdiv |= (DPIO_POST_DIV_HDMIDP <<DPIO_POST_DIV_SHIFT ); -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv); - - mdiv |=DPIO_ENABLE_CALIBRATION ; -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW3 (pipe), mdiv); - -/* Set HBR and RBR LPF coefficients */ -if (pipe_config->port_clock ==162000 || -intel_crtc_has_type (pipe_config,INTEL_OUTPUT_ANALOG ) || -intel_crtc_has_type (pipe_config,INTEL_OUTPUT_HDMI )) -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe), -0x009f0003 ); -else -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW10 (pipe), -0x00d0000f ); - -if (intel_crtc_has_dp_encoder (pipe_config)) { -/* Use SSC source */ -if (pipe ==PIPE_A ) -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe), -0x0df40000 ); -else -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe), -0x0df70000 ); - }else {/* HDMI or VGA */ -/* Use bend source */ -if (pipe ==PIPE_A ) -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe), -0x0df70000 ); -else -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW5 (pipe), -0x0df40000 ); - } - - coreclk =vlv_dpio_read (dev_priv, pipe,VLV_PLL_DW7 (pipe)); - coreclk = (coreclk &0x0000ff00 ) |0x01c00000 ; -if (intel_crtc_has_dp_encoder (pipe_config)) - coreclk |=0x01000000 ; -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW7 (pipe), coreclk); - -vlv_dpio_write (dev_priv, pipe,VLV_PLL_DW11 (pipe),0x87871000 ); - -vlv_dpio_put (dev_priv); -} - -static void chv_prepare_pll (struct intel_crtc *crtc, -const struct intel_crtc_state *pipe_config) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = crtc->pipe; -enum dpio_channel port =vlv_pipe_to_channel (pipe); -u32 loopfilter, tribuf_calcntr; -u32 bestn, bestm1, bestm2, bestp1, bestp2, bestm2_frac; -u32 dpio_val; -int vco; - -/* Enable Refclk and SSC */ -intel_de_write (dev_priv,DPLL (pipe), - pipe_config->dpll_hw_state.dpll & ~DPLL_VCO_ENABLE ); - -/* No need to actually set up the DPLL with DSI */ -if ((pipe_config->dpll_hw_state.dpll &DPLL_VCO_ENABLE ) ==0 ) -return ; - - bestn = pipe_config->dpll.n; - bestm2_frac = pipe_config->dpll.m2 &0x3fffff ; - bestm1 = pipe_config->dpll.m1; - bestm2 = pipe_config->dpll.m2 >>22 ; - bestp1 = pipe_config->dpll.p1; - bestp2 = pipe_config->dpll.p2; - vco = pipe_config->dpll.vco; - dpio_val =0 ; - loopfilter =0 ; - -vlv_dpio_get (dev_priv); - -/* p1 and p2 divider */ -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW13 (port), -5 <<DPIO_CHV_S1_DIV_SHIFT | - bestp1 <<DPIO_CHV_P1_DIV_SHIFT | - bestp2 <<DPIO_CHV_P2_DIV_SHIFT | -1 <<DPIO_CHV_K_DIV_SHIFT ); - -/* Feedback post-divider - m2 */ -vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW0 (port), bestm2); - -/* Feedback refclk divider - n and m1 */ -vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW1 (port), -DPIO_CHV_M1_DIV_BY_2 | -1 <<DPIO_CHV_N_DIV_SHIFT ); - -/* M2 fraction division */ -vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW2 (port), bestm2_frac); - -/* M2 fraction division enable */ - dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW3 (port)); - dpio_val &= ~(DPIO_CHV_FEEDFWD_GAIN_MASK |DPIO_CHV_FRAC_DIV_EN ); - dpio_val |= (2 <<DPIO_CHV_FEEDFWD_GAIN_SHIFT ); -if (bestm2_frac) - dpio_val |=DPIO_CHV_FRAC_DIV_EN ; -vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW3 (port), dpio_val); - -/* Program digital lock detect threshold */ - dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW9 (port)); - dpio_val &= ~(DPIO_CHV_INT_LOCK_THRESHOLD_MASK | -DPIO_CHV_INT_LOCK_THRESHOLD_SEL_COARSE ); - dpio_val |= (0x5 <<DPIO_CHV_INT_LOCK_THRESHOLD_SHIFT ); -if (!bestm2_frac) - dpio_val |=DPIO_CHV_INT_LOCK_THRESHOLD_SEL_COARSE ; -vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW9 (port), dpio_val); - -/* Loop filter */ -if (vco ==5400000 ) { - loopfilter |= (0x3 <<DPIO_CHV_PROP_COEFF_SHIFT ); - loopfilter |= (0x8 <<DPIO_CHV_INT_COEFF_SHIFT ); - loopfilter |= (0x1 <<DPIO_CHV_GAIN_CTRL_SHIFT ); - tribuf_calcntr =0x9 ; - }else if (vco <=6200000 ) { - loopfilter |= (0x5 <<DPIO_CHV_PROP_COEFF_SHIFT ); - loopfilter |= (0xB <<DPIO_CHV_INT_COEFF_SHIFT ); - loopfilter |= (0x3 <<DPIO_CHV_GAIN_CTRL_SHIFT ); - tribuf_calcntr =0x9 ; - }else if (vco <=6480000 ) { - loopfilter |= (0x4 <<DPIO_CHV_PROP_COEFF_SHIFT ); - loopfilter |= (0x9 <<DPIO_CHV_INT_COEFF_SHIFT ); - loopfilter |= (0x3 <<DPIO_CHV_GAIN_CTRL_SHIFT ); - tribuf_calcntr =0x8 ; - }else { -/* Not supported. Apply the same limits as in the max case */ - loopfilter |= (0x4 <<DPIO_CHV_PROP_COEFF_SHIFT ); - loopfilter |= (0x9 <<DPIO_CHV_INT_COEFF_SHIFT ); - loopfilter |= (0x3 <<DPIO_CHV_GAIN_CTRL_SHIFT ); - tribuf_calcntr =0 ; - } -vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW6 (port), loopfilter); - - dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW8 (port)); - dpio_val &= ~DPIO_CHV_TDC_TARGET_CNT_MASK ; - dpio_val |= (tribuf_calcntr <<DPIO_CHV_TDC_TARGET_CNT_SHIFT ); -vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW8 (port), dpio_val); - -/* AFC Recal */ -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW14 (port), -vlv_dpio_read (dev_priv, pipe,CHV_CMN_DW14 (port)) | -DPIO_AFC_RECAL ); - -vlv_dpio_put (dev_priv); -} - -/** -* vlv_force_pll_on - forcibly enable just the PLL -* @dev_priv: i915 private structure -* @pipe: pipe PLL to enable -* @dpll: PLL configuration -* -* Enable the PLL for @pipe using the supplied @dpll config. To be used -* in cases where we need the PLL enabled even when @pipe is not going to -* be enabled. -*/ -int vlv_force_pll_on (struct drm_i915_private *dev_priv,enum pipe pipe, -const struct dpll *dpll) -{ -struct intel_crtc *crtc =intel_get_crtc_for_pipe (dev_priv, pipe); -struct intel_crtc_state *pipe_config; - - pipe_config =intel_crtc_state_alloc (crtc); -if (!pipe_config) -return -ENOMEM ; - - pipe_config->cpu_transcoder = (enum transcoder )pipe; - pipe_config->pixel_multiplier =1 ; - pipe_config->dpll = *dpll; - -if (IS_CHERRYVIEW (dev_priv)) { -chv_compute_dpll (crtc, pipe_config); -chv_prepare_pll (crtc, pipe_config); -chv_enable_pll (crtc, pipe_config); - }else { -vlv_compute_dpll (crtc, pipe_config); -vlv_prepare_pll (crtc, pipe_config); -vlv_enable_pll (crtc, pipe_config); - } - -kfree (pipe_config); - -return 0 ; -} - -/** -* vlv_force_pll_off - forcibly disable just the PLL -* @dev_priv: i915 private structure -* @pipe: pipe PLL to disable -* -* Disable the PLL for @pipe. To be used in cases where we need -* the PLL enabled even when @pipe is not going to be enabled. -*/ -void vlv_force_pll_off (struct drm_i915_private *dev_priv,enum pipe pipe) -{ -if (IS_CHERRYVIEW (dev_priv)) -chv_disable_pll (dev_priv, pipe); -else -vlv_disable_pll (dev_priv, pipe); -} - - -static void intel_set_transcoder_timings (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);
drivers/gpu/drm/i915/display/intel_display.h +0 -3
@@ -585,9 +585,6 @@ void intel_cleanup_plane_fb(struct drm_plane *plane,void assert_pch_transcoder_disabled (struct drm_i915_private *dev_priv,enum pipe pipe); -int vlv_force_pll_on (struct drm_i915_private *dev_priv,enum pipe pipe, -const struct dpll *dpll); -void vlv_force_pll_off (struct drm_i915_private *dev_priv,enum pipe pipe);int lpt_get_iclkip (struct drm_i915_private *dev_priv);bool intel_fuzzy_clock_check (int clock1,int clock2);
drivers/gpu/drm/i915/display/intel_dp.c +1 -0
@@ -50,6 +50,7 @@#include "intel_dp_aux.h" #include "intel_dp_link_training.h" #include "intel_dp_mst.h" +#include "intel_dpll.h" #include "intel_dpio_phy.h" #include "intel_fifo_underrun.h" #include "intel_hdcp.h"
drivers/gpu/drm/i915/display/intel_dpll.c +509 -0
523 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dpll.h +18 -0
@@ -10,6 +10,7 @@ struct dpll;struct drm_i915_private ;struct intel_crtc ;struct intel_crtc_state ; +enum pipe ;void intel_dpll_init_clock_hook (struct drm_i915_private *dev_priv);int vlv_calc_dpll_params (int refclk,struct dpll *clock);
@@ -20,4 +21,21 @@ void vlv_compute_dpll(struct intel_crtc *crtc,void chv_compute_dpll (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); +int vlv_force_pll_on (struct drm_i915_private *dev_priv,enum pipe pipe, +const struct dpll *dpll); +void vlv_force_pll_off (struct drm_i915_private *dev_priv,enum pipe pipe); +void i9xx_enable_pll (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state); +void vlv_enable_pll (struct intel_crtc *crtc, +const struct intel_crtc_state *pipe_config); +void chv_enable_pll (struct intel_crtc *crtc, +const struct intel_crtc_state *pipe_config); +void vlv_disable_pll (struct drm_i915_private *dev_priv,enum pipe pipe); +void chv_disable_pll (struct drm_i915_private *dev_priv,enum pipe pipe); +void i9xx_disable_pll (const struct intel_crtc_state *crtc_state); +void vlv_prepare_pll (struct intel_crtc *crtc, +const struct intel_crtc_state *pipe_config); +void chv_prepare_pll (struct intel_crtc *crtc, +const struct intel_crtc_state *pipe_config); +#endif
drivers/gpu/drm/i915/display/intel_pps.c +1 -0
@@ -6,6 +6,7 @@#include "i915_drv.h" #include "intel_display_types.h" #include "intel_dp.h" +#include "intel_dpll.h" #include "intel_pps.h" static void vlv_steal_power_sequencer(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 8/10 drm/i915: migrate i9xx plane get config
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
Migrate this code out like the skylake code.
--- drivers/gpu/drm/i915/display/i9xx_plane.c | 119 +++++++++++++++++++ drivers/gpu/drm/i915/display/i9xx_plane.h | 4 + drivers/gpu/drm/i915/display/intel_display.c | 119 ------------------- 3 files changed, 123 insertions(+), 119 deletions(-)
drivers/gpu/drm/i915/display/i9xx_plane.c +119 -0
@@ -698,3 +698,122 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)return ERR_PTR (ret); } +static int i9xx_format_to_fourcc (int format) +{ +switch (format) { +case DISPPLANE_8BPP : +return DRM_FORMAT_C8 ; +case DISPPLANE_BGRA555 : +return DRM_FORMAT_ARGB1555 ; +case DISPPLANE_BGRX555 : +return DRM_FORMAT_XRGB1555 ; +case DISPPLANE_BGRX565 : +return DRM_FORMAT_RGB565 ; +default : +case DISPPLANE_BGRX888 : +return DRM_FORMAT_XRGB8888 ; +case DISPPLANE_RGBX888 : +return DRM_FORMAT_XBGR8888 ; +case DISPPLANE_BGRA888 : +return DRM_FORMAT_ARGB8888 ; +case DISPPLANE_RGBA888 : +return DRM_FORMAT_ABGR8888 ; +case DISPPLANE_BGRX101010 : +return DRM_FORMAT_XRGB2101010 ; +case DISPPLANE_RGBX101010 : +return DRM_FORMAT_XBGR2101010 ; +case DISPPLANE_BGRA101010 : +return DRM_FORMAT_ARGB2101010 ; +case DISPPLANE_RGBA101010 : +return DRM_FORMAT_ABGR2101010 ; +case DISPPLANE_RGBX161616 : +return DRM_FORMAT_XBGR16161616F ; + } +} + +void +i9xx_get_initial_plane_config (struct intel_crtc *crtc, +struct intel_initial_plane_config *plane_config) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_plane *plane =to_intel_plane (crtc->base.primary); +enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; +enum pipe pipe; +u32 val, base, offset; +int fourcc, pixel_format; +unsigned int aligned_height; +struct drm_framebuffer *fb; +struct intel_framebuffer *intel_fb; + +if (!plane->get_hw_state (plane, &pipe)) +return ; + +drm_WARN_ON (dev, pipe != crtc->pipe); + + intel_fb =kzalloc (sizeof (*intel_fb),GFP_KERNEL ); +if (!intel_fb) { +drm_dbg_kms (&dev_priv->drm,"failed to alloc fb\n" ); +return ; + } + + fb = &intel_fb->base; + + fb->dev = dev; + + val =intel_de_read (dev_priv,DSPCNTR (i9xx_plane)); + +if (INTEL_GEN (dev_priv) >=4 ) { +if (val &DISPPLANE_TILED ) { + plane_config->tiling =I915_TILING_X ; + fb->modifier =I915_FORMAT_MOD_X_TILED ; + } + +if (val &DISPPLANE_ROTATE_180 ) + plane_config->rotation =DRM_MODE_ROTATE_180 ; + } + +if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B && + val &DISPPLANE_MIRROR ) + plane_config->rotation |=DRM_MODE_REFLECT_X ; + + pixel_format = val &DISPPLANE_PIXFORMAT_MASK ; + fourcc =i9xx_format_to_fourcc (pixel_format); + fb->format =drm_format_info (fourcc); + +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { + offset =intel_de_read (dev_priv,DSPOFFSET (i9xx_plane)); + base =intel_de_read (dev_priv,DSPSURF (i9xx_plane)) &0xfffff000 ; + }else if (INTEL_GEN (dev_priv) >=4 ) { +if (plane_config->tiling) + offset =intel_de_read (dev_priv, +DSPTILEOFF (i9xx_plane)); +else + offset =intel_de_read (dev_priv, +DSPLINOFF (i9xx_plane)); + base =intel_de_read (dev_priv,DSPSURF (i9xx_plane)) &0xfffff000 ; + }else { + base =intel_de_read (dev_priv,DSPADDR (i9xx_plane)); + } + plane_config->base = base; + + val =intel_de_read (dev_priv,PIPESRC (pipe)); + fb->width = ((val >>16 ) &0xfff ) +1 ; + fb->height = ((val >>0 ) &0xfff ) +1 ; + + val =intel_de_read (dev_priv,DSPSTRIDE (i9xx_plane)); + fb->pitches[0 ] = val &0xffffffc0 ; + + aligned_height =intel_fb_align_height (fb,0 , fb->height); + + plane_config->size = fb->pitches[0 ] * aligned_height; + +drm_dbg_kms (&dev_priv->drm, +"%s/%s with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n" , + crtc->base.name, plane->base.name, fb->width, fb->height, + fb->format->cpp[0 ] *8 , base, fb->pitches[0 ], + plane_config->size); + + plane_config->fb = intel_fb; +} +
drivers/gpu/drm/i915/display/i9xx_plane.h +4 -0
@@ -10,6 +10,8 @@enum pipe ;struct drm_i915_private ; +struct intel_crtc ; +struct intel_initial_plane_config ;struct intel_plane ;struct intel_plane_state ;
@@ -21,4 +23,6 @@ int i9xx_check_plane_surface(struct intel_plane_state *plane_state);struct intel_plane *intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe); +void i9xx_get_initial_plane_config (struct intel_crtc *crtc, +struct intel_initial_plane_config *plane_config);#endif
drivers/gpu/drm/i915/display/intel_display.c +0 -119
131 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 9/10 drm/i915: refactor skylake scaler code into new file.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This moves the code from various places and consolidates it into one new file.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/icl_dsi.c | 1 + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 1 + drivers/gpu/drm/i915/display/intel_display.c | 429 +-------------- drivers/gpu/drm/i915/display/intel_display.h | 6 - drivers/gpu/drm/i915/display/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/display/intel_sprite.c | 62 --- drivers/gpu/drm/i915/display/intel_sprite.h | 7 - drivers/gpu/drm/i915/display/skl_scaler.c | 497 ++++++++++++++++++ drivers/gpu/drm/i915/display/skl_scaler.h | 32 ++ .../drm/i915/display/skl_universal_plane.c | 1 + .../drm/i915/display/skl_universal_plane.h | 4 + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + 14 files changed, 541 insertions(+), 504 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.c create mode 100644 drivers/gpu/drm/i915/display/skl_scaler.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -224,6 +224,7 @@ i915-y += \ display/intel_tc.o \ display/intel_vga.o \ display/i9xx_plane.o \ + display/skl_scaler.o \ display/skl_universal_plane.o i915-$(CONFIG_ACPI) += \ display/intel_acpi.o \
drivers/gpu/drm/i915/display/icl_dsi.c +1 -0
@@ -35,6 +35,7 @@#include "intel_dsi.h" #include "intel_panel.h" #include "intel_vdsc.h" +#include "skl_scaler.h" #include "skl_universal_plane.h" static int header_credits_available(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/display/intel_atomic.c +1 -1
@@ -40,7 +40,7 @@#include "intel_global_state.h" #include "intel_hdcp.h" #include "intel_psr.h" -#include "intel_sprite.h" +#include "skl_universal_plane.h" /** * intel_digital_connector_atomic_get_property - hook for connector->atomic_get_property.
drivers/gpu/drm/i915/display/intel_ddi.c +1 -0
@@ -54,6 +54,7 @@#include "intel_tc.h" #include "intel_vdsc.h" #include "intel_vrr.h" +#include "skl_scaler.h" #include "skl_universal_plane.h" static const u8 index_to_dp_signal_levels[] = {
drivers/gpu/drm/i915/display/intel_display.c +1 -428
447 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +0 -6
@@ -609,12 +609,6 @@ enum intel_display_power_domain intel_legacy_aux_to_power_domain(enum aux_ch aux_ch);void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); - -u16 skl_scaler_calc_phase (int sub,int scale,bool chroma_center); -void skl_scaler_disable (const struct intel_crtc_state *old_crtc_state); -u32 skl_scaler_get_filter_select (enum drm_scaling_filter filter,int set); -void skl_scaler_setup_filter (struct drm_i915_private *dev_priv,enum pipe pipe, -int id,int set,enum drm_scaling_filter filter);void ilk_pfit_disable (const struct intel_crtc_state *old_crtc_state);int bdw_get_pipemisc_bpp (struct intel_crtc *crtc);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -39,6 +39,7 @@#include "intel_dp_mst.h" #include "intel_dpio_phy.h" #include "intel_hdcp.h" +#include "skl_scaler.h" static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/display/intel_sprite.c +0 -62
68 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_sprite.h +0 -7
@@ -45,10 +45,6 @@ static inline u8 icl_hdr_plane_mask(void)BIT (PLANE_SPRITE0 ) |BIT (PLANE_SPRITE1 ); } -bool icl_is_nv12_y_plane (struct drm_i915_private *dev_priv, -enum plane_id plane_id); -bool icl_is_hdr_plane (struct drm_i915_private *dev_priv,enum plane_id plane_id); -int ivb_plane_min_cdclk (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); int hsw_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
@@ -56,7 +52,4 @@ int hsw_plane_min_cdclk(const struct intel_crtc_state *crtc_state,int vlv_plane_min_cdclk (const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state); -void skl_program_scaler (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state);#endif /* __INTEL_SPRITE_H__ */
drivers/gpu/drm/i915/display/skl_scaler.c new file +497 -0
497 lines not on this page · raw message
drivers/gpu/drm/i915/display/skl_scaler.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ +#ifndef INTEL_SCALER_H +#define INTEL_SCALER_H + +#include <linux/types.h> + +enum drm_scaling_filter ; +struct drm_i915_private ; +struct intel_crtc_state ; +struct intel_plane_state ; +struct intel_plane ; +enum pipe ; + +int skl_update_scaler_crtc (struct intel_crtc_state *crtc_state); + +int skl_update_scaler_plane (struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state); + +u16 skl_scaler_calc_phase (int sub,int scale,bool chroma_center); +u32 skl_scaler_get_filter_select (enum drm_scaling_filter filter,int set); +void skl_scaler_setup_filter (struct drm_i915_private *dev_priv,enum pipe pipe, +int id,int set,enum drm_scaling_filter filter); + +void skl_program_scaler (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state); +void skl_detach_scalers (const struct intel_crtc_state *crtc_state); +void skl_scaler_disable (const struct intel_crtc_state *old_crtc_state); +#endif
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -0
@@ -14,6 +14,7 @@#include "intel_pm.h" #include "intel_psr.h" #include "intel_sprite.h" +#include "skl_scaler.h" #include "skl_universal_plane.h" static const u32 skl_plane_formats[] = {
drivers/gpu/drm/i915/display/skl_universal_plane.h +4 -0
@@ -30,4 +30,8 @@ int skl_ccs_to_main_plane(const struct drm_framebuffer *fb, int ccs_plane);int skl_calc_main_surface_offset (const struct intel_plane_state *plane_state,int *x,int *y,u32 *offset); +bool icl_is_nv12_y_plane (struct drm_i915_private *dev_priv, +enum plane_id plane_id); +bool icl_is_hdr_plane (struct drm_i915_private *dev_priv,enum plane_id plane_id); +#endif
drivers/gpu/drm/i915/display/vlv_dsi.c +1 -0
@@ -38,6 +38,7 @@#include "intel_fifo_underrun.h" #include "intel_panel.h" #include "intel_sideband.h" +#include "skl_scaler.h" /* return pixels in terms of txbyteclkhs */ static u16 txbyteclkhs(u16 pixels, int bpp, int lane_count,
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 10/10 drm/i915: move ddi pll state get to dpll mgr
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This just migrates the hsw+ code to a better place.
--- drivers/gpu/drm/i915/display/intel_display.c | 212 +---------------- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 216 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 + 3 files changed, 219 insertions(+), 211 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -211
@@ -6575,205 +6575,6 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc,return ret; } -static void dg1_get_ddi_pll (struct drm_i915_private *dev_priv,enum port port, -struct intel_crtc_state *pipe_config) -{ -enum icl_port_dpll_id port_dpll_id =ICL_PORT_DPLL_DEFAULT ; -enum phy phy =intel_port_to_phy (dev_priv, port); -struct icl_port_dpll *port_dpll; -struct intel_shared_dpll *pll; -enum intel_dpll_id id; -bool pll_active; -u32 clk_sel; - - clk_sel =intel_de_read (dev_priv,DG1_DPCLKA_CFGCR0 (phy)) &DG1_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); - id =DG1_DPCLKA_CFGCR0_DDI_CLK_SEL_DPLL_MAP (clk_sel, phy); - -if (WARN_ON (id >DPLL_ID_DG1_DPLL3 )) -return ; - - pll =intel_get_shared_dpll_by_id (dev_priv, id); - port_dpll = &pipe_config->icl_port_dplls[port_dpll_id]; - - port_dpll->pll = pll; - pll_active =intel_dpll_get_hw_state (dev_priv, pll, - &port_dpll->hw_state); -drm_WARN_ON (&dev_priv->drm, !pll_active); - -icl_set_active_port_dpll (pipe_config, port_dpll_id); -} - -static void icl_get_ddi_pll (struct drm_i915_private *dev_priv,enum port port, -struct intel_crtc_state *pipe_config) -{ -enum phy phy =intel_port_to_phy (dev_priv, port); -enum icl_port_dpll_id port_dpll_id; -struct icl_port_dpll *port_dpll; -struct intel_shared_dpll *pll; -enum intel_dpll_id id; -bool pll_active; -u32 temp; - -if (intel_phy_is_combo (dev_priv, phy)) { -u32 mask, shift; - -if (IS_ROCKETLAKE (dev_priv)) { - mask =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); - shift =RKL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); - }else { - mask =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); - shift =ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); - } - - temp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ) & mask; - id = temp >> shift; - port_dpll_id =ICL_PORT_DPLL_DEFAULT ; - }else if (intel_phy_is_tc (dev_priv, phy)) { -u32 clk_sel =intel_de_read (dev_priv,DDI_CLK_SEL (port)) &DDI_CLK_SEL_MASK ; - -if (clk_sel ==DDI_CLK_SEL_MG ) { - id =icl_tc_port_to_pll_id (intel_port_to_tc (dev_priv, - port)); - port_dpll_id =ICL_PORT_DPLL_MG_PHY ; - }else { -drm_WARN_ON (&dev_priv->drm, - clk_sel <DDI_CLK_SEL_TBT_162 ); - id =DPLL_ID_ICL_TBTPLL ; - port_dpll_id =ICL_PORT_DPLL_DEFAULT ; - } - }else { -drm_WARN (&dev_priv->drm,1 ,"Invalid port %x\n" , port); -return ; - } - - pll =intel_get_shared_dpll_by_id (dev_priv, id); - port_dpll = &pipe_config->icl_port_dplls[port_dpll_id]; - - port_dpll->pll = pll; - pll_active =intel_dpll_get_hw_state (dev_priv, pll, - &port_dpll->hw_state); -drm_WARN_ON (&dev_priv->drm, !pll_active); - -icl_set_active_port_dpll (pipe_config, port_dpll_id); -} - -static void cnl_get_ddi_pll (struct drm_i915_private *dev_priv,enum port port, -struct intel_crtc_state *pipe_config) -{ -struct intel_shared_dpll *pll; -enum intel_dpll_id id; -bool pll_active; -u32 temp; - - temp =intel_de_read (dev_priv,DPCLKA_CFGCR0 ) &DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (port); - id = temp >>DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (port); - -if (drm_WARN_ON (&dev_priv->drm, id <SKL_DPLL0 || id >SKL_DPLL2 )) -return ; - - pll =intel_get_shared_dpll_by_id (dev_priv, id); - - pipe_config->shared_dpll = pll; - pll_active =intel_dpll_get_hw_state (dev_priv, pll, - &pipe_config->dpll_hw_state); -drm_WARN_ON (&dev_priv->drm, !pll_active); -} - -static void bxt_get_ddi_pll (struct drm_i915_private *dev_priv, -enum port port, -struct intel_crtc_state *pipe_config) -{ -struct intel_shared_dpll *pll; -enum intel_dpll_id id; -bool pll_active; - -switch (port) { -case PORT_A : - id =DPLL_ID_SKL_DPLL0 ; -break ; -case PORT_B : - id =DPLL_ID_SKL_DPLL1 ; -break ; -case PORT_C : - id =DPLL_ID_SKL_DPLL2 ; -break ; -default : -drm_err (&dev_priv->drm,"Incorrect port type\n" ); -return ; - } - - pll =intel_get_shared_dpll_by_id (dev_priv, id); - - pipe_config->shared_dpll = pll; - pll_active =intel_dpll_get_hw_state (dev_priv, pll, - &pipe_config->dpll_hw_state); -drm_WARN_ON (&dev_priv->drm, !pll_active); -} - -static void skl_get_ddi_pll (struct drm_i915_private *dev_priv,enum port port, -struct intel_crtc_state *pipe_config) -{ -struct intel_shared_dpll *pll; -enum intel_dpll_id id; -bool pll_active; -u32 temp; - - temp =intel_de_read (dev_priv,DPLL_CTRL2 ) &DPLL_CTRL2_DDI_CLK_SEL_MASK (port); - id = temp >> (port *3 +1 ); - -if (drm_WARN_ON (&dev_priv->drm, id <SKL_DPLL0 || id >SKL_DPLL3 )) -return ; - - pll =intel_get_shared_dpll_by_id (dev_priv, id); - - pipe_config->shared_dpll = pll; - pll_active =intel_dpll_get_hw_state (dev_priv, pll, - &pipe_config->dpll_hw_state); -drm_WARN_ON (&dev_priv->drm, !pll_active); -} - -static void hsw_get_ddi_pll (struct drm_i915_private *dev_priv,enum port port, -struct intel_crtc_state *pipe_config) -{ -struct intel_shared_dpll *pll; -enum intel_dpll_id id; -u32 ddi_pll_sel =intel_de_read (dev_priv,PORT_CLK_SEL (port)); -bool pll_active; - -switch (ddi_pll_sel) { -case PORT_CLK_SEL_WRPLL1 : - id =DPLL_ID_WRPLL1 ; -break ; -case PORT_CLK_SEL_WRPLL2 : - id =DPLL_ID_WRPLL2 ; -break ; -case PORT_CLK_SEL_SPLL : - id =DPLL_ID_SPLL ; -break ; -case PORT_CLK_SEL_LCPLL_810 : - id =DPLL_ID_LCPLL_810 ; -break ; -case PORT_CLK_SEL_LCPLL_1350 : - id =DPLL_ID_LCPLL_1350 ; -break ; -case PORT_CLK_SEL_LCPLL_2700 : - id =DPLL_ID_LCPLL_2700 ; -break ; -default : -MISSING_CASE (ddi_pll_sel); - fallthrough; -case PORT_CLK_SEL_NONE : -return ; - } - - pll =intel_get_shared_dpll_by_id (dev_priv, id); - - pipe_config->shared_dpll = pll; - pll_active =intel_dpll_get_hw_state (dev_priv, pll, - &pipe_config->dpll_hw_state); -drm_WARN_ON (&dev_priv->drm, !pll_active); -} -static bool hsw_get_transcoder_state (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config,struct intel_display_power_domain_set *power_domain_set)
@@ -6930,18 +6731,7 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc, port =TRANS_DDI_FUNC_CTL_VAL_TO_PORT (tmp); } -if (IS_DG1 (dev_priv)) -dg1_get_ddi_pll (dev_priv, port, pipe_config); -else if (INTEL_GEN (dev_priv) >=11 ) -icl_get_ddi_pll (dev_priv, port, pipe_config); -else if (IS_CANNONLAKE (dev_priv)) -cnl_get_ddi_pll (dev_priv, port, pipe_config); -else if (IS_GEN9_LP (dev_priv)) -bxt_get_ddi_pll (dev_priv, port, pipe_config); -else if (IS_GEN9_BC (dev_priv)) -skl_get_ddi_pll (dev_priv, port, pipe_config); -else -hsw_get_ddi_pll (dev_priv, port, pipe_config); +intel_get_ddi_pll (dev_priv, port, pipe_config);/* * Haswell has only FDI/PCH transcoder A. It is which is connected to
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +216 -0
219 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dpll_mgr.h +2 -0
@@ -418,4 +418,6 @@ void intel_dpll_dump_hw_state(struct drm_i915_private *dev_priv,enum intel_dpll_id icl_tc_port_to_pll_id (enum tc_port tc_port);bool intel_dpll_is_combophy (enum intel_dpll_id id); +void intel_get_ddi_pll (struct drm_i915_private *dev_priv,enum port port, +struct intel_crtc_state *pipe_config);#endif /* _INTEL_DPLL_MGR_H_ */
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/10] drm/i915: refactor ddi translations into a separate file (v2)
In reply to Dave Airlie== Series Details ==
== Series Details ==
Series: series starting with [01/10] drm/i915: refactor ddi translations into a separate file (v2)
URL : https://patchwork.freedesktop.org/series/86321/
State : failure
== Summary ==
Applying: drm/i915: refactor ddi translations into a separate file (v2)
Applying: drm/i915: migrate hsw fdi code to new file.
Applying: drm/i915: migrate skl planes code new file (v5)
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/Makefile).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/i915: migrate skl planes code new file (v5) When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 6 lines · Dave Airlie
This is a repost of the last series, rebased to include the VRR and GEN12 CCS changes.
It also has to scaler and ddi pll state movement patches that need review, I think the rest should be pretty good to push sooner so I don't fall into any more rebase traps.
It started conflicting on day 1. :(
Rebased and resent -> [1].
BR,
Jani.
[1] http://lore.kernel.org/r/[email protected]
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx