refactor intel display a bit more
Subsystems (3)
Dave Airlie
maintainerThe first 4 patches are fixed up and reviewed, so it would be good if we could land those at least.
I haven't had much time to rework the others, I've removed the legacy, and added header files and renamed some functions where it wasn't too intrusive.
I think the file names probably do need revisiting, for the later patches and the hsw fdi patch is still a bit rough IMO.
I'm away for a week now, so I'll see what I can revisit when I return or feel free to munge these in the meantime into whatever works.
Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 1/11 drm/i915/display: move needs_modeset to an inline in header
From: Dave Airlie <[email protected]>
This function is going to be used in a later change, so clean it up first before moving it.
--- drivers/gpu/drm/i915/display/intel_display.c | 78 +++++++++---------- .../drm/i915/display/intel_display_types.h | 6 ++ 2 files changed, 42 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +36 -42
@@ -542,12 +542,6 @@ icl_wa_scalerclkgating(struct drm_i915_private *dev_priv, enum pipe pipe, intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~DPFR_GATING_DIS); } -static bool -needs_modeset (const struct intel_crtc_state *state) -{ -return drm_atomic_crtc_needs_modeset (&state->uapi); -} -static bool is_trans_port_sync_slave (const struct intel_crtc_state *crtc_state) {
@@ -6474,7 +6468,7 @@ static bool hsw_pre_update_disable_ips(const struct intel_crtc_state *old_crtc_sif (!old_crtc_state->ips_enabled)return false; -if (needs_modeset (new_crtc_state)) +if (intel_crtc_needs_modeset (new_crtc_state))return true;/*
@@ -6501,7 +6495,7 @@ static bool hsw_post_update_enable_ips(const struct intel_crtc_state *old_crtc_sif (!new_crtc_state->ips_enabled)return false; -if (needs_modeset (new_crtc_state)) +if (intel_crtc_needs_modeset (new_crtc_state))return true;/*
@@ -6554,7 +6548,7 @@ static bool needs_scalerclk_wa(const struct intel_crtc_state *crtc_state)static bool planes_enabling (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) { -return (!old_crtc_state->active_planes ||needs_modeset (new_crtc_state)) && +return (!old_crtc_state->active_planes ||intel_crtc_needs_modeset (new_crtc_state)) && new_crtc_state->active_planes; }
@@ -6562,7 +6556,7 @@ static bool planes_disabling(const struct intel_crtc_state *old_crtc_state, const struct intel_crtc_state *new_crtc_state) {return old_crtc_state->active_planes && - (!new_crtc_state->active_planes ||needs_modeset (new_crtc_state)); + (!new_crtc_state->active_planes ||intel_crtc_needs_modeset (new_crtc_state)); } static void intel_post_plane_update(struct intel_atomic_state *state,
@@ -6685,7 +6679,7 @@ static void intel_pre_plane_update(struct intel_atomic_state *state,* If we're doing a modeset we don't need to do any * pre-vblank watermark programming here. */ -if (!needs_modeset (new_crtc_state)) { +if (!intel_crtc_needs_modeset (new_crtc_state)) {/* * For platforms that support atomic watermarks, program the * 'intermediate' watermarks immediately. On pre-gen9 platforms, these
@@ -12046,7 +12040,7 @@ static void i9xx_update_cursor(struct intel_plane *plane,if (INTEL_GEN (dev_priv) >=9 )skl_write_cursor_wm (plane, crtc_state); -if (!needs_modeset (crtc_state)) +if (!intel_crtc_needs_modeset (crtc_state))intel_psr2_program_plane_sel_fetch (plane, crtc_state, plane_state,0 ); if (plane->cursor.base != base ||
@@ -12616,7 +12610,7 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_statstruct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -bool mode_changed =needs_modeset (crtc_state); +bool mode_changed =intel_crtc_needs_modeset (crtc_state);bool was_crtc_enabled = old_crtc_state->hw.active;bool is_crtc_enabled = crtc_state->hw.active;bool turn_off, turn_on, visible, was_visible;
@@ -12980,7 +12974,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_crtc_state *crtc_state =intel_atomic_get_new_crtc_state (state, crtc); -bool mode_changed =needs_modeset (crtc_state); +bool mode_changed =intel_crtc_needs_modeset (crtc_state);int ret; if (INTEL_GEN(dev_priv) < 5 && !IS_G4X(dev_priv) &&
@@ -14812,7 +14806,7 @@ intel_modeset_verify_crtc(struct intel_crtc *crtc, struct intel_crtc_state *old_crtc_state, struct intel_crtc_state *new_crtc_state) { -if (!needs_modeset (new_crtc_state) && !new_crtc_state->update_pipe) +if (!intel_crtc_needs_modeset (new_crtc_state) && !new_crtc_state->update_pipe)return ;verify_wm_state (crtc, new_crtc_state);
@@ -14907,7 +14901,7 @@ static void intel_modeset_clear_plls(struct intel_atomic_state *state)return ;for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { -if (!needs_modeset (new_crtc_state)) +if (!intel_crtc_needs_modeset (new_crtc_state))continue ;intel_release_shared_dplls (state, crtc);
@@ -14932,7 +14926,7 @@ static int hsw_mode_set_planes_workaround(struct intel_atomic_state *state)/* look at all crtc's that are going to be enabled in during modeset */ for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) {if (!crtc_state->hw.active || - !needs_modeset (crtc_state)) + !intel_crtc_needs_modeset (crtc_state))continue ;if (first_crtc_state) {
@@ -14957,7 +14951,7 @@ static int hsw_mode_set_planes_workaround(struct intel_atomic_state *state) crtc_state->hsw_workaround_pipe =INVALID_PIPE ;if (!crtc_state->hw.active || -needs_modeset (crtc_state)) +intel_crtc_needs_modeset (crtc_state))continue ;/* 2 or more enabled crtcs means no need for w/a */
@@ -15276,7 +15270,7 @@ static bool intel_cpu_transcoders_need_modeset(struct intel_atomic_state *state,for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) {if (new_crtc_state->hw.enable && transcoders &BIT (new_crtc_state->cpu_transcoder) && -needs_modeset (new_crtc_state)) +intel_crtc_needs_modeset (new_crtc_state))return true; }
@@ -15297,7 +15291,7 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state, slave = crtc; master = old_crtc_state->bigjoiner_linked_crtc; master_crtc_state =intel_atomic_get_new_crtc_state (state, master); -if (!master_crtc_state || !needs_modeset (master_crtc_state)) +if (!master_crtc_state || !intel_crtc_needs_modeset (master_crtc_state)) goto claimed; }
@@ -15376,7 +15370,7 @@ static int intel_atomic_check_async(struct intel_atomic_state *state)for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (needs_modeset (new_crtc_state)) { +if (intel_crtc_needs_modeset (new_crtc_state)) {drm_dbg_kms (&i915->drm,"Modeset Required. Async flip not supported\n" );return -EINVAL ; }
@@ -15499,7 +15493,7 @@ static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)if (IS_ERR (linked_crtc_state))return PTR_ERR (linked_crtc_state); -if (!needs_modeset (crtc_state)) +if (!intel_crtc_needs_modeset (crtc_state))continue ; linked_crtc_state->uapi.mode_changed = true;
@@ -15516,7 +15510,7 @@ static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) {/* Kill old bigjoiner link, we may re-establish afterwards */ -if (needs_modeset (crtc_state) && +if (intel_crtc_needs_modeset (crtc_state) && crtc_state->bigjoiner && !crtc_state->bigjoiner_slave)kill_bigjoiner_slave (state, crtc_state); }
@@ -15555,7 +15549,7 @@ static int intel_atomic_check(struct drm_device *dev,for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (!needs_modeset (new_crtc_state)) { +if (!intel_crtc_needs_modeset (new_crtc_state)) {/* Light copy */ intel_crtc_copy_uapi_to_hw_state_nomodeset (state, new_crtc_state);
@@ -15586,7 +15580,7 @@ static int intel_atomic_check(struct drm_device *dev,for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (!needs_modeset (new_crtc_state)) +if (!intel_crtc_needs_modeset (new_crtc_state))continue ; ret =intel_modeset_pipe_config_late (new_crtc_state);
@@ -15608,7 +15602,7 @@ static int intel_atomic_check(struct drm_device *dev,* forced a full modeset. */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { -if (!new_crtc_state->hw.enable ||needs_modeset (new_crtc_state)) +if (!new_crtc_state->hw.enable ||intel_crtc_needs_modeset (new_crtc_state))continue ;if (intel_dp_mst_is_slave_trans (new_crtc_state)) {
@@ -15636,7 +15630,7 @@ static int intel_atomic_check(struct drm_device *dev,struct intel_crtc_state *linked_crtc_state =intel_atomic_get_new_crtc_state (state, new_crtc_state->bigjoiner_linked_crtc); -if (needs_modeset (linked_crtc_state)) { +if (intel_crtc_needs_modeset (linked_crtc_state)) { new_crtc_state->uapi.mode_changed = true; new_crtc_state->update_pipe = false; }
@@ -15645,7 +15639,7 @@ static int intel_atomic_check(struct drm_device *dev,for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (needs_modeset (new_crtc_state)) { +if (intel_crtc_needs_modeset (new_crtc_state)) { any_ms = true;continue ; }
@@ -15722,12 +15716,12 @@ static int intel_atomic_check(struct drm_device *dev, goto fail; } -if (!needs_modeset (new_crtc_state) && +if (!intel_crtc_needs_modeset (new_crtc_state) && !new_crtc_state->update_pipe)continue ;intel_dump_pipe_config (new_crtc_state, state, -needs_modeset (new_crtc_state) ? +intel_crtc_needs_modeset (new_crtc_state) ?"[modeset]" :"[fastset]" ); }
@@ -15759,7 +15753,7 @@ static int intel_atomic_prepare_commit(struct intel_atomic_state *state)return ret;for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -bool mode_changed =needs_modeset (crtc_state); +bool mode_changed =intel_crtc_needs_modeset (crtc_state);if (mode_changed || crtc_state->update_pipe || crtc_state->uapi.color_mgmt_changed) {
@@ -15850,7 +15844,7 @@ static void commit_pipe_config(struct intel_atomic_state *state,intel_atomic_get_old_crtc_state (state, crtc);const struct intel_crtc_state *new_crtc_state =intel_atomic_get_new_crtc_state (state, crtc); -bool modeset =needs_modeset (new_crtc_state); +bool modeset =intel_crtc_needs_modeset (new_crtc_state);/* * During modesets pipe configuration was programmed as the
@@ -15884,7 +15878,7 @@ static void intel_enable_crtc(struct intel_atomic_state *state,const struct intel_crtc_state *new_crtc_state =intel_atomic_get_new_crtc_state (state, crtc); -if (!needs_modeset (new_crtc_state)) +if (!intel_crtc_needs_modeset (new_crtc_state))return ;intel_crtc_update_active_timings (new_crtc_state);
@@ -15906,7 +15900,7 @@ static void intel_update_crtc(struct intel_atomic_state *state,intel_atomic_get_old_crtc_state (state, crtc);struct intel_crtc_state *new_crtc_state =intel_atomic_get_new_crtc_state (state, crtc); -bool modeset =needs_modeset (new_crtc_state); +bool modeset =intel_crtc_needs_modeset (new_crtc_state);if (!modeset) { if (new_crtc_state->preload_luts &&
@@ -15998,7 +15992,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)/* Only disable port sync and MST slaves */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (!needs_modeset (new_crtc_state) || old_crtc_state->bigjoiner) +if (!intel_crtc_needs_modeset (new_crtc_state) || old_crtc_state->bigjoiner)continue ;if (!old_crtc_state->hw.active)
@@ -16022,7 +16016,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)/* Disable everything else left on */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (!needs_modeset (new_crtc_state) || +if (!intel_crtc_needs_modeset (new_crtc_state) || (handled &BIT (crtc->pipe)) || old_crtc_state->bigjoiner_slave)continue ;
@@ -16072,7 +16066,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)continue ;/* ignore allocations for crtc's that have been turned off. */ -if (!needs_modeset (new_crtc_state)) { +if (!intel_crtc_needs_modeset (new_crtc_state)) { entries[pipe] = old_crtc_state->wm.skl.ddb; update_pipes |=BIT (pipe); }else {
@@ -16267,7 +16261,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (needs_modeset (new_crtc_state) || +if (intel_crtc_needs_modeset (new_crtc_state) || new_crtc_state->update_pipe) { put_domains[crtc->pipe] =
@@ -16293,7 +16287,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)/* Complete the events for pipes that have now been disabled */ for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { -bool modeset =needs_modeset (new_crtc_state); +bool modeset =intel_crtc_needs_modeset (new_crtc_state);/* Complete events for now disable pipes here. */ if (modeset && !new_crtc_state->hw.active && new_crtc_state->uapi.event) {
@@ -16341,7 +16335,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)skl_disable_flip_done (crtc);if (new_crtc_state->hw.active && - !needs_modeset (new_crtc_state) && + !intel_crtc_needs_modeset (new_crtc_state) && !new_crtc_state->preload_luts && (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe))
@@ -16712,7 +16706,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,* This should only fail upon a hung GPU, in which case we * can safely continue. */ -if (needs_modeset (crtc_state)) { +if (intel_crtc_needs_modeset (crtc_state)) { ret = i915_sw_fence_await_reservation(&state->commit_ready, old_obj->base.resv, NULL, false, 0,
@@ -16937,7 +16931,7 @@ intel_legacy_cursor_update(struct drm_plane *_plane,* * FIXME bigjoiner fastpath would be good */ -if (!crtc_state->hw.active ||needs_modeset (crtc_state) || +if (!crtc_state->hw.active ||intel_crtc_needs_modeset (crtc_state) || crtc_state->update_pipe || crtc_state->bigjoiner) goto slow;
drivers/gpu/drm/i915/display/intel_display_types.h +6 -0
@@ -1777,6 +1777,12 @@ intel_crtc_has_dp_encoder(const struct intel_crtc_state *crtc_state) (1 << INTEL_OUTPUT_EDP)); } +static inline bool +intel_crtc_needs_modeset (const struct intel_crtc_state *crtc_state) +{ +return drm_atomic_crtc_needs_modeset (&crtc_state->uapi); +} +static inline void intel_wait_for_vblank (struct drm_i915_private *dev_priv,enum pipe pipe) {
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 2/11 drm/i915/display: move to_intel_frontbuffer to header
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This will be used for some refactoring in other files, so move it first.
--- drivers/gpu/drm/i915/display/intel_display.c | 6 ------ drivers/gpu/drm/i915/display/intel_display_types.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -6
@@ -3611,12 +3611,6 @@ static void intel_plane_disable_noatomic(struct intel_crtc *crtc,intel_disable_plane (plane, crtc_state); } -static struct intel_frontbuffer * -to_intel_frontbuffer (struct drm_framebuffer *fb) -{ -return fb ?to_intel_framebuffer (fb)->frontbuffer :NULL ; -} -static void intel_find_initial_plane_obj (struct intel_crtc *intel_crtc,struct intel_initial_plane_config *plane_config)
drivers/gpu/drm/i915/display/intel_display_types.h +6 -0
@@ -1805,4 +1805,10 @@ static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *state) return i915_ggtt_offset(state->vma); } +static inline struct intel_frontbuffer * +to_intel_frontbuffer (struct drm_framebuffer *fb) +{ +return fb ?to_intel_framebuffer (fb)->frontbuffer :NULL ; +} +#endif /* __INTEL_DISPLAY_TYPES_H__ */
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 3/11 drm/i915/display: fix misused comma
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
There is no need for a comma use here.
--- drivers/gpu/drm/i915/display/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +2 -1
@@ -989,7 +989,8 @@ chv_find_best_dpll(const struct intel_limit *limit,* set to 2. If requires to support 200Mhz refclk, we need to * revisit this because n may not 1 anymore. */ - clock.n =1 , clock.m1 =2 ; + clock.n =1 ; + clock.m1 =2 ; target *=5 ;/* fast clock */ for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) {
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 4/11 drm/i915: refactor cursor code out of i915_display.c
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This file is a monster, let's start simple, the cursor plane code seems pretty standalone, and splits out easily enough.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_cursor.c | 806 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_cursor.h | 18 + drivers/gpu/drm/i915/display/intel_display.c | 797 +----------------- drivers/gpu/drm/i915/display/intel_display.h | 7 + 5 files changed, 839 insertions(+), 790 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.c create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -197,6 +197,7 @@ i915-y += \ display/intel_combo_phy.o \ display/intel_connector.o \ display/intel_csr.o \ + display/intel_cursor.o \ display/intel_display.o \ display/intel_display_power.o \ display/intel_dpio_phy.o \
drivers/gpu/drm/i915/display/intel_cursor.c new file +806 -0
806 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_cursor.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_CURSOR_H_ +#define _INTEL_CURSOR_H_ + +#include "intel_display.h" + +struct intel_plane ; + +struct intel_plane * +intel_cursor_plane_create (struct drm_i915_private *dev_priv, +enum pipe pipe); + + +#endif
drivers/gpu/drm/i915/display/intel_display.c +7 -790
857 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +7 -0
@@ -647,6 +647,13 @@ bool intel_format_info_is_yuv_semiplanar(const struct drm_format_info *info, uint64_t modifier); +int intel_plane_compute_gtt (struct intel_plane_state *plane_state); +u32 intel_plane_compute_aligned_offset (int *x,int *y, +const struct intel_plane_state *state, +int color_plane); +int intel_plane_pin_fb (struct intel_plane_state *plane_state); +void intel_plane_unpin_fb (struct intel_plane_state *old_plane_state); +/* modesetting */ void intel_modeset_init_hw (struct drm_i915_private *i915);int intel_modeset_init_noirq (struct drm_i915_private *i915);
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 04/11] drm/i915: refactor cursor code out of i915_display.c
Quoted 4 lines · Dave Airlie
From: Dave Airlie <[email protected]>
This file is a monster, let's start simple, the cursor plane code seems pretty standalone, and splits out easily enough.
I cleaned up intel_cursor.h a bit locally, but the code movement checks out.
BR,
Jani.
Quoted 1,750 lines
Reviewed-by Ville Syrjälä <[email protected]>Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_cursor.c | 806 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_cursor.h | 18 + drivers/gpu/drm/i915/display/intel_display.c | 797 +----------------- drivers/gpu/drm/i915/display/intel_display.h | 7 + 5 files changed, 839 insertions(+), 790 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.c create mode 100644 drivers/gpu/drm/i915/display/intel_cursor.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -197,6 +197,7 @@ i915-y += \ display/intel_combo_phy.o \ display/intel_connector.o \ display/intel_csr.o \ + display/intel_cursor.o \ display/intel_display.o \ display/intel_display_power.o \ display/intel_dpio_phy.o \drivers/gpu/drm/i915/display/intel_cursor.c new file +806
-0@@ -0,0 +1,806 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation +*/ +#include <linux/kernel.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic_uapi.h> +#include <drm/drm_damage_helper.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_fourcc.h> + +#include "intel_atomic.h" +#include "intel_atomic_plane.h" +#include "intel_cursor.h" +#include "intel_display_types.h" +#include "intel_display.h" + +#include "intel_frontbuffer.h" +#include "intel_pm.h" +#include "intel_psr.h" +#include "intel_sprite.h" + +/* Cursor formats */ +static const u32 intel_cursor_formats[] = { +DRM_FORMAT_ARGB8888 , +}; + +static const u64 cursor_format_modifiers[] = { +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; + +static u32 intel_cursor_base (const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv = +to_i915 (plane_state->uapi.plane->dev); +const struct drm_framebuffer *fb = plane_state->hw.fb; +const struct drm_i915_gem_object *obj =intel_fb_obj (fb); +u32 base; + +if (INTEL_INFO (dev_priv)->display.cursor_needs_physical) + base =sg_dma_address (obj->mm.pages->sgl); +else + base =intel_plane_ggtt_offset (plane_state); + +return base + plane_state->color_plane[0 ].offset; +} + +static u32 intel_cursor_position (const struct intel_plane_state *plane_state) +{ +int x = plane_state->uapi.dst.x1; +int y = plane_state->uapi.dst.y1; +u32 pos =0 ; + +if (x <0 ) { + pos |=CURSOR_POS_SIGN <<CURSOR_X_SHIFT ; + x = -x; + } + pos |= x <<CURSOR_X_SHIFT ; + +if (y <0 ) { + pos |=CURSOR_POS_SIGN <<CURSOR_Y_SHIFT ; + y = -y; + } + pos |= y <<CURSOR_Y_SHIFT ; + +return pos; +} + +static bool intel_cursor_size_ok (const struct intel_plane_state *plane_state) +{ +const struct drm_mode_config *config = + &plane_state->uapi.plane->dev->mode_config; +int width =drm_rect_width (&plane_state->uapi.dst); +int height =drm_rect_height (&plane_state->uapi.dst); + +return width >0 && width <= config->cursor_width && + height >0 && height <= config->cursor_height; +} + +static int intel_cursor_check_surface (struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv = +to_i915 (plane_state->uapi.plane->dev); +unsigned int rotation = plane_state->hw.rotation; +int src_x, src_y; +u32 offset; +int ret; + + ret =intel_plane_compute_gtt (plane_state); +if (ret) +return ret; + +if (!plane_state->uapi.visible) +return 0 ; + + src_x = plane_state->uapi.src.x1 >>16 ; + src_y = plane_state->uapi.src.y1 >>16 ; + +intel_add_fb_offsets (&src_x, &src_y, plane_state,0 ); + offset =intel_plane_compute_aligned_offset (&src_x, &src_y, + plane_state,0 ); + +if (src_x !=0 || src_y !=0 ) { +drm_dbg_kms (&dev_priv->drm, +"Arbitrary cursor panning not supported\n" ); +return -EINVAL ; + } + +/* +* Put the final coordinates back so that the src +* coordinate checks will see the right values. +*/ +drm_rect_translate_to (&plane_state->uapi.src, + src_x <<16 , src_y <<16 ); + +/* ILK+ do this automagically in hardware */ +if (HAS_GMCH (dev_priv) && rotation &DRM_MODE_ROTATE_180 ) { +const struct drm_framebuffer *fb = plane_state->hw.fb; +int src_w =drm_rect_width (&plane_state->uapi.src) >>16 ; +int src_h =drm_rect_height (&plane_state->uapi.src) >>16 ; + + offset += (src_h * src_w -1 ) * fb->format->cpp[0 ]; + } + + plane_state->color_plane[0 ].offset = offset; + plane_state->color_plane[0 ].x = src_x; + plane_state->color_plane[0 ].y = src_y; + +return 0 ; +} + +static int intel_check_cursor (struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) +{ +const struct drm_framebuffer *fb = plane_state->hw.fb; +struct drm_i915_private *i915 =to_i915 (plane_state->uapi.plane->dev); +const struct drm_rect src = plane_state->uapi.src; +const struct drm_rect dst = plane_state->uapi.dst; +int ret; + +if (fb && fb->modifier !=DRM_FORMAT_MOD_LINEAR ) { +drm_dbg_kms (&i915->drm,"cursor cannot be tiled\n" ); +return -EINVAL ; + } + + ret =intel_atomic_plane_check_clipping (plane_state, crtc_state, +DRM_PLANE_HELPER_NO_SCALING , +DRM_PLANE_HELPER_NO_SCALING , + true); +if (ret) +return ret; + +/* Use the unclipped src/dst rectangles, which we program to hw */ + plane_state->uapi.src = src; + plane_state->uapi.dst = dst; + + ret =intel_cursor_check_surface (plane_state); +if (ret) +return ret; + +if (!plane_state->uapi.visible) +return 0 ; + + ret =intel_plane_check_src_coordinates (plane_state); +if (ret) +return ret; + +return 0 ; +} + +static unsigned int +i845_cursor_max_stride (struct intel_plane *plane, +u32 pixel_format,u64 modifier, +unsigned int rotation) +{ +return 2048 ; +} + +static u32 i845_cursor_ctl_crtc (const struct intel_crtc_state *crtc_state) +{ +u32 cntl =0 ; + +if (crtc_state->gamma_enable) + cntl |=CURSOR_GAMMA_ENABLE ; + +return cntl; +} + +static u32 i845_cursor_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +return CURSOR_ENABLE | +CURSOR_FORMAT_ARGB | +CURSOR_STRIDE (plane_state->color_plane[0 ].stride); +} + +static bool i845_cursor_size_ok (const struct intel_plane_state *plane_state) +{ +int width =drm_rect_width (&plane_state->uapi.dst); + +/* +* 845g/865g are only limited by the width of their cursors, +* the height is arbitrary up to the precision of the register. +*/ +return intel_cursor_size_ok (plane_state) &&IS_ALIGNED (width,64 ); +} + +static int i845_check_cursor (struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) +{ +const struct drm_framebuffer *fb = plane_state->hw.fb; +struct drm_i915_private *i915 =to_i915 (plane_state->uapi.plane->dev); +int ret; + + ret =intel_check_cursor (crtc_state, plane_state); +if (ret) +return ret; + +/* if we want to turn off the cursor ignore width and height */ +if (!fb) +return 0 ; + +/* Check for which cursor types we support */ +if (!i845_cursor_size_ok (plane_state)) { +drm_dbg_kms (&i915->drm, +"Cursor dimension %dx%d not supported\n" , +drm_rect_width (&plane_state->uapi.dst), +drm_rect_height (&plane_state->uapi.dst)); +return -EINVAL ; + } + +drm_WARN_ON (&i915->drm, plane_state->uapi.visible && + plane_state->color_plane[0 ].stride != fb->pitches[0 ]); + +switch (fb->pitches[0 ]) { +case 256 : +case 512 : +case 1024 : +case 2048 : +break ; +default : +drm_dbg_kms (&i915->drm,"Invalid cursor stride (%u)\n" , + fb->pitches[0 ]); +return -EINVAL ; + } + + plane_state->ctl =i845_cursor_ctl (crtc_state, plane_state); + +return 0 ; +} + +static void i845_update_cursor (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +u32 cntl =0 , base =0 , pos =0 , size =0 ; +unsigned long irqflags; + +if (plane_state && plane_state->uapi.visible) { +unsigned int width =drm_rect_width (&plane_state->uapi.dst); +unsigned int height =drm_rect_height (&plane_state->uapi.dst); + + cntl = plane_state->ctl | +i845_cursor_ctl_crtc (crtc_state); + + size = (height <<12 ) | width; + + base =intel_cursor_base (plane_state); + pos =intel_cursor_position (plane_state); + } + +spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); + +/* On these chipsets we can only modify the base/size/stride +* whilst the cursor is disabled. +*/ +if (plane->cursor.base != base || + plane->cursor.size != size || + plane->cursor.cntl != cntl) { +intel_de_write_fw (dev_priv,CURCNTR (PIPE_A ),0 ); +intel_de_write_fw (dev_priv,CURBASE (PIPE_A ), base); +intel_de_write_fw (dev_priv,CURSIZE , size); +intel_de_write_fw (dev_priv,CURPOS (PIPE_A ), pos); +intel_de_write_fw (dev_priv,CURCNTR (PIPE_A ), cntl); + + plane->cursor.base = base; + plane->cursor.size = size; + plane->cursor.cntl = cntl; + }else { +intel_de_write_fw (dev_priv,CURPOS (PIPE_A ), pos); + } + +spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +} + +static void i845_disable_cursor (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state) +{ +i845_update_cursor (plane, crtc_state,NULL ); +} + +static bool i845_cursor_get_hw_state (struct intel_plane *plane, +enum pipe *pipe) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +enum intel_display_power_domain power_domain; +intel_wakeref_t wakeref; +bool ret; + + power_domain =POWER_DOMAIN_PIPE (PIPE_A ); + wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain); +if (!wakeref) +return false; + + ret =intel_de_read (dev_priv,CURCNTR (PIPE_A )) &CURSOR_ENABLE ; + + *pipe =PIPE_A ; + +intel_display_power_put (dev_priv, power_domain, wakeref); + +return ret; +} + +static unsigned int +i9xx_cursor_max_stride (struct intel_plane *plane, +u32 pixel_format,u64 modifier, +unsigned int rotation) +{ +return plane->base.dev->mode_config.cursor_width *4 ; +} + +static u32 i9xx_cursor_ctl_crtc (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); +u32 cntl =0 ; + +if (INTEL_GEN (dev_priv) >=11 ) +return cntl; + +if (crtc_state->gamma_enable) + cntl =MCURSOR_GAMMA_ENABLE ; + +if (crtc_state->csc_enable) + cntl |=MCURSOR_PIPE_CSC_ENABLE ; + +if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) + cntl |=MCURSOR_PIPE_SELECT (crtc->pipe); + +return cntl; +} + +static u32 i9xx_cursor_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv = +to_i915 (plane_state->uapi.plane->dev); +u32 cntl =0 ; + +if (IS_GEN (dev_priv,6 ) ||IS_IVYBRIDGE (dev_priv)) + cntl |=MCURSOR_TRICKLE_FEED_DISABLE ; + +switch (drm_rect_width (&plane_state->uapi.dst)) { +case 64 : + cntl |=MCURSOR_MODE_64_ARGB_AX ; +break ; +case 128 : + cntl |=MCURSOR_MODE_128_ARGB_AX ; +break ; +case 256 : + cntl |=MCURSOR_MODE_256_ARGB_AX ; +break ; +default : +MISSING_CASE (drm_rect_width (&plane_state->uapi.dst)); +return 0 ; + } + +if (plane_state->hw.rotation &DRM_MODE_ROTATE_180 ) + cntl |=MCURSOR_ROTATE_180 ; + +return cntl; +} + +static bool i9xx_cursor_size_ok (const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv = +to_i915 (plane_state->uapi.plane->dev); +int width =drm_rect_width (&plane_state->uapi.dst); +int height =drm_rect_height (&plane_state->uapi.dst); + +if (!intel_cursor_size_ok (plane_state)) +return false; + +/* Cursor width is limited to a few power-of-two sizes */ +switch (width) { +case 256 : +case 128 : +case 64 : +break ; +default : +return false; + } + +/* +* IVB+ have CUR_FBC_CTL which allows an arbitrary cursor +* height from 8 lines up to the cursor width, when the +* cursor is not rotated. Everything else requires square +* cursors. +*/ +if (HAS_CUR_FBC (dev_priv) && + plane_state->hw.rotation &DRM_MODE_ROTATE_0 ) { +if (height <8 || height > width) +return false; + }else { +if (height != width) +return false; + } + +return true; +} + +static int i9xx_check_cursor (struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) +{ +struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane); +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +const struct drm_framebuffer *fb = plane_state->hw.fb; +enum pipe pipe = plane->pipe; +int ret; + + ret =intel_check_cursor (crtc_state, plane_state); +if (ret) +return ret; + +/* if we want to turn off the cursor ignore width and height */ +if (!fb) +return 0 ; + +/* Check for which cursor types we support */ +if (!i9xx_cursor_size_ok (plane_state)) { +drm_dbg (&dev_priv->drm, +"Cursor dimension %dx%d not supported\n" , +drm_rect_width (&plane_state->uapi.dst), +drm_rect_height (&plane_state->uapi.dst)); +return -EINVAL ; + } + +drm_WARN_ON (&dev_priv->drm, plane_state->uapi.visible && + plane_state->color_plane[0 ].stride != fb->pitches[0 ]); + +if (fb->pitches[0 ] != +drm_rect_width (&plane_state->uapi.dst) * fb->format->cpp[0 ]) { +drm_dbg_kms (&dev_priv->drm, +"Invalid cursor stride (%u) (cursor width %d)\n" , + fb->pitches[0 ], +drm_rect_width (&plane_state->uapi.dst)); +return -EINVAL ; + } + +/* +* There's something wrong with the cursor on CHV pipe C. +* If it straddles the left edge of the screen then +* moving it away from the edge or disabling it often +* results in a pipe underrun, and often that can lead to +* dead pipe (constant underrun reported, and it scans +* out just a solid color). To recover from that, the +* display power well must be turned off and on again. +* Refuse the put the cursor into that compromised position. +*/ +if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_C && + plane_state->uapi.visible && plane_state->uapi.dst.x1 <0 ) { +drm_dbg_kms (&dev_priv->drm, +"CHV cursor C not allowed to straddle the left screen edge\n" ); +return -EINVAL ; + } + + plane_state->ctl =i9xx_cursor_ctl (crtc_state, plane_state); + +return 0 ; +} + +static void i9xx_update_cursor (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +enum pipe pipe = plane->pipe; +u32 cntl =0 , base =0 , pos =0 , fbc_ctl =0 ; +unsigned long irqflags; + +if (plane_state && plane_state->uapi.visible) { +unsigned width =drm_rect_width (&plane_state->uapi.dst); +unsigned height =drm_rect_height (&plane_state->uapi.dst); + + cntl = plane_state->ctl | +i9xx_cursor_ctl_crtc (crtc_state); + +if (width != height) + fbc_ctl =CUR_FBC_CTL_EN | (height -1 ); + + base =intel_cursor_base (plane_state); + pos =intel_cursor_position (plane_state); + } + +spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); + +/* +* On some platforms writing CURCNTR first will also +* cause CURPOS to be armed by the CURBASE write. +* Without the CURCNTR write the CURPOS write would +* arm itself. Thus we always update CURCNTR before +* CURPOS. +* +* On other platforms CURPOS always requires the +* CURBASE write to arm the update. Additonally +* a write to any of the cursor register will cancel +* an already armed cursor update. Thus leaving out +* the CURBASE write after CURPOS could lead to a +* cursor that doesn't appear to move, or even change +* shape. Thus we always write CURBASE. +* +* The other registers are armed by by the CURBASE write +* except when the plane is getting enabled at which time +* the CURCNTR write arms the update. +*/ + +if (INTEL_GEN (dev_priv) >=9 ) +skl_write_cursor_wm (plane, crtc_state); + +if (!intel_crtc_needs_modeset (crtc_state)) +intel_psr2_program_plane_sel_fetch (plane, crtc_state, plane_state,0 ); + +if (plane->cursor.base != base || + plane->cursor.size != fbc_ctl || + plane->cursor.cntl != cntl) { +if (HAS_CUR_FBC (dev_priv)) +intel_de_write_fw (dev_priv,CUR_FBC_CTL (pipe), + fbc_ctl); +intel_de_write_fw (dev_priv,CURCNTR (pipe), cntl); +intel_de_write_fw (dev_priv,CURPOS (pipe), pos); +intel_de_write_fw (dev_priv,CURBASE (pipe), base); + + plane->cursor.base = base; + plane->cursor.size = fbc_ctl; + plane->cursor.cntl = cntl; + }else { +intel_de_write_fw (dev_priv,CURPOS (pipe), pos); +intel_de_write_fw (dev_priv,CURBASE (pipe), base); + } + +spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +} + +static void i9xx_disable_cursor (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state) +{ +i9xx_update_cursor (plane, crtc_state,NULL ); +} + +static bool i9xx_cursor_get_hw_state (struct intel_plane *plane, +enum pipe *pipe) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +enum intel_display_power_domain power_domain; +intel_wakeref_t wakeref; +bool ret; +u32 val; + +/* +* Not 100% correct for planes that can move between pipes, +* but that's only the case for gen2-3 which don't have any +* display power wells. +*/ + power_domain =POWER_DOMAIN_PIPE (plane->pipe); + wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain); +if (!wakeref) +return false; + + val =intel_de_read (dev_priv,CURCNTR (plane->pipe)); + + ret = val &MCURSOR_MODE ; + +if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) + *pipe = plane->pipe; +else + *pipe = (val &MCURSOR_PIPE_SELECT_MASK ) >> +MCURSOR_PIPE_SELECT_SHIFT ; + +intel_display_power_put (dev_priv, power_domain, wakeref); + +return ret; +} + +static bool intel_cursor_format_mod_supported (struct drm_plane *_plane, +u32 format,u64 modifier) +{ +return modifier ==DRM_FORMAT_MOD_LINEAR && + format ==DRM_FORMAT_ARGB8888 ; +} + +static int +intel_legacy_cursor_update (struct drm_plane *_plane, +struct drm_crtc *_crtc, +struct drm_framebuffer *fb, +int crtc_x,int crtc_y, +unsigned int crtc_w,unsigned int crtc_h, +u32 src_x,u32 src_y, +u32 src_w,u32 src_h, +struct drm_modeset_acquire_ctx *ctx) +{ +struct intel_plane *plane =to_intel_plane (_plane); +struct intel_crtc *crtc =to_intel_crtc (_crtc); +struct intel_plane_state *old_plane_state = +to_intel_plane_state (plane->base.state); +struct intel_plane_state *new_plane_state; +struct intel_crtc_state *crtc_state = +to_intel_crtc_state (crtc->base.state); +struct intel_crtc_state *new_crtc_state; +int ret; + +/* +* When crtc is inactive or there is a modeset pending, +* wait for it to complete in the slowpath +* +* FIXME bigjoiner fastpath would be good +*/ +if (!crtc_state->hw.active ||intel_crtc_needs_modeset (crtc_state) || + crtc_state->update_pipe || crtc_state->bigjoiner) + goto slow; + +/* +* Don't do an async update if there is an outstanding commit modifying +* the plane. This prevents our async update's changes from getting +* overridden by a previous synchronous update's state. +*/ +if (old_plane_state->uapi.commit && + !try_wait_for_completion (&old_plane_state->uapi.commit->hw_done)) + goto slow; + +/* +* If any parameters change that may affect watermarks, +* take the slowpath. Only changing fb or position should be +* in the fastpath. +*/ +if (old_plane_state->uapi.crtc != &crtc->base || + old_plane_state->uapi.src_w != src_w || + old_plane_state->uapi.src_h != src_h || + old_plane_state->uapi.crtc_w != crtc_w || + old_plane_state->uapi.crtc_h != crtc_h || + !old_plane_state->uapi.fb != !fb) + goto slow; + + new_plane_state =to_intel_plane_state (intel_plane_duplicate_state (&plane->base)); +if (!new_plane_state) +return -ENOMEM ; + + new_crtc_state =to_intel_crtc_state (intel_crtc_duplicate_state (&crtc->base)); +if (!new_crtc_state) { + ret = -ENOMEM ; + goto out_free; + } + +drm_atomic_set_fb_for_plane (&new_plane_state->uapi, fb); + + new_plane_state->uapi.src_x = src_x; + new_plane_state->uapi.src_y = src_y; + new_plane_state->uapi.src_w = src_w; + new_plane_state->uapi.src_h = src_h; + new_plane_state->uapi.crtc_x = crtc_x; + new_plane_state->uapi.crtc_y = crtc_y; + new_plane_state->uapi.crtc_w = crtc_w; + new_plane_state->uapi.crtc_h = crtc_h; + +intel_plane_copy_uapi_to_hw_state (new_plane_state, new_plane_state, crtc); + + ret =intel_plane_atomic_check_with_state (crtc_state, new_crtc_state, + old_plane_state, new_plane_state); +if (ret) + goto out_free; + + ret =intel_plane_pin_fb (new_plane_state); +if (ret) + goto out_free; + +intel_frontbuffer_flush (to_intel_frontbuffer (new_plane_state->hw.fb), +ORIGIN_FLIP ); +intel_frontbuffer_track (to_intel_frontbuffer (old_plane_state->hw.fb), +to_intel_frontbuffer (new_plane_state->hw.fb), + plane->frontbuffer_bit); + +/* Swap plane state */ + plane->base.state = &new_plane_state->uapi; + +/* +* We cannot swap crtc_state as it may be in use by an atomic commit or +* page flip that's running simultaneously. If we swap crtc_state and +* destroy the old state, we will cause a use-after-free there. +* +* Only update active_planes, which is needed for our internal +* bookkeeping. Either value will do the right thing when updating +* planes atomically. If the cursor was part of the atomic update then +* we would have taken the slowpath. +*/ + crtc_state->active_planes = new_crtc_state->active_planes; + +if (new_plane_state->uapi.visible) +intel_update_plane (plane, crtc_state, new_plane_state); +else +intel_disable_plane (plane, crtc_state); + +intel_plane_unpin_fb (old_plane_state); + +out_free: +if (new_crtc_state) +intel_crtc_destroy_state (&crtc->base, &new_crtc_state->uapi); +if (ret) +intel_plane_destroy_state (&plane->base, &new_plane_state->uapi); +else +intel_plane_destroy_state (&plane->base, &old_plane_state->uapi); +return ret; + +slow: +return drm_atomic_helper_update_plane (&plane->base, &crtc->base, fb, + crtc_x, crtc_y, crtc_w, crtc_h, + src_x, src_y, src_w, src_h, ctx); +} + +static const struct drm_plane_funcs intel_cursor_plane_funcs = { + .update_plane = intel_legacy_cursor_update, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = intel_plane_destroy, + .atomic_duplicate_state = intel_plane_duplicate_state, + .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = intel_cursor_format_mod_supported, +}; + +struct intel_plane * +intel_cursor_plane_create (struct drm_i915_private *dev_priv, +enum pipe pipe) +{ +struct intel_plane *cursor; +int ret, zpos; + + cursor =intel_plane_alloc (); +if (IS_ERR (cursor)) +return cursor; + + cursor->pipe = pipe; + cursor->i9xx_plane = (enum i9xx_plane_id ) pipe; + cursor->id =PLANE_CURSOR ; + cursor->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, cursor->id); + +if (IS_I845G (dev_priv) ||IS_I865G (dev_priv)) { + cursor->max_stride = i845_cursor_max_stride; + cursor->update_plane = i845_update_cursor; + cursor->disable_plane = i845_disable_cursor; + cursor->get_hw_state = i845_cursor_get_hw_state; + cursor->check_plane = i845_check_cursor; + }else { + cursor->max_stride = i9xx_cursor_max_stride; + cursor->update_plane = i9xx_update_cursor; + cursor->disable_plane = i9xx_disable_cursor; + cursor->get_hw_state = i9xx_cursor_get_hw_state; + cursor->check_plane = i9xx_check_cursor; + } + + cursor->cursor.base = ~0 ; + cursor->cursor.cntl = ~0 ; + +if (IS_I845G (dev_priv) ||IS_I865G (dev_priv) ||HAS_CUR_FBC (dev_priv)) + cursor->cursor.size = ~0 ; + + ret =drm_universal_plane_init (&dev_priv->drm, &cursor->base, +0 , &intel_cursor_plane_funcs, + intel_cursor_formats, +ARRAY_SIZE (intel_cursor_formats), + cursor_format_modifiers, +DRM_PLANE_TYPE_CURSOR , +"cursor %c" ,pipe_name (pipe)); +if (ret) + goto fail; + +if (INTEL_GEN (dev_priv) >=4 ) +drm_plane_create_rotation_property (&cursor->base, +DRM_MODE_ROTATE_0 , +DRM_MODE_ROTATE_0 | +DRM_MODE_ROTATE_180 ); + + zpos =RUNTIME_INFO (dev_priv)->num_sprites[pipe] +1 ; +drm_plane_create_zpos_immutable_property (&cursor->base, zpos); + +if (INTEL_GEN (dev_priv) >=12 ) +drm_plane_enable_fb_damage_clips (&cursor->base); + +drm_plane_helper_add (&cursor->base, &intel_plane_helper_funcs); + +return cursor; + +fail: +intel_plane_free (cursor); + +return ERR_PTR (ret); +}drivers/gpu/drm/i915/display/intel_cursor.h new file +18
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_CURSOR_H_ +#define _INTEL_CURSOR_H_ + +#include "intel_display.h" + +struct intel_plane ; + +struct intel_plane * +intel_cursor_plane_create (struct drm_i915_private *dev_priv, +enum pipe pipe); + + +#endif drivers/gpu/drm/i915/display/intel_display.c +7
-790@@ -69,6 +69,7 @@#include "intel_cdclk.h" #include "intel_color.h" #include "intel_csr.h" +#include "intel_cursor.h" #include "intel_display_types.h" #include "intel_dp_link_training.h" #include "intel_fbc.h" @@ -137,16 +138,6 @@ static const u64 i9xx_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; -/* Cursor formats */ -static const u32 intel_cursor_formats[] = { -DRM_FORMAT_ARGB8888 , -}; - -static const u64 cursor_format_modifiers[] = { -DRM_FORMAT_MOD_LINEAR , -DRM_FORMAT_MOD_INVALID -}; -static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ilk_pch_clock_get(struct intel_crtc *crtc,@@ -2528,9 +2519,9 @@ static u32 intel_compute_aligned_offset(struct drm_i915_private *dev_priv,return offset_aligned; } -static u32 intel_plane_compute_aligned_offset (int *x,int *y, -const struct intel_plane_state *state, -int color_plane) +u32 intel_plane_compute_aligned_offset (int *x,int *y, +const struct intel_plane_state *state, +int color_plane) {struct intel_plane *intel_plane =to_intel_plane (state->uapi.plane);struct drm_i915_private *dev_priv =to_i915 (intel_plane->base.dev);@@ -3267,7 +3258,7 @@ intel_plane_remap_gtt(struct intel_plane_state *plane_state) } } -static int +int intel_plane_compute_gtt (struct intel_plane_state *plane_state) { const struct intel_framebuffer *fb =@@ -11536,569 +11527,6 @@ static bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state)return true; } -static u32 intel_cursor_base (const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv = -to_i915 (plane_state->uapi.plane->dev); -const struct drm_framebuffer *fb = plane_state->hw.fb; -const struct drm_i915_gem_object *obj =intel_fb_obj (fb); -u32 base; - -if (INTEL_INFO (dev_priv)->display.cursor_needs_physical) - base =sg_dma_address (obj->mm.pages->sgl); -else - base =intel_plane_ggtt_offset (plane_state); - -return base + plane_state->color_plane[0 ].offset; -} - -static u32 intel_cursor_position (const struct intel_plane_state *plane_state) -{ -int x = plane_state->uapi.dst.x1; -int y = plane_state->uapi.dst.y1; -u32 pos =0 ; - -if (x <0 ) { - pos |=CURSOR_POS_SIGN <<CURSOR_X_SHIFT ; - x = -x; - } - pos |= x <<CURSOR_X_SHIFT ; - -if (y <0 ) { - pos |=CURSOR_POS_SIGN <<CURSOR_Y_SHIFT ; - y = -y; - } - pos |= y <<CURSOR_Y_SHIFT ; - -return pos; -} - -static bool intel_cursor_size_ok (const struct intel_plane_state *plane_state) -{ -const struct drm_mode_config *config = - &plane_state->uapi.plane->dev->mode_config; -int width =drm_rect_width (&plane_state->uapi.dst); -int height =drm_rect_height (&plane_state->uapi.dst); - -return width >0 && width <= config->cursor_width && - height >0 && height <= config->cursor_height; -} - -static int intel_cursor_check_surface (struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv = -to_i915 (plane_state->uapi.plane->dev); -unsigned int rotation = plane_state->hw.rotation; -int src_x, src_y; -u32 offset; -int ret; - - ret =intel_plane_compute_gtt (plane_state); -if (ret) -return ret; - -if (!plane_state->uapi.visible) -return 0 ; - - src_x = plane_state->uapi.src.x1 >>16 ; - src_y = plane_state->uapi.src.y1 >>16 ; - -intel_add_fb_offsets (&src_x, &src_y, plane_state,0 ); - offset =intel_plane_compute_aligned_offset (&src_x, &src_y, - plane_state,0 ); - -if (src_x !=0 || src_y !=0 ) { -drm_dbg_kms (&dev_priv->drm, -"Arbitrary cursor panning not supported\n" ); -return -EINVAL ; - } - -/* -* Put the final coordinates back so that the src -* coordinate checks will see the right values. -*/ -drm_rect_translate_to (&plane_state->uapi.src, - src_x <<16 , src_y <<16 ); - -/* ILK+ do this automagically in hardware */ -if (HAS_GMCH (dev_priv) && rotation &DRM_MODE_ROTATE_180 ) { -const struct drm_framebuffer *fb = plane_state->hw.fb; -int src_w =drm_rect_width (&plane_state->uapi.src) >>16 ; -int src_h =drm_rect_height (&plane_state->uapi.src) >>16 ; - - offset += (src_h * src_w -1 ) * fb->format->cpp[0 ]; - } - - plane_state->color_plane[0 ].offset = offset; - plane_state->color_plane[0 ].x = src_x; - plane_state->color_plane[0 ].y = src_y; - -return 0 ; -} - -static int intel_check_cursor (struct intel_crtc_state *crtc_state, -struct intel_plane_state *plane_state) -{ -const struct drm_framebuffer *fb = plane_state->hw.fb; -struct drm_i915_private *i915 =to_i915 (plane_state->uapi.plane->dev); -const struct drm_rect src = plane_state->uapi.src; -const struct drm_rect dst = plane_state->uapi.dst; -int ret; - -if (fb && fb->modifier !=DRM_FORMAT_MOD_LINEAR ) { -drm_dbg_kms (&i915->drm,"cursor cannot be tiled\n" ); -return -EINVAL ; - } - - ret =intel_atomic_plane_check_clipping (plane_state, crtc_state, -DRM_PLANE_HELPER_NO_SCALING , -DRM_PLANE_HELPER_NO_SCALING , - true); -if (ret) -return ret; - -/* Use the unclipped src/dst rectangles, which we program to hw */ - plane_state->uapi.src = src; - plane_state->uapi.dst = dst; - - ret =intel_cursor_check_surface (plane_state); -if (ret) -return ret; - -if (!plane_state->uapi.visible) -return 0 ; - - ret =intel_plane_check_src_coordinates (plane_state); -if (ret) -return ret; - -return 0 ; -} - -static unsigned int -i845_cursor_max_stride (struct intel_plane *plane, -u32 pixel_format,u64 modifier, -unsigned int rotation) -{ -return 2048 ; -} - -static u32 i845_cursor_ctl_crtc (const struct intel_crtc_state *crtc_state) -{ -u32 cntl =0 ; - -if (crtc_state->gamma_enable) - cntl |=CURSOR_GAMMA_ENABLE ; - -return cntl; -} - -static u32 i845_cursor_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -return CURSOR_ENABLE | -CURSOR_FORMAT_ARGB | -CURSOR_STRIDE (plane_state->color_plane[0 ].stride); -} - -static bool i845_cursor_size_ok (const struct intel_plane_state *plane_state) -{ -int width =drm_rect_width (&plane_state->uapi.dst); - -/* -* 845g/865g are only limited by the width of their cursors, -* the height is arbitrary up to the precision of the register. -*/ -return intel_cursor_size_ok (plane_state) &&IS_ALIGNED (width,64 ); -} - -static int i845_check_cursor (struct intel_crtc_state *crtc_state, -struct intel_plane_state *plane_state) -{ -const struct drm_framebuffer *fb = plane_state->hw.fb; -struct drm_i915_private *i915 =to_i915 (plane_state->uapi.plane->dev); -int ret; - - ret =intel_check_cursor (crtc_state, plane_state); -if (ret) -return ret; - -/* if we want to turn off the cursor ignore width and height */ -if (!fb) -return 0 ; - -/* Check for which cursor types we support */ -if (!i845_cursor_size_ok (plane_state)) { -drm_dbg_kms (&i915->drm, -"Cursor dimension %dx%d not supported\n" , -drm_rect_width (&plane_state->uapi.dst), -drm_rect_height (&plane_state->uapi.dst)); -return -EINVAL ; - } - -drm_WARN_ON (&i915->drm, plane_state->uapi.visible && - plane_state->color_plane[0 ].stride != fb->pitches[0 ]); - -switch (fb->pitches[0 ]) { -case 256 : -case 512 : -case 1024 : -case 2048 : -break ; -default : -drm_dbg_kms (&i915->drm,"Invalid cursor stride (%u)\n" , - fb->pitches[0 ]); -return -EINVAL ; - } - - plane_state->ctl =i845_cursor_ctl (crtc_state, plane_state); - -return 0 ; -} - -static void i845_update_cursor (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -u32 cntl =0 , base =0 , pos =0 , size =0 ; -unsigned long irqflags; - -if (plane_state && plane_state->uapi.visible) { -unsigned int width =drm_rect_width (&plane_state->uapi.dst); -unsigned int height =drm_rect_height (&plane_state->uapi.dst); - - cntl = plane_state->ctl | -i845_cursor_ctl_crtc (crtc_state); - - size = (height <<12 ) | width; - - base =intel_cursor_base (plane_state); - pos =intel_cursor_position (plane_state); - } - -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); - -/* On these chipsets we can only modify the base/size/stride -* whilst the cursor is disabled. -*/ -if (plane->cursor.base != base || - plane->cursor.size != size || - plane->cursor.cntl != cntl) { -intel_de_write_fw (dev_priv,CURCNTR (PIPE_A ),0 ); -intel_de_write_fw (dev_priv,CURBASE (PIPE_A ), base); -intel_de_write_fw (dev_priv,CURSIZE , size); -intel_de_write_fw (dev_priv,CURPOS (PIPE_A ), pos); -intel_de_write_fw (dev_priv,CURCNTR (PIPE_A ), cntl); - - plane->cursor.base = base; - plane->cursor.size = size; - plane->cursor.cntl = cntl; - }else { -intel_de_write_fw (dev_priv,CURPOS (PIPE_A ), pos); - } - -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); -} - -static void i845_disable_cursor (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state) -{ -i845_update_cursor (plane, crtc_state,NULL ); -} - -static bool i845_cursor_get_hw_state (struct intel_plane *plane, -enum pipe *pipe) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -enum intel_display_power_domain power_domain; -intel_wakeref_t wakeref; -bool ret; - - power_domain =POWER_DOMAIN_PIPE (PIPE_A ); - wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain); -if (!wakeref) -return false; - - ret =intel_de_read (dev_priv,CURCNTR (PIPE_A )) &CURSOR_ENABLE ; - - *pipe =PIPE_A ; - -intel_display_power_put (dev_priv, power_domain, wakeref); - -return ret; -} - -static unsigned int -i9xx_cursor_max_stride (struct intel_plane *plane, -u32 pixel_format,u64 modifier, -unsigned int rotation) -{ -return plane->base.dev->mode_config.cursor_width *4 ; -} - -static u32 i9xx_cursor_ctl_crtc (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); -u32 cntl =0 ; - -if (INTEL_GEN (dev_priv) >=11 ) -return cntl; - -if (crtc_state->gamma_enable) - cntl =MCURSOR_GAMMA_ENABLE ; - -if (crtc_state->csc_enable) - cntl |=MCURSOR_PIPE_CSC_ENABLE ; - -if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) - cntl |=MCURSOR_PIPE_SELECT (crtc->pipe); - -return cntl; -} - -static u32 i9xx_cursor_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv = -to_i915 (plane_state->uapi.plane->dev); -u32 cntl =0 ; - -if (IS_GEN (dev_priv,6 ) ||IS_IVYBRIDGE (dev_priv)) - cntl |=MCURSOR_TRICKLE_FEED_DISABLE ; - -switch (drm_rect_width (&plane_state->uapi.dst)) { -case 64 : - cntl |=MCURSOR_MODE_64_ARGB_AX ; -break ; -case 128 : - cntl |=MCURSOR_MODE_128_ARGB_AX ; -break ; -case 256 : - cntl |=MCURSOR_MODE_256_ARGB_AX ; -break ; -default : -MISSING_CASE (drm_rect_width (&plane_state->uapi.dst)); -return 0 ; - } - -if (plane_state->hw.rotation &DRM_MODE_ROTATE_180 ) - cntl |=MCURSOR_ROTATE_180 ; - -return cntl; -} - -static bool i9xx_cursor_size_ok (const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv = -to_i915 (plane_state->uapi.plane->dev); -int width =drm_rect_width (&plane_state->uapi.dst); -int height =drm_rect_height (&plane_state->uapi.dst); - -if (!intel_cursor_size_ok (plane_state)) -return false; - -/* Cursor width is limited to a few power-of-two sizes */ -switch (width) { -case 256 : -case 128 : -case 64 : -break ; -default : -return false; - } - -/* -* IVB+ have CUR_FBC_CTL which allows an arbitrary cursor -* height from 8 lines up to the cursor width, when the -* cursor is not rotated. Everything else requires square -* cursors. -*/ -if (HAS_CUR_FBC (dev_priv) && - plane_state->hw.rotation &DRM_MODE_ROTATE_0 ) { -if (height <8 || height > width) -return false; - }else { -if (height != width) -return false; - } - -return true; -} - -static int i9xx_check_cursor (struct intel_crtc_state *crtc_state, -struct intel_plane_state *plane_state) -{ -struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane); -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -const struct drm_framebuffer *fb = plane_state->hw.fb; -enum pipe pipe = plane->pipe; -int ret; - - ret =intel_check_cursor (crtc_state, plane_state); -if (ret) -return ret; - -/* if we want to turn off the cursor ignore width and height */ -if (!fb) -return 0 ; - -/* Check for which cursor types we support */ -if (!i9xx_cursor_size_ok (plane_state)) { -drm_dbg (&dev_priv->drm, -"Cursor dimension %dx%d not supported\n" , -drm_rect_width (&plane_state->uapi.dst), -drm_rect_height (&plane_state->uapi.dst)); -return -EINVAL ; - } - -drm_WARN_ON (&dev_priv->drm, plane_state->uapi.visible && - plane_state->color_plane[0 ].stride != fb->pitches[0 ]); - -if (fb->pitches[0 ] != -drm_rect_width (&plane_state->uapi.dst) * fb->format->cpp[0 ]) { -drm_dbg_kms (&dev_priv->drm, -"Invalid cursor stride (%u) (cursor width %d)\n" , - fb->pitches[0 ], -drm_rect_width (&plane_state->uapi.dst)); -return -EINVAL ; - } - -/* -* There's something wrong with the cursor on CHV pipe C. -* If it straddles the left edge of the screen then -* moving it away from the edge or disabling it often -* results in a pipe underrun, and often that can lead to -* dead pipe (constant underrun reported, and it scans -* out just a solid color). To recover from that, the -* display power well must be turned off and on again. -* Refuse the put the cursor into that compromised position. -*/ -if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_C && - plane_state->uapi.visible && plane_state->uapi.dst.x1 <0 ) { -drm_dbg_kms (&dev_priv->drm, -"CHV cursor C not allowed to straddle the left screen edge\n" ); -return -EINVAL ; - } - - plane_state->ctl =i9xx_cursor_ctl (crtc_state, plane_state); - -return 0 ; -} - -static void i9xx_update_cursor (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -enum pipe pipe = plane->pipe; -u32 cntl =0 , base =0 , pos =0 , fbc_ctl =0 ; -unsigned long irqflags; - -if (plane_state && plane_state->uapi.visible) { -unsigned width =drm_rect_width (&plane_state->uapi.dst); -unsigned height =drm_rect_height (&plane_state->uapi.dst); - - cntl = plane_state->ctl | -i9xx_cursor_ctl_crtc (crtc_state); - -if (width != height) - fbc_ctl =CUR_FBC_CTL_EN | (height -1 ); - - base =intel_cursor_base (plane_state); - pos =intel_cursor_position (plane_state); - } - -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); - -/* -* On some platforms writing CURCNTR first will also -* cause CURPOS to be armed by the CURBASE write. -* Without the CURCNTR write the CURPOS write would -* arm itself. Thus we always update CURCNTR before -* CURPOS. -* -* On other platforms CURPOS always requires the -* CURBASE write to arm the update. Additonally -* a write to any of the cursor register will cancel -* an already armed cursor update. Thus leaving out -* the CURBASE write after CURPOS could lead to a -* cursor that doesn't appear to move, or even change -* shape. Thus we always write CURBASE. -* -* The other registers are armed by by the CURBASE write -* except when the plane is getting enabled at which time -* the CURCNTR write arms the update. -*/ - -if (INTEL_GEN (dev_priv) >=9 ) -skl_write_cursor_wm (plane, crtc_state); - -if (!intel_crtc_needs_modeset (crtc_state)) -intel_psr2_program_plane_sel_fetch (plane, crtc_state, plane_state,0 ); - -if (plane->cursor.base != base || - plane->cursor.size != fbc_ctl || - plane->cursor.cntl != cntl) { -if (HAS_CUR_FBC (dev_priv)) -intel_de_write_fw (dev_priv,CUR_FBC_CTL (pipe), - fbc_ctl); -intel_de_write_fw (dev_priv,CURCNTR (pipe), cntl); -intel_de_write_fw (dev_priv,CURPOS (pipe), pos); -intel_de_write_fw (dev_priv,CURBASE (pipe), base); - - plane->cursor.base = base; - plane->cursor.size = fbc_ctl; - plane->cursor.cntl = cntl; - }else { -intel_de_write_fw (dev_priv,CURPOS (pipe), pos); -intel_de_write_fw (dev_priv,CURBASE (pipe), base); - } - -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); -} - -static void i9xx_disable_cursor (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state) -{ -i9xx_update_cursor (plane, crtc_state,NULL ); -} - -static bool i9xx_cursor_get_hw_state (struct intel_plane *plane, -enum pipe *pipe) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -enum intel_display_power_domain power_domain; -intel_wakeref_t wakeref; -bool ret; -u32 val; - -/* -* Not 100% correct for planes that can move between pipes, -* but that's only the case for gen2-3 which don't have any -* display power wells. -*/ - power_domain =POWER_DOMAIN_PIPE (plane->pipe); - wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain); -if (!wakeref) -return false; - - val =intel_de_read (dev_priv,CURCNTR (plane->pipe)); - - ret = val &MCURSOR_MODE ; - -if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) - *pipe = plane->pipe; -else - *pipe = (val &MCURSOR_PIPE_SELECT_MASK ) >> -MCURSOR_PIPE_SELECT_SHIFT ; - -intel_display_power_put (dev_priv, power_domain, wakeref); - -return ret; -} -/* VESA 640x480x72Hz mode to set on the pipe */ static const struct drm_display_mode load_detect_mode = { DRM_MODE("640x480", DRM_MODE_TYPE_DEFAULT, 31500, 640, 664,@@ -16609,7 +16037,7 @@ static void add_rps_boost_after_vblank(struct drm_crtc *crtc,add_wait_queue (drm_crtc_vblank_waitqueue (crtc), &wait->wait); } -static int intel_plane_pin_fb (struct intel_plane_state *plane_state) +int intel_plane_pin_fb (struct intel_plane_state *plane_state) {struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);@@ -16639,7 +16067,7 @@ static int intel_plane_pin_fb(struct intel_plane_state *plane_state)return 0 ; } -static void intel_plane_unpin_fb (struct intel_plane_state *old_plane_state) +void intel_plane_unpin_fb (struct intel_plane_state *old_plane_state) {struct i915_vma *vma;@@ -16875,13 +16303,6 @@ static bool i965_plane_format_mod_supported(struct drm_plane *_plane, } } -static bool intel_cursor_format_mod_supported (struct drm_plane *_plane, -u32 format,u64 modifier) -{ -return modifier ==DRM_FORMAT_MOD_LINEAR && - format ==DRM_FORMAT_ARGB8888 ; -} -static const struct drm_plane_funcs i965_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane,@@ -16900,142 +16321,6 @@ static const struct drm_plane_funcs i8xx_plane_funcs = { .format_mod_supported = i8xx_plane_format_mod_supported, }; -static int -intel_legacy_cursor_update (struct drm_plane *_plane, -struct drm_crtc *_crtc, -struct drm_framebuffer *fb, -int crtc_x,int crtc_y, -unsigned int crtc_w,unsigned int crtc_h, -u32 src_x,u32 src_y, -u32 src_w,u32 src_h, -struct drm_modeset_acquire_ctx *ctx) -{ -struct intel_plane *plane =to_intel_plane (_plane); -struct intel_crtc *crtc =to_intel_crtc (_crtc); -struct intel_plane_state *old_plane_state = -to_intel_plane_state (plane->base.state); -struct intel_plane_state *new_plane_state; -struct intel_crtc_state *crtc_state = -to_intel_crtc_state (crtc->base.state); -struct intel_crtc_state *new_crtc_state; -int ret; - -/* -* When crtc is inactive or there is a modeset pending, -* wait for it to complete in the slowpath -* -* FIXME bigjoiner fastpath would be good -*/ -if (!crtc_state->hw.active ||intel_crtc_needs_modeset (crtc_state) || - crtc_state->update_pipe || crtc_state->bigjoiner) - goto slow; - -/* -* Don't do an async update if there is an outstanding commit modifying -* the plane. This prevents our async update's changes from getting -* overridden by a previous synchronous update's state. -*/ -if (old_plane_state->uapi.commit && - !try_wait_for_completion (&old_plane_state->uapi.commit->hw_done)) - goto slow; - -/* -* If any parameters change that may affect watermarks, -* take the slowpath. Only changing fb or position should be -* in the fastpath. -*/ -if (old_plane_state->uapi.crtc != &crtc->base || - old_plane_state->uapi.src_w != src_w || - old_plane_state->uapi.src_h != src_h || - old_plane_state->uapi.crtc_w != crtc_w || - old_plane_state->uapi.crtc_h != crtc_h || - !old_plane_state->uapi.fb != !fb) - goto slow; - - new_plane_state =to_intel_plane_state (intel_plane_duplicate_state (&plane->base)); -if (!new_plane_state) -return -ENOMEM ; - - new_crtc_state =to_intel_crtc_state (intel_crtc_duplicate_state (&crtc->base)); -if (!new_crtc_state) { - ret = -ENOMEM ; - goto out_free; - } - -drm_atomic_set_fb_for_plane (&new_plane_state->uapi, fb); - - new_plane_state->uapi.src_x = src_x; - new_plane_state->uapi.src_y = src_y; - new_plane_state->uapi.src_w = src_w; - new_plane_state->uapi.src_h = src_h; - new_plane_state->uapi.crtc_x = crtc_x; - new_plane_state->uapi.crtc_y = crtc_y; - new_plane_state->uapi.crtc_w = crtc_w; - new_plane_state->uapi.crtc_h = crtc_h; - -intel_plane_copy_uapi_to_hw_state (new_plane_state, new_plane_state, crtc); - - ret =intel_plane_atomic_check_with_state (crtc_state, new_crtc_state, - old_plane_state, new_plane_state); -if (ret) - goto out_free; - - ret =intel_plane_pin_fb (new_plane_state); -if (ret) - goto out_free; - -intel_frontbuffer_flush (to_intel_frontbuffer (new_plane_state->hw.fb), -ORIGIN_FLIP ); -intel_frontbuffer_track (to_intel_frontbuffer (old_plane_state->hw.fb), -to_intel_frontbuffer (new_plane_state->hw.fb), - plane->frontbuffer_bit); - -/* Swap plane state */ - plane->base.state = &new_plane_state->uapi; - -/* -* We cannot swap crtc_state as it may be in use by an atomic commit or -* page flip that's running simultaneously. If we swap crtc_state and -* destroy the old state, we will cause a use-after-free there. -* -* Only update active_planes, which is needed for our internal -* bookkeeping. Either value will do the right thing when updating -* planes atomically. If the cursor was part of the atomic update then -* we would have taken the slowpath. -*/ - crtc_state->active_planes = new_crtc_state->active_planes; - -if (new_plane_state->uapi.visible) -intel_update_plane (plane, crtc_state, new_plane_state); -else -intel_disable_plane (plane, crtc_state); - -intel_plane_unpin_fb (old_plane_state); - -out_free: -if (new_crtc_state) -intel_crtc_destroy_state (&crtc->base, &new_crtc_state->uapi); -if (ret) -intel_plane_destroy_state (&plane->base, &new_plane_state->uapi); -else -intel_plane_destroy_state (&plane->base, &old_plane_state->uapi); -return ret; - -slow: -return drm_atomic_helper_update_plane (&plane->base, &crtc->base, fb, - crtc_x, crtc_y, crtc_w, crtc_h, - src_x, src_y, src_w, src_h, ctx); -} - -static const struct drm_plane_funcs intel_cursor_plane_funcs = { - .update_plane = intel_legacy_cursor_update, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, - .format_mod_supported = intel_cursor_format_mod_supported, -}; -static bool i9xx_plane_has_fbc (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) {@@ -17187,74 +16472,6 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)return ERR_PTR (ret); } -static struct intel_plane * -intel_cursor_plane_create (struct drm_i915_private *dev_priv, -enum pipe pipe) -{ -struct intel_plane *cursor; -int ret, zpos; - - cursor =intel_plane_alloc (); -if (IS_ERR (cursor)) -return cursor; - - cursor->pipe = pipe; - cursor->i9xx_plane = (enum i9xx_plane_id ) pipe; - cursor->id =PLANE_CURSOR ; - cursor->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, cursor->id); - -if (IS_I845G (dev_priv) ||IS_I865G (dev_priv)) { - cursor->max_stride = i845_cursor_max_stride; - cursor->update_plane = i845_update_cursor; - cursor->disable_plane = i845_disable_cursor; - cursor->get_hw_state = i845_cursor_get_hw_state; - cursor->check_plane = i845_check_cursor; - }else { - cursor->max_stride = i9xx_cursor_max_stride; - cursor->update_plane = i9xx_update_cursor; - cursor->disable_plane = i9xx_disable_cursor; - cursor->get_hw_state = i9xx_cursor_get_hw_state; - cursor->check_plane = i9xx_check_cursor; - } - - cursor->cursor.base = ~0 ; - cursor->cursor.cntl = ~0 ; - -if (IS_I845G (dev_priv) ||IS_I865G (dev_priv) ||HAS_CUR_FBC (dev_priv)) - cursor->cursor.size = ~0 ; - - ret =drm_universal_plane_init (&dev_priv->drm, &cursor->base, -0 , &intel_cursor_plane_funcs, - intel_cursor_formats, -ARRAY_SIZE (intel_cursor_formats), - cursor_format_modifiers, -DRM_PLANE_TYPE_CURSOR , -"cursor %c" ,pipe_name (pipe)); -if (ret) - goto fail; - -if (INTEL_GEN (dev_priv) >=4 ) -drm_plane_create_rotation_property (&cursor->base, -DRM_MODE_ROTATE_0 , -DRM_MODE_ROTATE_0 | -DRM_MODE_ROTATE_180 ); - - zpos =RUNTIME_INFO (dev_priv)->num_sprites[pipe] +1 ; -drm_plane_create_zpos_immutable_property (&cursor->base, zpos); - -if (INTEL_GEN (dev_priv) >=12 ) -drm_plane_enable_fb_damage_clips (&cursor->base); - -drm_plane_helper_add (&cursor->base, &intel_plane_helper_funcs); - -return cursor; - -fail: -intel_plane_free (cursor); - -return ERR_PTR (ret); -} -static int intel_crtc_late_register (struct drm_crtc *crtc) {intel_crtc_debugfs_add (crtc);drivers/gpu/drm/i915/display/intel_display.h +7
-0@@ -647,6 +647,13 @@ bool intel_format_info_is_yuv_semiplanar(const struct drm_format_info *info, uint64_t modifier); +int intel_plane_compute_gtt (struct intel_plane_state *plane_state); +u32 intel_plane_compute_aligned_offset (int *x,int *y, +const struct intel_plane_state *state, +int color_plane); +int intel_plane_pin_fb (struct intel_plane_state *plane_state); +void intel_plane_unpin_fb (struct intel_plane_state *old_plane_state); +/* modesetting */ void intel_modeset_init_hw (struct drm_i915_private *i915);int intel_modeset_init_noirq (struct drm_i915_private *i915);
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 5/11 drm/i915: refactor some crtc code out of intel display.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
There may be more crtc code that can be pulled out, but this is a good start.
RFC: maybe call the new file something different
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_crtc.c | 953 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_crtc.h | 20 + drivers/gpu/drm/i915/display/intel_display.c | 934 +----------------- 4 files changed, 975 insertions(+), 933 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.c create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -196,6 +196,7 @@ i915-y += \ display/intel_color.o \ display/intel_combo_phy.o \ display/intel_connector.o \ + display/intel_crtc.o \ display/intel_csr.o \ display/intel_cursor.o \ display/intel_display.o \
drivers/gpu/drm/i915/display/intel_crtc.c new file +953 -0
953 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_crtc.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_CRTC_H_ +#define _INTEL_CRTC_H_ + +#include "intel_display.h" + +struct intel_crtc_state ; + +u32 intel_crtc_max_vblank_count (const struct intel_crtc_state *crtc_state); +int intel_crtc_init (struct drm_i915_private *dev_priv,enum pipe pipe); +struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc); +void intel_crtc_state_reset (struct intel_crtc_state *crtc_state, +struct intel_crtc *crtc); + + +#endif
drivers/gpu/drm/i915/display/intel_display.c +1 -933
1,007 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
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 05/11] drm/i915: refactor some crtc code out of intel display.
Quoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
There may be more crtc code that can be pulled out, but this is a good start.
RFC: maybe call the new file something different
I checked this is just code movement. I did clean up intel_crtc.h locally a bit though. (I'll probably re-send the series with a few fixes to pass CI.)
I'm not averse to renaming the file later if needed, I'm more concerned about choosing a meaningful bunch of functions to take out and put in the new file.
Ville, I saw you had some comments about this - is this making sensible progress or making further refactoring harder?
I'm honestly beginning to think we've had too many stalled attempts at cleaning up the file (including at least three patch series from yours truly) that I'm ready to just chop up the file, and clean it up more later as needed.
BR,
Jani.
Quoted 2,031 lines
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_crtc.c | 953 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_crtc.h | 20 + drivers/gpu/drm/i915/display/intel_display.c | 934 +----------------- 4 files changed, 975 insertions(+), 933 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.c create mode 100644 drivers/gpu/drm/i915/display/intel_crtc.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -196,6 +196,7 @@ i915-y += \ display/intel_color.o \ display/intel_combo_phy.o \ display/intel_connector.o \ + display/intel_crtc.o \ display/intel_csr.o \ display/intel_cursor.o \ display/intel_display.o \drivers/gpu/drm/i915/display/intel_crtc.c new file +953
-0@@ -0,0 +1,953 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation +*/ +#include <linux/kernel.h> +#include <linux/slab.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_plane.h> +#include <drm/drm_plane_helper.h> + +#include "intel_atomic.h" +#include "intel_atomic_plane.h" +#include "intel_color.h" +#include "intel_crtc.h" +#include "intel_cursor.h" +#include "intel_display_debugfs.h" +#include "intel_display_types.h" +#include "intel_pipe_crc.h" +#include "intel_sprite.h" + +/* Primary plane formats for gen <= 3 */ +static const u32 i8xx_primary_formats[] = { +DRM_FORMAT_C8 , +DRM_FORMAT_XRGB1555 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_XRGB8888 , +}; + +/* Primary plane formats for ivb (no fp16 due to hw issue) */ +static const u32 ivb_primary_formats[] = { +DRM_FORMAT_C8 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_XRGB2101010 , +DRM_FORMAT_XBGR2101010 , +}; + +/* Primary plane formats for gen >= 4, except ivb */ +static const u32 i965_primary_formats[] = { +DRM_FORMAT_C8 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_XRGB2101010 , +DRM_FORMAT_XBGR2101010 , +DRM_FORMAT_XBGR16161616F , +}; + +/* Primary plane formats for vlv/chv */ +static const u32 vlv_primary_formats[] = { +DRM_FORMAT_C8 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_XRGB2101010 , +DRM_FORMAT_XBGR2101010 , +DRM_FORMAT_ARGB2101010 , +DRM_FORMAT_ABGR2101010 , +DRM_FORMAT_XBGR16161616F , +}; + +static const u64 i9xx_format_modifiers[] = { +I915_FORMAT_MOD_X_TILED , +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; + +static bool i8xx_plane_format_mod_supported (struct drm_plane *_plane, +u32 format,u64 modifier) +{ +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +break ; +default : +return false; + } + +switch (format) { +case DRM_FORMAT_C8 : +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB1555 : +case DRM_FORMAT_XRGB8888 : +return modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED ; +default : +return false; + } +} + +static bool i965_plane_format_mod_supported (struct drm_plane *_plane, +u32 format,u64 modifier) +{ +switch (modifier) { +case DRM_FORMAT_MOD_LINEAR : +case I915_FORMAT_MOD_X_TILED : +break ; +default : +return false; + } + +switch (format) { +case DRM_FORMAT_C8 : +case DRM_FORMAT_RGB565 : +case DRM_FORMAT_XRGB8888 : +case DRM_FORMAT_XBGR8888 : +case DRM_FORMAT_ARGB8888 : +case DRM_FORMAT_ABGR8888 : +case DRM_FORMAT_XRGB2101010 : +case DRM_FORMAT_XBGR2101010 : +case DRM_FORMAT_ARGB2101010 : +case DRM_FORMAT_ABGR2101010 : +case DRM_FORMAT_XBGR16161616F : +return modifier ==DRM_FORMAT_MOD_LINEAR || + modifier ==I915_FORMAT_MOD_X_TILED ; +default : +return false; + } +} + +static bool i9xx_plane_has_fbc (struct drm_i915_private *dev_priv, +enum i9xx_plane_id i9xx_plane) +{ +if (!HAS_FBC (dev_priv)) +return false; + +if (IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) +return i9xx_plane ==PLANE_A ;/* tied to pipe A */ +else if (IS_IVYBRIDGE (dev_priv)) +return i9xx_plane ==PLANE_A || i9xx_plane ==PLANE_B || + i9xx_plane ==PLANE_C ; +else if (INTEL_GEN (dev_priv) >=4 ) +return i9xx_plane ==PLANE_A || i9xx_plane ==PLANE_B ; +else +return i9xx_plane ==PLANE_A ; +} + +static void assert_vblank_disabled (struct drm_crtc *crtc) +{ +if (I915_STATE_WARN_ON (drm_crtc_vblank_get (crtc) ==0 )) +drm_crtc_vblank_put (crtc); +} + +u32 intel_crtc_get_vblank_counter (struct intel_crtc *crtc) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index (&crtc->base)]; + +if (!vblank->max_vblank_count) +return (u32 )drm_crtc_accurate_vblank_count (&crtc->base); + +return crtc->base.funcs->get_vblank_counter (&crtc->base); +} + +u32 intel_crtc_max_vblank_count (const struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +u32 mode_flags = crtc->mode_flags; + +/* +* From Gen 11, In case of dsi cmd mode, frame counter wouldnt +* have updated at the beginning of TE, if we want to use +* the hw counter, then we would find it updated in only +* the next TE, hence switching to sw counter. +*/ +if (mode_flags & (I915_MODE_FLAG_DSI_USE_TE0 |I915_MODE_FLAG_DSI_USE_TE1 )) +return 0 ; + +/* +* On i965gm the hardware frame counter reads +* zero when the TV encoder is enabled :( +*/ +if (IS_I965GM (dev_priv) && + (crtc_state->output_types &BIT (INTEL_OUTPUT_TVOUT ))) +return 0 ; + +if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) +return 0xffffffff ;/* full 32 bit counter */ +else if (INTEL_GEN (dev_priv) >=3 ) +return 0xffffff ;/* only 24 bits of frame count */ +else +return 0 ;/* Gen2 doesn't have a hardware frame counter */ +} + +void intel_crtc_vblank_on (const struct intel_crtc_state *crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); + +assert_vblank_disabled (&crtc->base); +drm_crtc_set_max_vblank_count (&crtc->base, +intel_crtc_max_vblank_count (crtc_state)); +drm_crtc_vblank_on (&crtc->base); +} + +void intel_crtc_vblank_off (const struct intel_crtc_state *crtc_state) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); + +drm_crtc_vblank_off (&crtc->base); +assert_vblank_disabled (&crtc->base); +} + +struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc) +{ +struct intel_crtc_state *crtc_state; + + crtc_state =kmalloc (sizeof (*crtc_state),GFP_KERNEL ); + +if (crtc_state) +intel_crtc_state_reset (crtc_state, crtc); + +return crtc_state; +} + +void intel_crtc_state_reset (struct intel_crtc_state *crtc_state, +struct intel_crtc *crtc) +{ +memset (crtc_state,0 ,sizeof (*crtc_state)); + +__drm_atomic_helper_crtc_state_reset (&crtc_state->uapi, &crtc->base); + + crtc_state->cpu_transcoder =INVALID_TRANSCODER ; + crtc_state->master_transcoder =INVALID_TRANSCODER ; + crtc_state->hsw_workaround_pipe =INVALID_PIPE ; + crtc_state->output_format =INTEL_OUTPUT_FORMAT_INVALID ; + crtc_state->scaler_state.scaler_id =-1 ; + crtc_state->mst_master_transcoder =INVALID_TRANSCODER ; +} + +static bool i9xx_plane_has_windowing (struct intel_plane *plane) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; + +if (IS_CHERRYVIEW (dev_priv)) +return i9xx_plane ==PLANE_B ; +else if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) +return false; +else if (IS_GEN (dev_priv,4 )) +return i9xx_plane ==PLANE_C ; +else +return i9xx_plane ==PLANE_B || + i9xx_plane ==PLANE_C ; +} + +static u32 i9xx_plane_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv = +to_i915 (plane_state->uapi.plane->dev); +const struct drm_framebuffer *fb = plane_state->hw.fb; +unsigned int rotation = plane_state->hw.rotation; +u32 dspcntr; + + dspcntr =DISPLAY_PLANE_ENABLE ; + +if (IS_G4X (dev_priv) ||IS_GEN (dev_priv,5 ) || +IS_GEN (dev_priv,6 ) ||IS_IVYBRIDGE (dev_priv)) + dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ; + +switch (fb->format->format) { +case DRM_FORMAT_C8 : + dspcntr |=DISPPLANE_8BPP ; +break ; +case DRM_FORMAT_XRGB1555 : + dspcntr |=DISPPLANE_BGRX555 ; +break ; +case DRM_FORMAT_ARGB1555 : + dspcntr |=DISPPLANE_BGRA555 ; +break ; +case DRM_FORMAT_RGB565 : + dspcntr |=DISPPLANE_BGRX565 ; +break ; +case DRM_FORMAT_XRGB8888 : + dspcntr |=DISPPLANE_BGRX888 ; +break ; +case DRM_FORMAT_XBGR8888 : + dspcntr |=DISPPLANE_RGBX888 ; +break ; +case DRM_FORMAT_ARGB8888 : + dspcntr |=DISPPLANE_BGRA888 ; +break ; +case DRM_FORMAT_ABGR8888 : + dspcntr |=DISPPLANE_RGBA888 ; +break ; +case DRM_FORMAT_XRGB2101010 : + dspcntr |=DISPPLANE_BGRX101010 ; +break ; +case DRM_FORMAT_XBGR2101010 : + dspcntr |=DISPPLANE_RGBX101010 ; +break ; +case DRM_FORMAT_ARGB2101010 : + dspcntr |=DISPPLANE_BGRA101010 ; +break ; +case DRM_FORMAT_ABGR2101010 : + dspcntr |=DISPPLANE_RGBA101010 ; +break ; +case DRM_FORMAT_XBGR16161616F : + dspcntr |=DISPPLANE_RGBX161616 ; +break ; +default : +MISSING_CASE (fb->format->format); +return 0 ; + } + +if (INTEL_GEN (dev_priv) >=4 && + fb->modifier ==I915_FORMAT_MOD_X_TILED ) + dspcntr |=DISPPLANE_TILED ; + +if (rotation &DRM_MODE_ROTATE_180 ) + dspcntr |=DISPPLANE_ROTATE_180 ; + +if (rotation &DRM_MODE_REFLECT_X ) + dspcntr |=DISPPLANE_MIRROR ; + +return dspcntr; +} + +static int +i9xx_plane_check (struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) +{ +struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane); +int ret; + + ret =chv_plane_check_rotation (plane_state); +if (ret) +return ret; + + ret =intel_atomic_plane_check_clipping (plane_state, crtc_state, +DRM_PLANE_HELPER_NO_SCALING , +DRM_PLANE_HELPER_NO_SCALING , +i9xx_plane_has_windowing (plane)); +if (ret) +return ret; + + ret =i9xx_check_plane_surface (plane_state); +if (ret) +return ret; + +if (!plane_state->uapi.visible) +return 0 ; + + ret =intel_plane_check_src_coordinates (plane_state); +if (ret) +return ret; + + plane_state->ctl =i9xx_plane_ctl (crtc_state, plane_state); + +return 0 ; +} + +static u32 i9xx_plane_ctl_crtc (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); +u32 dspcntr =0 ; + +if (crtc_state->gamma_enable) + dspcntr |=DISPPLANE_GAMMA_ENABLE ; + +if (crtc_state->csc_enable) + dspcntr |=DISPPLANE_PIPE_CSC_ENABLE ; + +if (INTEL_GEN (dev_priv) <5 ) + dspcntr |=DISPPLANE_SEL_PIPE (crtc->pipe); + +return dspcntr; +} + +static void i9xx_plane_ratio (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state, +unsigned int *num,unsigned int *den) +{ +const struct drm_framebuffer *fb = plane_state->hw.fb; +unsigned int cpp = fb->format->cpp[0 ]; + +/* +* g4x bspec says 64bpp pixel rate can't exceed 80% +* of cdclk when the sprite plane is enabled on the +* same pipe. ilk/snb bspec says 64bpp pixel rate is +* never allowed to exceed 80% of cdclk. Let's just go +* with the ilk/snb limit always. +*/ +if (cpp ==8 ) { + *num =10 ; + *den =8 ; + }else { + *num =1 ; + *den =1 ; + } +} + +static int i9xx_plane_min_cdclk (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +unsigned int pixel_rate; +unsigned int num, den; + +/* +* Note that crtc_state->pixel_rate accounts for both +* horizontal and vertical panel fitter downscaling factors. +* Pre-HSW bspec tells us to only consider the horizontal +* downscaling factor here. We ignore that and just consider +* both for simplicity. +*/ + pixel_rate = crtc_state->pixel_rate; + +i9xx_plane_ratio (crtc_state, plane_state, &num, &den); + +/* two pixels per clock with double wide pipe */ +if (crtc_state->double_wide) + den *=2 ; + +return DIV_ROUND_UP (pixel_rate * num, den); +} + +static void i9xx_update_plane (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; +u32 linear_offset; +int x = plane_state->color_plane[0 ].x; +int y = plane_state->color_plane[0 ].y; +int crtc_x = plane_state->uapi.dst.x1; +int crtc_y = plane_state->uapi.dst.y1; +int crtc_w =drm_rect_width (&plane_state->uapi.dst); +int crtc_h =drm_rect_height (&plane_state->uapi.dst); +unsigned long irqflags; +u32 dspaddr_offset; +u32 dspcntr; + + dspcntr = plane_state->ctl |i9xx_plane_ctl_crtc (crtc_state); + + linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); + +if (INTEL_GEN (dev_priv) >=4 ) + dspaddr_offset = plane_state->color_plane[0 ].offset; +else + dspaddr_offset = linear_offset; + +spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); + +intel_de_write_fw (dev_priv,DSPSTRIDE (i9xx_plane), + plane_state->color_plane[0 ].stride); + +if (INTEL_GEN (dev_priv) <4 ) { +/* +* PLANE_A doesn't actually have a full window +* generator but let's assume we still need to +* program whatever is there. +*/ +intel_de_write_fw (dev_priv,DSPPOS (i9xx_plane), + (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,DSPSIZE (i9xx_plane), + ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); + }else if (IS_CHERRYVIEW (dev_priv) && i9xx_plane ==PLANE_B ) { +intel_de_write_fw (dev_priv,PRIMPOS (i9xx_plane), + (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,PRIMSIZE (i9xx_plane), + ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); +intel_de_write_fw (dev_priv,PRIMCNSTALPHA (i9xx_plane),0 ); + } + +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { +intel_de_write_fw (dev_priv,DSPOFFSET (i9xx_plane), + (y <<16 ) | x); + }else if (INTEL_GEN (dev_priv) >=4 ) { +intel_de_write_fw (dev_priv,DSPLINOFF (i9xx_plane), + linear_offset); +intel_de_write_fw (dev_priv,DSPTILEOFF (i9xx_plane), + (y <<16 ) | x); + } + +/* +* The control register self-arms if the plane was previously +* disabled. Try to make the plane enable atomic by writing +* the control register just before the surface register. +*/ +intel_de_write_fw (dev_priv,DSPCNTR (i9xx_plane), dspcntr); +if (INTEL_GEN (dev_priv) >=4 ) +intel_de_write_fw (dev_priv,DSPSURF (i9xx_plane), +intel_plane_ggtt_offset (plane_state) + dspaddr_offset); +else +intel_de_write_fw (dev_priv,DSPADDR (i9xx_plane), +intel_plane_ggtt_offset (plane_state) + dspaddr_offset); + +spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +} + +static void i9xx_disable_plane (struct intel_plane *plane, +const struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; +unsigned long irqflags; +u32 dspcntr; + +/* +* DSPCNTR pipe gamma enable on g4x+ and pipe csc +* enable on ilk+ affect the pipe bottom color as +* well, so we must configure them even if the plane +* is disabled. +* +* On pre-g4x there is no way to gamma correct the +* pipe bottom color but we'll keep on doing this +* anyway so that the crtc state readout works correctly. +*/ + dspcntr =i9xx_plane_ctl_crtc (crtc_state); + +spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); + +intel_de_write_fw (dev_priv,DSPCNTR (i9xx_plane), dspcntr); +if (INTEL_GEN (dev_priv) >=4 ) +intel_de_write_fw (dev_priv,DSPSURF (i9xx_plane),0 ); +else +intel_de_write_fw (dev_priv,DSPADDR (i9xx_plane),0 ); + +spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); +} + +static bool i9xx_plane_get_hw_state (struct intel_plane *plane, +enum pipe *pipe) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); +enum intel_display_power_domain power_domain; +enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; +intel_wakeref_t wakeref; +bool ret; +u32 val; + +/* +* Not 100% correct for planes that can move between pipes, +* but that's only the case for gen2-4 which don't have any +* display power wells. +*/ + power_domain =POWER_DOMAIN_PIPE (plane->pipe); + wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain); +if (!wakeref) +return false; + + val =intel_de_read (dev_priv,DSPCNTR (i9xx_plane)); + + ret = val &DISPLAY_PLANE_ENABLE ; + +if (INTEL_GEN (dev_priv) >=5 ) + *pipe = plane->pipe; +else + *pipe = (val &DISPPLANE_SEL_PIPE_MASK ) >> +DISPPLANE_SEL_PIPE_SHIFT ; + +intel_display_power_put (dev_priv, power_domain, wakeref); + +return ret; +} + +unsigned int +i9xx_plane_max_stride (struct intel_plane *plane, +u32 pixel_format,u64 modifier, +unsigned int rotation) +{ +struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); + +if (!HAS_GMCH (dev_priv)) { +return 32 *1024 ; + }else if (INTEL_GEN (dev_priv) >=4 ) { +if (modifier ==I915_FORMAT_MOD_X_TILED ) +return 16 *1024 ; +else +return 32 *1024 ; + }else if (INTEL_GEN (dev_priv) >=3 ) { +if (modifier ==I915_FORMAT_MOD_X_TILED ) +return 8 *1024 ; +else +return 16 *1024 ; + }else { +if (plane->i9xx_plane ==PLANE_C ) +return 4 *1024 ; +else +return 8 *1024 ; + } +} + +static const struct drm_plane_funcs i965_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = intel_plane_destroy, + .atomic_duplicate_state = intel_plane_duplicate_state, + .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = i965_plane_format_mod_supported, +}; + +static const struct drm_plane_funcs i8xx_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = intel_plane_destroy, + .atomic_duplicate_state = intel_plane_duplicate_state, + .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = i8xx_plane_format_mod_supported, +}; + +static struct intel_plane * +intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) +{ +struct intel_plane *plane; +const struct drm_plane_funcs *plane_funcs; +unsigned int supported_rotations; +const u32 *formats; +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; + + plane->pipe = pipe; +/* +* On gen2/3 only plane A can do FBC, but the panel fitter and LVDS +* port is hooked to pipe B. Hence we want plane A feeding pipe B. +*/ +if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <4 && +INTEL_NUM_PIPES (dev_priv) ==2 ) + plane->i9xx_plane = (enum i9xx_plane_id ) !pipe; +else + plane->i9xx_plane = (enum i9xx_plane_id ) pipe; + plane->id =PLANE_PRIMARY ; + plane->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, plane->id); + + plane->has_fbc =i9xx_plane_has_fbc (dev_priv, plane->i9xx_plane); +if (plane->has_fbc) { +struct intel_fbc *fbc = &dev_priv->fbc; + + fbc->possible_framebuffer_bits |= plane->frontbuffer_bit; + } + +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { + formats = vlv_primary_formats; + num_formats =ARRAY_SIZE (vlv_primary_formats); + }else if (INTEL_GEN (dev_priv) >=4 ) { +/* +* WaFP16GammaEnabling:ivb +* "Workaround : When using the 64-bit format, the plane +* output on each color channel has one quarter amplitude. +* It can be brought up to full amplitude by using pipe +* gamma correction or pipe color space conversion to +* multiply the plane output by four." +* +* There is no dedicated plane gamma for the primary plane, +* and using the pipe gamma/csc could conflict with other +* planes, so we choose not to expose fp16 on IVB primary +* planes. HSW primary planes no longer have this problem. +*/ +if (IS_IVYBRIDGE (dev_priv)) { + formats = ivb_primary_formats; + num_formats =ARRAY_SIZE (ivb_primary_formats); + }else { + formats = i965_primary_formats; + num_formats =ARRAY_SIZE (i965_primary_formats); + } + }else { + formats = i8xx_primary_formats; + num_formats =ARRAY_SIZE (i8xx_primary_formats); + } + +if (INTEL_GEN (dev_priv) >=4 ) + plane_funcs = &i965_plane_funcs; +else + plane_funcs = &i8xx_plane_funcs; + +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + plane->min_cdclk = vlv_plane_min_cdclk; +else if (IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) + plane->min_cdclk = hsw_plane_min_cdclk; +else if (IS_IVYBRIDGE (dev_priv)) + plane->min_cdclk = ivb_plane_min_cdclk; +else + plane->min_cdclk = i9xx_plane_min_cdclk; + + plane->max_stride = i9xx_plane_max_stride; + plane->update_plane = i9xx_update_plane; + plane->disable_plane = i9xx_disable_plane; + plane->get_hw_state = i9xx_plane_get_hw_state; + plane->check_plane = i9xx_plane_check; + +if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) + ret =drm_universal_plane_init (&dev_priv->drm, &plane->base, +0 , plane_funcs, + formats, num_formats, + i9xx_format_modifiers, +DRM_PLANE_TYPE_PRIMARY , +"primary %c" ,pipe_name (pipe)); +else + ret =drm_universal_plane_init (&dev_priv->drm, &plane->base, +0 , plane_funcs, + formats, num_formats, + i9xx_format_modifiers, +DRM_PLANE_TYPE_PRIMARY , +"plane %c" , +plane_name (plane->i9xx_plane)); +if (ret) + goto fail; + +if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) { + supported_rotations = +DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180 | +DRM_MODE_REFLECT_X ; + }else if (INTEL_GEN (dev_priv) >=4 ) { + supported_rotations = +DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180 ; + }else { + supported_rotations =DRM_MODE_ROTATE_0 ; + } + +if (INTEL_GEN (dev_priv) >=4 ) +drm_plane_create_rotation_property (&plane->base, +DRM_MODE_ROTATE_0 , + supported_rotations); + + zpos =0 ; +drm_plane_create_zpos_immutable_property (&plane->base, zpos); + +drm_plane_helper_add (&plane->base, &intel_plane_helper_funcs); + +return plane; + +fail: +intel_plane_free (plane); + +return ERR_PTR (ret); +} + +static struct intel_crtc *intel_crtc_alloc (void ) +{ +struct intel_crtc_state *crtc_state; +struct intel_crtc *crtc; + + crtc =kzalloc (sizeof (*crtc),GFP_KERNEL ); +if (!crtc) +return ERR_PTR (-ENOMEM ); + + crtc_state =intel_crtc_state_alloc (crtc); +if (!crtc_state) { +kfree (crtc); +return ERR_PTR (-ENOMEM ); + } + + crtc->base.state = &crtc_state->uapi; + crtc->config = crtc_state; + +return crtc; +} + +static void intel_crtc_free (struct intel_crtc *crtc) +{ +intel_crtc_destroy_state (&crtc->base, crtc->base.state); +kfree (crtc); +} + +static void intel_crtc_destroy (struct drm_crtc *crtc) +{ +struct intel_crtc *intel_crtc =to_intel_crtc (crtc); + +drm_crtc_cleanup (crtc); +kfree (intel_crtc); +} + +static int intel_crtc_late_register (struct drm_crtc *crtc) +{ +intel_crtc_debugfs_add (crtc); +return 0 ; +} + +#define INTEL_CRTC_FUNCS \ + .gamma_set = drm_atomic_helper_legacy_gamma_set, \ + .set_config = drm_atomic_helper_set_config, \ + .destroy = intel_crtc_destroy, \ + .page_flip = drm_atomic_helper_page_flip, \ + .atomic_duplicate_state = intel_crtc_duplicate_state, \ + .atomic_destroy_state = intel_crtc_destroy_state, \ + .set_crc_source = intel_crtc_set_crc_source, \ + .verify_crc_source = intel_crtc_verify_crc_source, \ + .get_crc_sources = intel_crtc_get_crc_sources, \ + .late_register = intel_crtc_late_register + +static const struct drm_crtc_funcs bdw_crtc_funcs = { +INTEL_CRTC_FUNCS , + + .get_vblank_counter = g4x_get_vblank_counter, + .enable_vblank = bdw_enable_vblank, + .disable_vblank = bdw_disable_vblank, + .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, +}; + +static const struct drm_crtc_funcs ilk_crtc_funcs = { +INTEL_CRTC_FUNCS , + + .get_vblank_counter = g4x_get_vblank_counter, + .enable_vblank = ilk_enable_vblank, + .disable_vblank = ilk_disable_vblank, + .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, +}; + +static const struct drm_crtc_funcs g4x_crtc_funcs = { +INTEL_CRTC_FUNCS , + + .get_vblank_counter = g4x_get_vblank_counter, + .enable_vblank = i965_enable_vblank, + .disable_vblank = i965_disable_vblank, + .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, +}; + +static const struct drm_crtc_funcs i965_crtc_funcs = { +INTEL_CRTC_FUNCS , + + .get_vblank_counter = i915_get_vblank_counter, + .enable_vblank = i965_enable_vblank, + .disable_vblank = i965_disable_vblank, + .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, +}; + +static const struct drm_crtc_funcs i915gm_crtc_funcs = { +INTEL_CRTC_FUNCS , + + .get_vblank_counter = i915_get_vblank_counter, + .enable_vblank = i915gm_enable_vblank, + .disable_vblank = i915gm_disable_vblank, + .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, +}; + +static const struct drm_crtc_funcs i915_crtc_funcs = { +INTEL_CRTC_FUNCS , + + .get_vblank_counter = i915_get_vblank_counter, + .enable_vblank = i8xx_enable_vblank, + .disable_vblank = i8xx_disable_vblank, + .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, +}; + +static const struct drm_crtc_funcs i8xx_crtc_funcs = { +INTEL_CRTC_FUNCS , + +/* no hw vblank counter */ + .enable_vblank = i8xx_enable_vblank, + .disable_vblank = i8xx_disable_vblank, + .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, +}; + +int intel_crtc_init (struct drm_i915_private *dev_priv,enum pipe pipe) +{ +struct intel_plane *primary, *cursor; +const struct drm_crtc_funcs *funcs; +struct intel_crtc *crtc; +int sprite, ret; + + crtc =intel_crtc_alloc (); +if (IS_ERR (crtc)) +return PTR_ERR (crtc); + + crtc->pipe = pipe; + crtc->num_scalers =RUNTIME_INFO (dev_priv)->num_scalers[pipe]; + + primary =intel_primary_plane_create (dev_priv, pipe); +if (IS_ERR (primary)) { + ret =PTR_ERR (primary); + goto fail; + } + crtc->plane_ids_mask |=BIT (primary->id); + +for_each_sprite (dev_priv, pipe, sprite) { +struct intel_plane *plane; + + plane =intel_sprite_plane_create (dev_priv, pipe, sprite); +if (IS_ERR (plane)) { + ret =PTR_ERR (plane); + goto fail; + } + crtc->plane_ids_mask |=BIT (plane->id); + } + + cursor =intel_cursor_plane_create (dev_priv, pipe); +if (IS_ERR (cursor)) { + ret =PTR_ERR (cursor); + goto fail; + } + crtc->plane_ids_mask |=BIT (cursor->id); + +if (HAS_GMCH (dev_priv)) { +if (IS_CHERRYVIEW (dev_priv) || +IS_VALLEYVIEW (dev_priv) ||IS_G4X (dev_priv)) + funcs = &g4x_crtc_funcs; +else if (IS_GEN (dev_priv,4 )) + funcs = &i965_crtc_funcs; +else if (IS_I945GM (dev_priv) ||IS_I915GM (dev_priv)) + funcs = &i915gm_crtc_funcs; +else if (IS_GEN (dev_priv,3 )) + funcs = &i915_crtc_funcs; +else + funcs = &i8xx_crtc_funcs; + }else { +if (INTEL_GEN (dev_priv) >=8 ) + funcs = &bdw_crtc_funcs; +else + funcs = &ilk_crtc_funcs; + } + + ret =drm_crtc_init_with_planes (&dev_priv->drm, &crtc->base, + &primary->base, &cursor->base, + funcs,"pipe %c" ,pipe_name (pipe)); +if (ret) + goto fail; + +BUG_ON (pipe >=ARRAY_SIZE (dev_priv->pipe_to_crtc_mapping) || + dev_priv->pipe_to_crtc_mapping[pipe] !=NULL ); + dev_priv->pipe_to_crtc_mapping[pipe] = crtc; + +if (INTEL_GEN (dev_priv) <9 ) { +enum i9xx_plane_id i9xx_plane = primary->i9xx_plane; + +BUG_ON (i9xx_plane >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || + dev_priv->plane_to_crtc_mapping[i9xx_plane] !=NULL ); + dev_priv->plane_to_crtc_mapping[i9xx_plane] = crtc; + } + +if (INTEL_GEN (dev_priv) >=10 ) +drm_crtc_create_scaling_filter_property (&crtc->base, +BIT (DRM_SCALING_FILTER_DEFAULT ) | +BIT (DRM_SCALING_FILTER_NEAREST_NEIGHBOR )); + +intel_color_init (crtc); + +intel_crtc_crc_init (crtc); + +drm_WARN_ON (&dev_priv->drm,drm_crtc_index (&crtc->base) != crtc->pipe); + +return 0 ; + +fail: +intel_crtc_free (crtc); + +return ret; +}drivers/gpu/drm/i915/display/intel_crtc.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_CRTC_H_ +#define _INTEL_CRTC_H_ + +#include "intel_display.h" + +struct intel_crtc_state ; + +u32 intel_crtc_max_vblank_count (const struct intel_crtc_state *crtc_state); +int intel_crtc_init (struct drm_i915_private *dev_priv,enum pipe pipe); +struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc); +void intel_crtc_state_reset (struct intel_crtc_state *crtc_state, +struct intel_crtc *crtc); + + +#endif drivers/gpu/drm/i915/display/intel_display.c +1
-933@@ -68,8 +68,8 @@#include "intel_bw.h" #include "intel_cdclk.h" #include "intel_color.h" +#include "intel_crtc.h" #include "intel_csr.h" -#include "intel_cursor.h" #include "intel_display_types.h" #include "intel_dp_link_training.h" #include "intel_fbc.h" @@ -88,56 +88,6 @@#include "intel_tc.h" #include "intel_vga.h" -/* Primary plane formats for gen <= 3 */ -static const u32 i8xx_primary_formats[] = { -DRM_FORMAT_C8 , -DRM_FORMAT_XRGB1555 , -DRM_FORMAT_RGB565 , -DRM_FORMAT_XRGB8888 , -}; - -/* Primary plane formats for ivb (no fp16 due to hw issue) */ -static const u32 ivb_primary_formats[] = { -DRM_FORMAT_C8 , -DRM_FORMAT_RGB565 , -DRM_FORMAT_XRGB8888 , -DRM_FORMAT_XBGR8888 , -DRM_FORMAT_XRGB2101010 , -DRM_FORMAT_XBGR2101010 , -}; - -/* Primary plane formats for gen >= 4, except ivb */ -static const u32 i965_primary_formats[] = { -DRM_FORMAT_C8 , -DRM_FORMAT_RGB565 , -DRM_FORMAT_XRGB8888 , -DRM_FORMAT_XBGR8888 , -DRM_FORMAT_XRGB2101010 , -DRM_FORMAT_XBGR2101010 , -DRM_FORMAT_XBGR16161616F , -}; - -/* Primary plane formats for vlv/chv */ -static const u32 vlv_primary_formats[] = { -DRM_FORMAT_C8 , -DRM_FORMAT_RGB565 , -DRM_FORMAT_XRGB8888 , -DRM_FORMAT_XBGR8888 , -DRM_FORMAT_ARGB8888 , -DRM_FORMAT_ABGR8888 , -DRM_FORMAT_XRGB2101010 , -DRM_FORMAT_XBGR2101010 , -DRM_FORMAT_ARGB2101010 , -DRM_FORMAT_ABGR2101010 , -DRM_FORMAT_XBGR16161616F , -}; - -static const u64 i9xx_format_modifiers[] = { -I915_FORMAT_MOD_X_TILED , -DRM_FORMAT_MOD_LINEAR , -DRM_FORMAT_MOD_INVALID -}; -static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ilk_pch_clock_get(struct intel_crtc *crtc,@@ -163,7 +113,6 @@ static void skl_pfit_enable(const struct intel_crtc_state *crtc_state);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); -static struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc); struct intel_limit { struct {@@ -1302,12 +1251,6 @@ static void assert_planes_disabled(struct intel_crtc *crtc)assert_plane_disabled (plane); } -static void assert_vblank_disabled (struct drm_crtc *crtc) -{ -if (I915_STATE_WARN_ON (drm_crtc_vblank_get (crtc) ==0 )) -drm_crtc_vblank_put (crtc); -} -void assert_pch_transcoder_disabled (struct drm_i915_private *dev_priv,enum pipe pipe) {@@ -1792,55 +1735,6 @@ enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc)return crtc->pipe; } -static u32 intel_crtc_max_vblank_count (const struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -u32 mode_flags = crtc->mode_flags; - -/* -* From Gen 11, In case of dsi cmd mode, frame counter wouldnt -* have updated at the beginning of TE, if we want to use -* the hw counter, then we would find it updated in only -* the next TE, hence switching to sw counter. -*/ -if (mode_flags & (I915_MODE_FLAG_DSI_USE_TE0 |I915_MODE_FLAG_DSI_USE_TE1 )) -return 0 ; - -/* -* On i965gm the hardware frame counter reads -* zero when the TV encoder is enabled :( -*/ -if (IS_I965GM (dev_priv) && - (crtc_state->output_types &BIT (INTEL_OUTPUT_TVOUT ))) -return 0 ; - -if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) -return 0xffffffff ;/* full 32 bit counter */ -else if (INTEL_GEN (dev_priv) >=3 ) -return 0xffffff ;/* only 24 bits of frame count */ -else -return 0 ;/* Gen2 doesn't have a hardware frame counter */ -} - -void intel_crtc_vblank_on (const struct intel_crtc_state *crtc_state) -{ -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); - -assert_vblank_disabled (&crtc->base); -drm_crtc_set_max_vblank_count (&crtc->base, -intel_crtc_max_vblank_count (crtc_state)); -drm_crtc_vblank_on (&crtc->base); -} - -void intel_crtc_vblank_off (const struct intel_crtc_state *crtc_state) -{ -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); - -drm_crtc_vblank_off (&crtc->base); -assert_vblank_disabled (&crtc->base); -} -void intel_enable_pipe (const struct intel_crtc_state *new_crtc_state) {struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);@@ -4047,171 +3941,6 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state)return 0 ; } -static void i9xx_plane_ratio (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state, -unsigned int *num,unsigned int *den) -{ -const struct drm_framebuffer *fb = plane_state->hw.fb; -unsigned int cpp = fb->format->cpp[0 ]; - -/* -* g4x bspec says 64bpp pixel rate can't exceed 80% -* of cdclk when the sprite plane is enabled on the -* same pipe. ilk/snb bspec says 64bpp pixel rate is -* never allowed to exceed 80% of cdclk. Let's just go -* with the ilk/snb limit always. -*/ -if (cpp ==8 ) { - *num =10 ; - *den =8 ; - }else { - *num =1 ; - *den =1 ; - } -} - -static int i9xx_plane_min_cdclk (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -unsigned int pixel_rate; -unsigned int num, den; - -/* -* Note that crtc_state->pixel_rate accounts for both -* horizontal and vertical panel fitter downscaling factors. -* Pre-HSW bspec tells us to only consider the horizontal -* downscaling factor here. We ignore that and just consider -* both for simplicity. -*/ - pixel_rate = crtc_state->pixel_rate; - -i9xx_plane_ratio (crtc_state, plane_state, &num, &den); - -/* two pixels per clock with double wide pipe */ -if (crtc_state->double_wide) - den *=2 ; - -return DIV_ROUND_UP (pixel_rate * num, den); -} - -unsigned int -i9xx_plane_max_stride (struct intel_plane *plane, -u32 pixel_format,u64 modifier, -unsigned int rotation) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); - -if (!HAS_GMCH (dev_priv)) { -return 32 *1024 ; - }else if (INTEL_GEN (dev_priv) >=4 ) { -if (modifier ==I915_FORMAT_MOD_X_TILED ) -return 16 *1024 ; -else -return 32 *1024 ; - }else if (INTEL_GEN (dev_priv) >=3 ) { -if (modifier ==I915_FORMAT_MOD_X_TILED ) -return 8 *1024 ; -else -return 16 *1024 ; - }else { -if (plane->i9xx_plane ==PLANE_C ) -return 4 *1024 ; -else -return 8 *1024 ; - } -} - -static u32 i9xx_plane_ctl_crtc (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); -u32 dspcntr =0 ; - -if (crtc_state->gamma_enable) - dspcntr |=DISPPLANE_GAMMA_ENABLE ; - -if (crtc_state->csc_enable) - dspcntr |=DISPPLANE_PIPE_CSC_ENABLE ; - -if (INTEL_GEN (dev_priv) <5 ) - dspcntr |=DISPPLANE_SEL_PIPE (crtc->pipe); - -return dspcntr; -} - -static u32 i9xx_plane_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv = -to_i915 (plane_state->uapi.plane->dev); -const struct drm_framebuffer *fb = plane_state->hw.fb; -unsigned int rotation = plane_state->hw.rotation; -u32 dspcntr; - - dspcntr =DISPLAY_PLANE_ENABLE ; - -if (IS_G4X (dev_priv) ||IS_GEN (dev_priv,5 ) || -IS_GEN (dev_priv,6 ) ||IS_IVYBRIDGE (dev_priv)) - dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ; - -switch (fb->format->format) { -case DRM_FORMAT_C8 : - dspcntr |=DISPPLANE_8BPP ; -break ; -case DRM_FORMAT_XRGB1555 : - dspcntr |=DISPPLANE_BGRX555 ; -break ; -case DRM_FORMAT_ARGB1555 : - dspcntr |=DISPPLANE_BGRA555 ; -break ; -case DRM_FORMAT_RGB565 : - dspcntr |=DISPPLANE_BGRX565 ; -break ; -case DRM_FORMAT_XRGB8888 : - dspcntr |=DISPPLANE_BGRX888 ; -break ; -case DRM_FORMAT_XBGR8888 : - dspcntr |=DISPPLANE_RGBX888 ; -break ; -case DRM_FORMAT_ARGB8888 : - dspcntr |=DISPPLANE_BGRA888 ; -break ; -case DRM_FORMAT_ABGR8888 : - dspcntr |=DISPPLANE_RGBA888 ; -break ; -case DRM_FORMAT_XRGB2101010 : - dspcntr |=DISPPLANE_BGRX101010 ; -break ; -case DRM_FORMAT_XBGR2101010 : - dspcntr |=DISPPLANE_RGBX101010 ; -break ; -case DRM_FORMAT_ARGB2101010 : - dspcntr |=DISPPLANE_BGRA101010 ; -break ; -case DRM_FORMAT_ABGR2101010 : - dspcntr |=DISPPLANE_RGBA101010 ; -break ; -case DRM_FORMAT_XBGR16161616F : - dspcntr |=DISPPLANE_RGBX161616 ; -break ; -default : -MISSING_CASE (fb->format->format); -return 0 ; - } - -if (INTEL_GEN (dev_priv) >=4 && - fb->modifier ==I915_FORMAT_MOD_X_TILED ) - dspcntr |=DISPPLANE_TILED ; - -if (rotation &DRM_MODE_ROTATE_180 ) - dspcntr |=DISPPLANE_ROTATE_180 ; - -if (rotation &DRM_MODE_REFLECT_X ) - dspcntr |=DISPPLANE_MIRROR ; - -return dspcntr; -} -int i9xx_check_plane_surface (struct intel_plane_state *plane_state) { struct drm_i915_private *dev_priv =@@ -4272,197 +4001,6 @@ int i9xx_check_plane_surface(struct intel_plane_state *plane_state)return 0 ; } -static bool i9xx_plane_has_windowing (struct intel_plane *plane) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; - -if (IS_CHERRYVIEW (dev_priv)) -return i9xx_plane ==PLANE_B ; -else if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) -return false; -else if (IS_GEN (dev_priv,4 )) -return i9xx_plane ==PLANE_C ; -else -return i9xx_plane ==PLANE_B || - i9xx_plane ==PLANE_C ; -} - -static int -i9xx_plane_check (struct intel_crtc_state *crtc_state, -struct intel_plane_state *plane_state) -{ -struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane); -int ret; - - ret =chv_plane_check_rotation (plane_state); -if (ret) -return ret; - - ret =intel_atomic_plane_check_clipping (plane_state, crtc_state, -DRM_PLANE_HELPER_NO_SCALING , -DRM_PLANE_HELPER_NO_SCALING , -i9xx_plane_has_windowing (plane)); -if (ret) -return ret; - - ret =i9xx_check_plane_surface (plane_state); -if (ret) -return ret; - -if (!plane_state->uapi.visible) -return 0 ; - - ret =intel_plane_check_src_coordinates (plane_state); -if (ret) -return ret; - - plane_state->ctl =i9xx_plane_ctl (crtc_state, plane_state); - -return 0 ; -} - -static void i9xx_update_plane (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; -u32 linear_offset; -int x = plane_state->color_plane[0 ].x; -int y = plane_state->color_plane[0 ].y; -int crtc_x = plane_state->uapi.dst.x1; -int crtc_y = plane_state->uapi.dst.y1; -int crtc_w =drm_rect_width (&plane_state->uapi.dst); -int crtc_h =drm_rect_height (&plane_state->uapi.dst); -unsigned long irqflags; -u32 dspaddr_offset; -u32 dspcntr; - - dspcntr = plane_state->ctl |i9xx_plane_ctl_crtc (crtc_state); - - linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); - -if (INTEL_GEN (dev_priv) >=4 ) - dspaddr_offset = plane_state->color_plane[0 ].offset; -else - dspaddr_offset = linear_offset; - -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); - -intel_de_write_fw (dev_priv,DSPSTRIDE (i9xx_plane), - plane_state->color_plane[0 ].stride); - -if (INTEL_GEN (dev_priv) <4 ) { -/* -* PLANE_A doesn't actually have a full window -* generator but let's assume we still need to -* program whatever is there. -*/ -intel_de_write_fw (dev_priv,DSPPOS (i9xx_plane), - (crtc_y <<16 ) | crtc_x); -intel_de_write_fw (dev_priv,DSPSIZE (i9xx_plane), - ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); - }else if (IS_CHERRYVIEW (dev_priv) && i9xx_plane ==PLANE_B ) { -intel_de_write_fw (dev_priv,PRIMPOS (i9xx_plane), - (crtc_y <<16 ) | crtc_x); -intel_de_write_fw (dev_priv,PRIMSIZE (i9xx_plane), - ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); -intel_de_write_fw (dev_priv,PRIMCNSTALPHA (i9xx_plane),0 ); - } - -if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { -intel_de_write_fw (dev_priv,DSPOFFSET (i9xx_plane), - (y <<16 ) | x); - }else if (INTEL_GEN (dev_priv) >=4 ) { -intel_de_write_fw (dev_priv,DSPLINOFF (i9xx_plane), - linear_offset); -intel_de_write_fw (dev_priv,DSPTILEOFF (i9xx_plane), - (y <<16 ) | x); - } - -/* -* The control register self-arms if the plane was previously -* disabled. Try to make the plane enable atomic by writing -* the control register just before the surface register. -*/ -intel_de_write_fw (dev_priv,DSPCNTR (i9xx_plane), dspcntr); -if (INTEL_GEN (dev_priv) >=4 ) -intel_de_write_fw (dev_priv,DSPSURF (i9xx_plane), -intel_plane_ggtt_offset (plane_state) + dspaddr_offset); -else -intel_de_write_fw (dev_priv,DSPADDR (i9xx_plane), -intel_plane_ggtt_offset (plane_state) + dspaddr_offset); - -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); -} - -static void i9xx_disable_plane (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; -unsigned long irqflags; -u32 dspcntr; - -/* -* DSPCNTR pipe gamma enable on g4x+ and pipe csc -* enable on ilk+ affect the pipe bottom color as -* well, so we must configure them even if the plane -* is disabled. -* -* On pre-g4x there is no way to gamma correct the -* pipe bottom color but we'll keep on doing this -* anyway so that the crtc state readout works correctly. -*/ - dspcntr =i9xx_plane_ctl_crtc (crtc_state); - -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); - -intel_de_write_fw (dev_priv,DSPCNTR (i9xx_plane), dspcntr); -if (INTEL_GEN (dev_priv) >=4 ) -intel_de_write_fw (dev_priv,DSPSURF (i9xx_plane),0 ); -else -intel_de_write_fw (dev_priv,DSPADDR (i9xx_plane),0 ); - -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); -} - -static bool i9xx_plane_get_hw_state (struct intel_plane *plane, -enum pipe *pipe) -{ -struct drm_i915_private *dev_priv =to_i915 (plane->base.dev); -enum intel_display_power_domain power_domain; -enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; -intel_wakeref_t wakeref; -bool ret; -u32 val; - -/* -* Not 100% correct for planes that can move between pipes, -* but that's only the case for gen2-4 which don't have any -* display power wells. -*/ - power_domain =POWER_DOMAIN_PIPE (plane->pipe); - wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain); -if (!wakeref) -return false; - - val =intel_de_read (dev_priv,DSPCNTR (i9xx_plane)); - - ret = val &DISPLAY_PLANE_ENABLE ; - -if (INTEL_GEN (dev_priv) >=5 ) - *pipe = plane->pipe; -else - *pipe = (val &DISPPLANE_SEL_PIPE_MASK ) >> -DISPPLANE_SEL_PIPE_SHIFT ; - -intel_display_power_put (dev_priv, power_domain, wakeref); - -return ret; -} -static void skl_detach_scaler (struct intel_crtc *intel_crtc,int id) {struct drm_device *dev = intel_crtc->base.dev;@@ -11909,33 +11447,6 @@ static void ilk_pch_clock_get(struct intel_crtc *crtc, &pipe_config->fdi_m_n); } -static void intel_crtc_state_reset (struct intel_crtc_state *crtc_state, -struct intel_crtc *crtc) -{ -memset (crtc_state,0 ,sizeof (*crtc_state)); - -__drm_atomic_helper_crtc_state_reset (&crtc_state->uapi, &crtc->base); - - crtc_state->cpu_transcoder =INVALID_TRANSCODER ; - crtc_state->master_transcoder =INVALID_TRANSCODER ; - crtc_state->hsw_workaround_pipe =INVALID_PIPE ; - crtc_state->output_format =INTEL_OUTPUT_FORMAT_INVALID ; - crtc_state->scaler_state.scaler_id =-1 ; - crtc_state->mst_master_transcoder =INVALID_TRANSCODER ; -} - -static struct intel_crtc_state *intel_crtc_state_alloc (struct intel_crtc *crtc) -{ -struct intel_crtc_state *crtc_state; - - crtc_state =kmalloc (sizeof (*crtc_state),GFP_KERNEL ); - -if (crtc_state) -intel_crtc_state_reset (crtc_state, crtc); - -return crtc_state; -} -/* Returns the currently programmed mode of the given encoder. */ struct drm_display_mode *intel_encoder_current_mode (struct intel_encoder *encoder)@@ -11976,14 +11487,6 @@ intel_encoder_current_mode(struct intel_encoder *encoder)return mode; } -static void intel_crtc_destroy (struct drm_crtc *crtc) -{ -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); - -drm_crtc_cleanup (crtc); -kfree (intel_crtc); -} -/** * intel_wm_need_update - Check whether watermarks need updating * @cur: current plane state @@ -15187,17 +14690,6 @@ static int intel_atomic_prepare_commit(struct intel_atomic_state *state)return 0 ; } -u32 intel_crtc_get_vblank_counter (struct intel_crtc *crtc) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index (&crtc->base)]; - -if (!vblank->max_vblank_count) -return (u32 )drm_crtc_accurate_vblank_count (&crtc->base); - -return crtc->base.funcs->get_vblank_counter (&crtc->base); -} -void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state) {@@ -16250,336 +15742,6 @@ void intel_plane_destroy(struct drm_plane *plane)kfree (to_intel_plane (plane)); } -static bool i8xx_plane_format_mod_supported (struct drm_plane *_plane, -u32 format,u64 modifier) -{ -switch (modifier) { -case DRM_FORMAT_MOD_LINEAR : -case I915_FORMAT_MOD_X_TILED : -break ; -default : -return false; - } - -switch (format) { -case DRM_FORMAT_C8 : -case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB1555 : -case DRM_FORMAT_XRGB8888 : -return modifier ==DRM_FORMAT_MOD_LINEAR || - modifier ==I915_FORMAT_MOD_X_TILED ; -default : -return false; - } -} - -static bool i965_plane_format_mod_supported (struct drm_plane *_plane, -u32 format,u64 modifier) -{ -switch (modifier) { -case DRM_FORMAT_MOD_LINEAR : -case I915_FORMAT_MOD_X_TILED : -break ; -default : -return false; - } - -switch (format) { -case DRM_FORMAT_C8 : -case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB8888 : -case DRM_FORMAT_XBGR8888 : -case DRM_FORMAT_ARGB8888 : -case DRM_FORMAT_ABGR8888 : -case DRM_FORMAT_XRGB2101010 : -case DRM_FORMAT_XBGR2101010 : -case DRM_FORMAT_ARGB2101010 : -case DRM_FORMAT_ABGR2101010 : -case DRM_FORMAT_XBGR16161616F : -return modifier ==DRM_FORMAT_MOD_LINEAR || - modifier ==I915_FORMAT_MOD_X_TILED ; -default : -return false; - } -} - -static const struct drm_plane_funcs i965_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, - .format_mod_supported = i965_plane_format_mod_supported, -}; - -static const struct drm_plane_funcs i8xx_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, - .format_mod_supported = i8xx_plane_format_mod_supported, -}; - -static bool i9xx_plane_has_fbc (struct drm_i915_private *dev_priv, -enum i9xx_plane_id i9xx_plane) -{ -if (!HAS_FBC (dev_priv)) -return false; - -if (IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) -return i9xx_plane ==PLANE_A ;/* tied to pipe A */ -else if (IS_IVYBRIDGE (dev_priv)) -return i9xx_plane ==PLANE_A || i9xx_plane ==PLANE_B || - i9xx_plane ==PLANE_C ; -else if (INTEL_GEN (dev_priv) >=4 ) -return i9xx_plane ==PLANE_A || i9xx_plane ==PLANE_B ; -else -return i9xx_plane ==PLANE_A ; -} - -static struct intel_plane * -intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) -{ -struct intel_plane *plane; -const struct drm_plane_funcs *plane_funcs; -unsigned int supported_rotations; -const u32 *formats; -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; - - plane->pipe = pipe; -/* -* On gen2/3 only plane A can do FBC, but the panel fitter and LVDS -* port is hooked to pipe B. Hence we want plane A feeding pipe B. -*/ -if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <4 && -INTEL_NUM_PIPES (dev_priv) ==2 ) - plane->i9xx_plane = (enum i9xx_plane_id ) !pipe; -else - plane->i9xx_plane = (enum i9xx_plane_id ) pipe; - plane->id =PLANE_PRIMARY ; - plane->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, plane->id); - - plane->has_fbc =i9xx_plane_has_fbc (dev_priv, plane->i9xx_plane); -if (plane->has_fbc) { -struct intel_fbc *fbc = &dev_priv->fbc; - - fbc->possible_framebuffer_bits |= plane->frontbuffer_bit; - } - -if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { - formats = vlv_primary_formats; - num_formats =ARRAY_SIZE (vlv_primary_formats); - }else if (INTEL_GEN (dev_priv) >=4 ) { -/* -* WaFP16GammaEnabling:ivb -* "Workaround : When using the 64-bit format, the plane -* output on each color channel has one quarter amplitude. -* It can be brought up to full amplitude by using pipe -* gamma correction or pipe color space conversion to -* multiply the plane output by four." -* -* There is no dedicated plane gamma for the primary plane, -* and using the pipe gamma/csc could conflict with other -* planes, so we choose not to expose fp16 on IVB primary -* planes. HSW primary planes no longer have this problem. -*/ -if (IS_IVYBRIDGE (dev_priv)) { - formats = ivb_primary_formats; - num_formats =ARRAY_SIZE (ivb_primary_formats); - }else { - formats = i965_primary_formats; - num_formats =ARRAY_SIZE (i965_primary_formats); - } - }else { - formats = i8xx_primary_formats; - num_formats =ARRAY_SIZE (i8xx_primary_formats); - } - -if (INTEL_GEN (dev_priv) >=4 ) - plane_funcs = &i965_plane_funcs; -else - plane_funcs = &i8xx_plane_funcs; - -if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) - plane->min_cdclk = vlv_plane_min_cdclk; -else if (IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) - plane->min_cdclk = hsw_plane_min_cdclk; -else if (IS_IVYBRIDGE (dev_priv)) - plane->min_cdclk = ivb_plane_min_cdclk; -else - plane->min_cdclk = i9xx_plane_min_cdclk; - - plane->max_stride = i9xx_plane_max_stride; - plane->update_plane = i9xx_update_plane; - plane->disable_plane = i9xx_disable_plane; - plane->get_hw_state = i9xx_plane_get_hw_state; - plane->check_plane = i9xx_plane_check; - -if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) - ret =drm_universal_plane_init (&dev_priv->drm, &plane->base, -0 , plane_funcs, - formats, num_formats, - i9xx_format_modifiers, -DRM_PLANE_TYPE_PRIMARY , -"primary %c" ,pipe_name (pipe)); -else - ret =drm_universal_plane_init (&dev_priv->drm, &plane->base, -0 , plane_funcs, - formats, num_formats, - i9xx_format_modifiers, -DRM_PLANE_TYPE_PRIMARY , -"plane %c" , -plane_name (plane->i9xx_plane)); -if (ret) - goto fail; - -if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) { - supported_rotations = -DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180 | -DRM_MODE_REFLECT_X ; - }else if (INTEL_GEN (dev_priv) >=4 ) { - supported_rotations = -DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180 ; - }else { - supported_rotations =DRM_MODE_ROTATE_0 ; - } - -if (INTEL_GEN (dev_priv) >=4 ) -drm_plane_create_rotation_property (&plane->base, -DRM_MODE_ROTATE_0 , - supported_rotations); - - zpos =0 ; -drm_plane_create_zpos_immutable_property (&plane->base, zpos); - -drm_plane_helper_add (&plane->base, &intel_plane_helper_funcs); - -return plane; - -fail: -intel_plane_free (plane); - -return ERR_PTR (ret); -} - -static int intel_crtc_late_register (struct drm_crtc *crtc) -{ -intel_crtc_debugfs_add (crtc); -return 0 ; -} - -#define INTEL_CRTC_FUNCS \ - .gamma_set = drm_atomic_helper_legacy_gamma_set, \ - .set_config = drm_atomic_helper_set_config, \ - .destroy = intel_crtc_destroy, \ - .page_flip = drm_atomic_helper_page_flip, \ - .atomic_duplicate_state = intel_crtc_duplicate_state, \ - .atomic_destroy_state = intel_crtc_destroy_state, \ - .set_crc_source = intel_crtc_set_crc_source, \ - .verify_crc_source = intel_crtc_verify_crc_source, \ - .get_crc_sources = intel_crtc_get_crc_sources, \ - .late_register = intel_crtc_late_register - -static const struct drm_crtc_funcs bdw_crtc_funcs = { -INTEL_CRTC_FUNCS , - - .get_vblank_counter = g4x_get_vblank_counter, - .enable_vblank = bdw_enable_vblank, - .disable_vblank = bdw_disable_vblank, - .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, -}; - -static const struct drm_crtc_funcs ilk_crtc_funcs = { -INTEL_CRTC_FUNCS , - - .get_vblank_counter = g4x_get_vblank_counter, - .enable_vblank = ilk_enable_vblank, - .disable_vblank = ilk_disable_vblank, - .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, -}; - -static const struct drm_crtc_funcs g4x_crtc_funcs = { -INTEL_CRTC_FUNCS , - - .get_vblank_counter = g4x_get_vblank_counter, - .enable_vblank = i965_enable_vblank, - .disable_vblank = i965_disable_vblank, - .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, -}; - -static const struct drm_crtc_funcs i965_crtc_funcs = { -INTEL_CRTC_FUNCS , - - .get_vblank_counter = i915_get_vblank_counter, - .enable_vblank = i965_enable_vblank, - .disable_vblank = i965_disable_vblank, - .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, -}; - -static const struct drm_crtc_funcs i915gm_crtc_funcs = { -INTEL_CRTC_FUNCS , - - .get_vblank_counter = i915_get_vblank_counter, - .enable_vblank = i915gm_enable_vblank, - .disable_vblank = i915gm_disable_vblank, - .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, -}; - -static const struct drm_crtc_funcs i915_crtc_funcs = { -INTEL_CRTC_FUNCS , - - .get_vblank_counter = i915_get_vblank_counter, - .enable_vblank = i8xx_enable_vblank, - .disable_vblank = i8xx_disable_vblank, - .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, -}; - -static const struct drm_crtc_funcs i8xx_crtc_funcs = { -INTEL_CRTC_FUNCS , - -/* no hw vblank counter */ - .enable_vblank = i8xx_enable_vblank, - .disable_vblank = i8xx_disable_vblank, - .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, -}; - -static struct intel_crtc *intel_crtc_alloc (void ) -{ -struct intel_crtc_state *crtc_state; -struct intel_crtc *crtc; - - crtc =kzalloc (sizeof (*crtc),GFP_KERNEL ); -if (!crtc) -return ERR_PTR (-ENOMEM ); - - crtc_state =intel_crtc_state_alloc (crtc); -if (!crtc_state) { -kfree (crtc); -return ERR_PTR (-ENOMEM ); - } - - crtc->base.state = &crtc_state->uapi; - crtc->config = crtc_state; - -return crtc; -} - -static void intel_crtc_free (struct intel_crtc *crtc) -{ -intel_crtc_destroy_state (&crtc->base, crtc->base.state); -kfree (crtc); -} -static void intel_plane_possible_crtcs_init (struct drm_i915_private *dev_priv) {struct intel_plane *plane;@@ -16592,100 +15754,6 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv) } } -static int intel_crtc_init (struct drm_i915_private *dev_priv,enum pipe pipe) -{ -struct intel_plane *primary, *cursor; -const struct drm_crtc_funcs *funcs; -struct intel_crtc *crtc; -int sprite, ret; - - crtc =intel_crtc_alloc (); -if (IS_ERR (crtc)) -return PTR_ERR (crtc); - - crtc->pipe = pipe; - crtc->num_scalers =RUNTIME_INFO (dev_priv)->num_scalers[pipe]; - - primary =intel_primary_plane_create (dev_priv, pipe); -if (IS_ERR (primary)) { - ret =PTR_ERR (primary); - goto fail; - } - crtc->plane_ids_mask |=BIT (primary->id); - -for_each_sprite (dev_priv, pipe, sprite) { -struct intel_plane *plane; - - plane =intel_sprite_plane_create (dev_priv, pipe, sprite); -if (IS_ERR (plane)) { - ret =PTR_ERR (plane); - goto fail; - } - crtc->plane_ids_mask |=BIT (plane->id); - } - - cursor =intel_cursor_plane_create (dev_priv, pipe); -if (IS_ERR (cursor)) { - ret =PTR_ERR (cursor); - goto fail; - } - crtc->plane_ids_mask |=BIT (cursor->id); - -if (HAS_GMCH (dev_priv)) { -if (IS_CHERRYVIEW (dev_priv) || -IS_VALLEYVIEW (dev_priv) ||IS_G4X (dev_priv)) - funcs = &g4x_crtc_funcs; -else if (IS_GEN (dev_priv,4 )) - funcs = &i965_crtc_funcs; -else if (IS_I945GM (dev_priv) ||IS_I915GM (dev_priv)) - funcs = &i915gm_crtc_funcs; -else if (IS_GEN (dev_priv,3 )) - funcs = &i915_crtc_funcs; -else - funcs = &i8xx_crtc_funcs; - }else { -if (INTEL_GEN (dev_priv) >=8 ) - funcs = &bdw_crtc_funcs; -else - funcs = &ilk_crtc_funcs; - } - - ret =drm_crtc_init_with_planes (&dev_priv->drm, &crtc->base, - &primary->base, &cursor->base, - funcs,"pipe %c" ,pipe_name (pipe)); -if (ret) - goto fail; - -BUG_ON (pipe >=ARRAY_SIZE (dev_priv->pipe_to_crtc_mapping) || - dev_priv->pipe_to_crtc_mapping[pipe] !=NULL ); - dev_priv->pipe_to_crtc_mapping[pipe] = crtc; - -if (INTEL_GEN (dev_priv) <9 ) { -enum i9xx_plane_id i9xx_plane = primary->i9xx_plane; - -BUG_ON (i9xx_plane >=ARRAY_SIZE (dev_priv->plane_to_crtc_mapping) || - dev_priv->plane_to_crtc_mapping[i9xx_plane] !=NULL ); - dev_priv->plane_to_crtc_mapping[i9xx_plane] = crtc; - } - -if (INTEL_GEN (dev_priv) >=10 ) -drm_crtc_create_scaling_filter_property (&crtc->base, -BIT (DRM_SCALING_FILTER_DEFAULT ) | -BIT (DRM_SCALING_FILTER_NEAREST_NEIGHBOR )); - -intel_color_init (crtc); - -intel_crtc_crc_init (crtc); - -drm_WARN_ON (&dev_priv->drm,drm_crtc_index (&crtc->base) != crtc->pipe); - -return 0 ; - -fail: -intel_crtc_free (crtc); - -return ret; -}int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file)
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 05/11] drm/i915: refactor some crtc code out of intel display.
Quoted 12 lines · Jani Nikula
Quoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
There may be more crtc code that can be pulled out, but this is a good start.
RFC: maybe call the new file something different
I checked this is just code movement. I did clean up
intel_crtc.hlocally a bit though. (I'll probably re-send the series with a few fixes to pass CI.)
Quoted 6 lines
I'm not averse to renaming the file later if needed, I'm more concerned about choosing a meaningful bunch of functions to take out and put in the new file.
Ville, I saw you had some comments about this - is this making sensible progress or making further refactoring harder?
Just means we have to move 90% of the proposed intel_crtc.c into i9xx_plane.c again. So the plane bits here are just pointless churn IMO.
Signature · 17 lines
Ville Syrjälä Intel --------------------------------------------------------------------- Intel Finland Oy Registered Address: PL 281, 00181 Helsinki Business Identity Code: 0357606 - 4 Domiciled in Helsinki This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 05/11] drm/i915: refactor some crtc code out of intel display.
Quoted 17 lines · Ville Syrjälä
Quoted 16 lines · Jani Nikula
Quoted 6 lines · Dave Airlie
From: Dave Airlie <[email protected]>
There may be more crtc code that can be pulled out, but this is a good start.
RFC: maybe call the new file something different
I checked this is just code movement. I did clean up
intel_crtc.hlocally a bit though. (I'll probably re-send the series with a few fixes to pass CI.)I'm not averse to renaming the file later if needed, I'm more concerned about choosing a meaningful bunch of functions to take out and put in the new file.
Quoted 6 lines
Quoted 2 lines
Ville, I saw you had some comments about this - is this making sensible progress or making further refactoring harder?
Just means we have to move 90% of the proposed
intel_crtc.cintoi9xx_plane.cagain. So the plane bits here are just pointless churn IMO.
Fair enough. I just don't want to stall on this again like we've stalled every time there's been proposals to clean up intel_display.c. And it's always about some things that could be moved to a different file or grouped differently or something. I'm pretty close to a point where I'll take *anything* to chop up the file, and then we'll have better clarity with smaller files when the dust settles.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 6/11 drm/i915: refactor pll code out into intel_dpll.c
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This pulls a large chunk of the pll calculation code out of intel_display.c to a new file.
One function makse sense to be an inline, otherwise this is pretty much a straight copy cover. also all the remaining hooks for g45 and older end up the same now.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 1394 +---------------- drivers/gpu/drm/i915/display/intel_display.h | 3 + .../drm/i915/display/intel_display_types.h | 5 + drivers/gpu/drm/i915/display/intel_dpll.c | 1371 ++++++++++++++++ drivers/gpu/drm/i915/display/intel_dpll.h | 22 + 6 files changed, 1413 insertions(+), 1383 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.c create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -202,6 +202,7 @@ i915-y += \ display/intel_display.o \ display/intel_display_power.o \ display/intel_dpio_phy.o \ + display/intel_dpll.o \ display/intel_dpll_mgr.o \ display/intel_dsb.o \ display/intel_fbc.o \
drivers/gpu/drm/i915/display/intel_display.c +11 -1383
1,492 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +3 -0
@@ -653,6 +653,9 @@ u32 intel_plane_compute_aligned_offset(int *x, int *y, int color_plane);int intel_plane_pin_fb (struct intel_plane_state *plane_state);void intel_plane_unpin_fb (struct intel_plane_state *old_plane_state); +struct intel_encoder * +intel_get_crtc_new_encoder (const struct intel_atomic_state *state, +const struct intel_crtc_state *crtc_state);/* modesetting */ void intel_modeset_init_hw (struct drm_i915_private *i915);
drivers/gpu/drm/i915/display/intel_display_types.h +5 -0
@@ -1811,4 +1811,9 @@ to_intel_frontbuffer(struct drm_framebuffer *fb) return fb ? to_intel_framebuffer(fb)->frontbuffer : NULL; } +static inline u32 i9xx_dpll_compute_fp (struct dpll *dpll) +{ +return dpll->n <<16 | dpll->m1 <<8 | dpll->m2; +} +#endif /* __INTEL_DISPLAY_TYPES_H__ */
drivers/gpu/drm/i915/display/intel_dpll.c new file +1371 -0
1,371 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dpll.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_DPLL_H_ +#define _INTEL_DPLL_H_ + +struct dpll ; +struct intel_crtc ; +struct intel_crtc_state ; + +void intel_dpll_init_clock_hook (struct drm_i915_private *dev_priv); +int vlv_calc_dpll_params (int refclk,struct dpll *clock); +int pnv_calc_dpll_params (int refclk,struct dpll *clock); +int i9xx_calc_dpll_params (int refclk,struct dpll *clock); +void vlv_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config); +void chv_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config); + +#endif
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 06/11] drm/i915: refactor pll code out into intel_dpll.c
Quoted 8 lines · Dave Airlie
From: Dave Airlie <[email protected]>
This pulls a large chunk of the pll calculation code out of
intel_display.cto a new file.One function makse sense to be an inline, otherwise this is pretty much a straight copy cover. also all the remaining hooks for g45 and older end up the same now.
This duplicates intel_panel_use_ssc, otherwise LGTM. Fixed up locally, along with the intel_dpll.h fix to pass CI.
BR,
Jani.
Quoted 2,967 lines
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 1394 +---------------- drivers/gpu/drm/i915/display/intel_display.h | 3 + .../drm/i915/display/intel_display_types.h | 5 + drivers/gpu/drm/i915/display/intel_dpll.c | 1371 ++++++++++++++++ drivers/gpu/drm/i915/display/intel_dpll.h | 22 + 6 files changed, 1413 insertions(+), 1383 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.c create mode 100644 drivers/gpu/drm/i915/display/intel_dpll.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -202,6 +202,7 @@ i915-y += \ display/intel_display.o \ display/intel_display_power.o \ display/intel_dpio_phy.o \ + display/intel_dpll.o \ display/intel_dpll_mgr.o \ display/intel_dsb.o \ display/intel_fbc.o \drivers/gpu/drm/i915/display/intel_display.c +11
-1383@@ -48,6 +48,7 @@#include "display/intel_display_debugfs.h" #include "display/intel_dp.h" #include "display/intel_dp_mst.h" +#include "display/intel_dpll.h" #include "display/intel_dpll_mgr.h" #include "display/intel_dsi.h" #include "display/intel_dvo.h" @@ -114,17 +115,6 @@ 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); -struct intel_limit { -struct { -int min, max; - } dot, vco, n, m, m1, m2, p, p1; - -struct { -int dot_limit; -int p2_slow, p2_fast; - } p2; -}; -/* returns HPLL frequency in kHz */ int vlv_get_hpll_vco (struct drm_i915_private *dev_priv) {@@ -192,271 +182,6 @@ static u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,return dev_priv->fdi_pll_freq; } -static const struct intel_limit intel_limits_i8xx_dac = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =908000 , .max =1512000 }, - .n = { .min =2 , .max =16 }, - .m = { .min =96 , .max =140 }, - .m1 = { .min =18 , .max =26 }, - .m2 = { .min =6 , .max =16 }, - .p = { .min =4 , .max =128 }, - .p1 = { .min =2 , .max =33 }, - .p2 = { .dot_limit =165000 , - .p2_slow =4 , .p2_fast =2 }, -}; - -static const struct intel_limit intel_limits_i8xx_dvo = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =908000 , .max =1512000 }, - .n = { .min =2 , .max =16 }, - .m = { .min =96 , .max =140 }, - .m1 = { .min =18 , .max =26 }, - .m2 = { .min =6 , .max =16 }, - .p = { .min =4 , .max =128 }, - .p1 = { .min =2 , .max =33 }, - .p2 = { .dot_limit =165000 , - .p2_slow =4 , .p2_fast =4 }, -}; - -static const struct intel_limit intel_limits_i8xx_lvds = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =908000 , .max =1512000 }, - .n = { .min =2 , .max =16 }, - .m = { .min =96 , .max =140 }, - .m1 = { .min =18 , .max =26 }, - .m2 = { .min =6 , .max =16 }, - .p = { .min =4 , .max =128 }, - .p1 = { .min =1 , .max =6 }, - .p2 = { .dot_limit =165000 , - .p2_slow =14 , .p2_fast =7 }, -}; - -static const struct intel_limit intel_limits_i9xx_sdvo = { - .dot = { .min =20000 , .max =400000 }, - .vco = { .min =1400000 , .max =2800000 }, - .n = { .min =1 , .max =6 }, - .m = { .min =70 , .max =120 }, - .m1 = { .min =8 , .max =18 }, - .m2 = { .min =3 , .max =7 }, - .p = { .min =5 , .max =80 }, - .p1 = { .min =1 , .max =8 }, - .p2 = { .dot_limit =200000 , - .p2_slow =10 , .p2_fast =5 }, -}; - -static const struct intel_limit intel_limits_i9xx_lvds = { - .dot = { .min =20000 , .max =400000 }, - .vco = { .min =1400000 , .max =2800000 }, - .n = { .min =1 , .max =6 }, - .m = { .min =70 , .max =120 }, - .m1 = { .min =8 , .max =18 }, - .m2 = { .min =3 , .max =7 }, - .p = { .min =7 , .max =98 }, - .p1 = { .min =1 , .max =8 }, - .p2 = { .dot_limit =112000 , - .p2_slow =14 , .p2_fast =7 }, -}; - - -static const struct intel_limit intel_limits_g4x_sdvo = { - .dot = { .min =25000 , .max =270000 }, - .vco = { .min =1750000 , .max =3500000 }, - .n = { .min =1 , .max =4 }, - .m = { .min =104 , .max =138 }, - .m1 = { .min =17 , .max =23 }, - .m2 = { .min =5 , .max =11 }, - .p = { .min =10 , .max =30 }, - .p1 = { .min =1 , .max =3 }, - .p2 = { .dot_limit =270000 , - .p2_slow =10 , - .p2_fast =10 - }, -}; - -static const struct intel_limit intel_limits_g4x_hdmi = { - .dot = { .min =22000 , .max =400000 }, - .vco = { .min =1750000 , .max =3500000 }, - .n = { .min =1 , .max =4 }, - .m = { .min =104 , .max =138 }, - .m1 = { .min =16 , .max =23 }, - .m2 = { .min =5 , .max =11 }, - .p = { .min =5 , .max =80 }, - .p1 = { .min =1 , .max =8 }, - .p2 = { .dot_limit =165000 , - .p2_slow =10 , .p2_fast =5 }, -}; - -static const struct intel_limit intel_limits_g4x_single_channel_lvds = { - .dot = { .min =20000 , .max =115000 }, - .vco = { .min =1750000 , .max =3500000 }, - .n = { .min =1 , .max =3 }, - .m = { .min =104 , .max =138 }, - .m1 = { .min =17 , .max =23 }, - .m2 = { .min =5 , .max =11 }, - .p = { .min =28 , .max =112 }, - .p1 = { .min =2 , .max =8 }, - .p2 = { .dot_limit =0 , - .p2_slow =14 , .p2_fast =14 - }, -}; - -static const struct intel_limit intel_limits_g4x_dual_channel_lvds = { - .dot = { .min =80000 , .max =224000 }, - .vco = { .min =1750000 , .max =3500000 }, - .n = { .min =1 , .max =3 }, - .m = { .min =104 , .max =138 }, - .m1 = { .min =17 , .max =23 }, - .m2 = { .min =5 , .max =11 }, - .p = { .min =14 , .max =42 }, - .p1 = { .min =2 , .max =6 }, - .p2 = { .dot_limit =0 , - .p2_slow =7 , .p2_fast =7 - }, -}; - -static const struct intel_limit pnv_limits_sdvo = { - .dot = { .min =20000 , .max =400000 }, - .vco = { .min =1700000 , .max =3500000 }, -/* Pineview's Ncounter is a ring counter */ - .n = { .min =3 , .max =6 }, - .m = { .min =2 , .max =256 }, -/* Pineview only has one combined m divider, which we treat as m2. */ - .m1 = { .min =0 , .max =0 }, - .m2 = { .min =0 , .max =254 }, - .p = { .min =5 , .max =80 }, - .p1 = { .min =1 , .max =8 }, - .p2 = { .dot_limit =200000 , - .p2_slow =10 , .p2_fast =5 }, -}; - -static const struct intel_limit pnv_limits_lvds = { - .dot = { .min =20000 , .max =400000 }, - .vco = { .min =1700000 , .max =3500000 }, - .n = { .min =3 , .max =6 }, - .m = { .min =2 , .max =256 }, - .m1 = { .min =0 , .max =0 }, - .m2 = { .min =0 , .max =254 }, - .p = { .min =7 , .max =112 }, - .p1 = { .min =1 , .max =8 }, - .p2 = { .dot_limit =112000 , - .p2_slow =14 , .p2_fast =14 }, -}; - -/* Ironlake / Sandybridge -* -* We calculate clock using (register_value + 2) for N/M1/M2, so here -* the range value for them is (actual_value - 2). -*/ -static const struct intel_limit ilk_limits_dac = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =1760000 , .max =3510000 }, - .n = { .min =1 , .max =5 }, - .m = { .min =79 , .max =127 }, - .m1 = { .min =12 , .max =22 }, - .m2 = { .min =5 , .max =9 }, - .p = { .min =5 , .max =80 }, - .p1 = { .min =1 , .max =8 }, - .p2 = { .dot_limit =225000 , - .p2_slow =10 , .p2_fast =5 }, -}; - -static const struct intel_limit ilk_limits_single_lvds = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =1760000 , .max =3510000 }, - .n = { .min =1 , .max =3 }, - .m = { .min =79 , .max =118 }, - .m1 = { .min =12 , .max =22 }, - .m2 = { .min =5 , .max =9 }, - .p = { .min =28 , .max =112 }, - .p1 = { .min =2 , .max =8 }, - .p2 = { .dot_limit =225000 , - .p2_slow =14 , .p2_fast =14 }, -}; - -static const struct intel_limit ilk_limits_dual_lvds = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =1760000 , .max =3510000 }, - .n = { .min =1 , .max =3 }, - .m = { .min =79 , .max =127 }, - .m1 = { .min =12 , .max =22 }, - .m2 = { .min =5 , .max =9 }, - .p = { .min =14 , .max =56 }, - .p1 = { .min =2 , .max =8 }, - .p2 = { .dot_limit =225000 , - .p2_slow =7 , .p2_fast =7 }, -}; - -/* LVDS 100mhz refclk limits. */ -static const struct intel_limit ilk_limits_single_lvds_100m = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =1760000 , .max =3510000 }, - .n = { .min =1 , .max =2 }, - .m = { .min =79 , .max =126 }, - .m1 = { .min =12 , .max =22 }, - .m2 = { .min =5 , .max =9 }, - .p = { .min =28 , .max =112 }, - .p1 = { .min =2 , .max =8 }, - .p2 = { .dot_limit =225000 , - .p2_slow =14 , .p2_fast =14 }, -}; - -static const struct intel_limit ilk_limits_dual_lvds_100m = { - .dot = { .min =25000 , .max =350000 }, - .vco = { .min =1760000 , .max =3510000 }, - .n = { .min =1 , .max =3 }, - .m = { .min =79 , .max =126 }, - .m1 = { .min =12 , .max =22 }, - .m2 = { .min =5 , .max =9 }, - .p = { .min =14 , .max =42 }, - .p1 = { .min =2 , .max =6 }, - .p2 = { .dot_limit =225000 , - .p2_slow =7 , .p2_fast =7 }, -}; - -static const struct intel_limit intel_limits_vlv = { -/* -* These are the data rate limits (measured in fast clocks) -* since those are the strictest limits we have. The fast -* clock and actual rate limits are more relaxed, so checking -* them would make no difference. -*/ - .dot = { .min =25000 *5 , .max =270000 *5 }, - .vco = { .min =4000000 , .max =6000000 }, - .n = { .min =1 , .max =7 }, - .m1 = { .min =2 , .max =3 }, - .m2 = { .min =11 , .max =156 }, - .p1 = { .min =2 , .max =3 }, - .p2 = { .p2_slow =2 , .p2_fast =20 },/* slow=min, fast=max */ -}; - -static const struct intel_limit intel_limits_chv = { -/* -* These are the data rate limits (measured in fast clocks) -* since those are the strictest limits we have. The fast -* clock and actual rate limits are more relaxed, so checking -* them would make no difference. -*/ - .dot = { .min =25000 *5 , .max =540000 *5 }, - .vco = { .min =4800000 , .max =6480000 }, - .n = { .min =1 , .max =1 }, - .m1 = { .min =2 , .max =2 }, - .m2 = { .min =24 <<22 , .max =175 <<22 }, - .p1 = { .min =2 , .max =4 }, - .p2 = { .p2_slow =1 , .p2_fast =14 }, -}; - -static const struct intel_limit intel_limits_bxt = { -/* FIXME: find real dot limits */ - .dot = { .min =0 , .max =INT_MAX }, - .vco = { .min =4800000 , .max =6700000 }, - .n = { .min =1 , .max =1 }, - .m1 = { .min =2 , .max =2 }, -/* FIXME: find real m2 limits */ - .m2 = { .min =2 <<22 , .max =255 <<22 }, - .p1 = { .min =2 , .max =4 }, - .p2 = { .p2_slow =1 , .p2_fast =20 }, -}; -/* WA Display #0827: Gen9:all */ static void skl_wa_827 (struct drm_i915_private *dev_priv,enum pipe pipe,bool enable)@@ -501,483 +226,6 @@ is_trans_port_sync_mode(const struct intel_crtc_state *crtc_state)is_trans_port_sync_slave (crtc_state); } -/* -* Platform specific helpers to calculate the port PLL loopback- (clock.m), -* and post-divider (clock.p) values, pre- (clock.vco) and post-divided fast -* (clock.dot) clock rates. This fast dot clock is fed to the port's IO logic. -* The helpers' return value is the rate of the clock that is fed to the -* display engine's pipe which can be the above fast dot clock rate or a -* divided-down version of it. -*/ -/* m1 is reserved as 0 in Pineview, n is a ring counter */ -static int pnv_calc_dpll_params (int refclk,struct dpll *clock) -{ - clock->m = clock->m2 +2 ; - clock->p = clock->p1 * clock->p2; -if (WARN_ON (clock->n ==0 || clock->p ==0 )) -return 0 ; - clock->vco =DIV_ROUND_CLOSEST (refclk * clock->m, clock->n); - clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); - -return clock->dot; -} - -static u32 i9xx_dpll_compute_m (struct dpll *dpll) -{ -return 5 * (dpll->m1 +2 ) + (dpll->m2 +2 ); -} - -static int i9xx_calc_dpll_params (int refclk,struct dpll *clock) -{ - clock->m =i9xx_dpll_compute_m (clock); - clock->p = clock->p1 * clock->p2; -if (WARN_ON (clock->n +2 ==0 || clock->p ==0 )) -return 0 ; - clock->vco =DIV_ROUND_CLOSEST (refclk * clock->m, clock->n +2 ); - clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); - -return clock->dot; -} - -static int vlv_calc_dpll_params (int refclk,struct dpll *clock) -{ - clock->m = clock->m1 * clock->m2; - clock->p = clock->p1 * clock->p2; -if (WARN_ON (clock->n ==0 || clock->p ==0 )) -return 0 ; - clock->vco =DIV_ROUND_CLOSEST (refclk * clock->m, clock->n); - clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); - -return clock->dot /5 ; -} - -int chv_calc_dpll_params (int refclk,struct dpll *clock) -{ - clock->m = clock->m1 * clock->m2; - clock->p = clock->p1 * clock->p2; -if (WARN_ON (clock->n ==0 || clock->p ==0 )) -return 0 ; - clock->vco =DIV_ROUND_CLOSEST_ULL (mul_u32_u32 (refclk, clock->m), - clock->n <<22 ); - clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); - -return clock->dot /5 ; -} - -/* -* Returns whether the given set of divisors are valid for a given refclk with -* the given connectors. -*/ -static bool intel_pll_is_valid (struct drm_i915_private *dev_priv, -const struct intel_limit *limit, -const struct dpll *clock) -{ -if (clock->n < limit->n.min || limit->n.max < clock->n) -return false; -if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) -return false; -if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) -return false; -if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) -return false; - -if (!IS_PINEVIEW (dev_priv) && !IS_VALLEYVIEW (dev_priv) && - !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv)) -if (clock->m1 <= clock->m2) -return false; - -if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && - !IS_GEN9_LP (dev_priv)) { -if (clock->p < limit->p.min || limit->p.max < clock->p) -return false; -if (clock->m < limit->m.min || limit->m.max < clock->m) -return false; - } - -if (clock->vco < limit->vco.min || limit->vco.max < clock->vco) -return false; -/* XXX: We may need to be checking "Dot clock" depending on the multiplier, -* connector, etc., rather than just a single range. -*/ -if (clock->dot < limit->dot.min || limit->dot.max < clock->dot) -return false; - -return true; -} - -static int -i9xx_select_p2_div (const struct intel_limit *limit, -const struct intel_crtc_state *crtc_state, -int target) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) { -/* -* For LVDS just rely on its current settings for dual-channel. -* We haven't figured out how to reliably set up different -* single/dual channel state, if we even can. -*/ -if (intel_is_dual_link_lvds (dev_priv)) -return limit->p2.p2_fast; -else -return limit->p2.p2_slow; - }else { -if (target < limit->p2.dot_limit) -return limit->p2.p2_slow; -else -return limit->p2.p2_fast; - } -} - -/* -* Returns a set of divisors for the desired target clock with the given -* refclk, or FALSE. The returned values represent the clock equation: -* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. -* -* Target and reference clocks are specified in kHz. -* -* If match_clock is provided, then best_clock P divider must match the P -* divider from @match_clock used for LVDS downclocking. -*/ -static bool -i9xx_find_best_dpll (const struct intel_limit *limit, -struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) -{ -struct drm_device *dev = crtc_state->uapi.crtc->dev; -struct dpll clock; -int err = target; - -memset (best_clock,0 ,sizeof (*best_clock)); - - clock.p2 =i9xx_select_p2_div (limit, crtc_state, target); - -for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; - clock.m1++) { -for (clock.m2 = limit->m2.min; - clock.m2 <= limit->m2.max; clock.m2++) { -if (clock.m2 >= clock.m1) -break ; -for (clock.n = limit->n.min; - clock.n <= limit->n.max; clock.n++) { -for (clock.p1 = limit->p1.min; - clock.p1 <= limit->p1.max; clock.p1++) { -int this_err; - -i9xx_calc_dpll_params (refclk, &clock); -if (!intel_pll_is_valid (to_i915 (dev), - limit, - &clock)) -continue ; -if (match_clock && - clock.p != match_clock->p) -continue ; - - this_err =abs (clock.dot - target); -if (this_err < err) { - *best_clock = clock; - err = this_err; - } - } - } - } - } - -return (err != target); -} - -/* -* Returns a set of divisors for the desired target clock with the given -* refclk, or FALSE. The returned values represent the clock equation: -* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. -* -* Target and reference clocks are specified in kHz. -* -* If match_clock is provided, then best_clock P divider must match the P -* divider from @match_clock used for LVDS downclocking. -*/ -static bool -pnv_find_best_dpll (const struct intel_limit *limit, -struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) -{ -struct drm_device *dev = crtc_state->uapi.crtc->dev; -struct dpll clock; -int err = target; - -memset (best_clock,0 ,sizeof (*best_clock)); - - clock.p2 =i9xx_select_p2_div (limit, crtc_state, target); - -for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; - clock.m1++) { -for (clock.m2 = limit->m2.min; - clock.m2 <= limit->m2.max; clock.m2++) { -for (clock.n = limit->n.min; - clock.n <= limit->n.max; clock.n++) { -for (clock.p1 = limit->p1.min; - clock.p1 <= limit->p1.max; clock.p1++) { -int this_err; - -pnv_calc_dpll_params (refclk, &clock); -if (!intel_pll_is_valid (to_i915 (dev), - limit, - &clock)) -continue ; -if (match_clock && - clock.p != match_clock->p) -continue ; - - this_err =abs (clock.dot - target); -if (this_err < err) { - *best_clock = clock; - err = this_err; - } - } - } - } - } - -return (err != target); -} - -/* -* Returns a set of divisors for the desired target clock with the given -* refclk, or FALSE. The returned values represent the clock equation: -* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. -* -* Target and reference clocks are specified in kHz. -* -* If match_clock is provided, then best_clock P divider must match the P -* divider from @match_clock used for LVDS downclocking. -*/ -static bool -g4x_find_best_dpll (const struct intel_limit *limit, -struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) -{ -struct drm_device *dev = crtc_state->uapi.crtc->dev; -struct dpll clock; -int max_n; -bool found = false; -/* approximately equals target * 0.00585 */ -int err_most = (target >>8 ) + (target >>9 ); - -memset (best_clock,0 ,sizeof (*best_clock)); - - clock.p2 =i9xx_select_p2_div (limit, crtc_state, target); - - max_n = limit->n.max; -/* based on hardware requirement, prefer smaller n to precision */ -for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { -/* based on hardware requirement, prefere larger m1,m2 */ -for (clock.m1 = limit->m1.max; - clock.m1 >= limit->m1.min; clock.m1--) { -for (clock.m2 = limit->m2.max; - clock.m2 >= limit->m2.min; clock.m2--) { -for (clock.p1 = limit->p1.max; - clock.p1 >= limit->p1.min; clock.p1--) { -int this_err; - -i9xx_calc_dpll_params (refclk, &clock); -if (!intel_pll_is_valid (to_i915 (dev), - limit, - &clock)) -continue ; - - this_err =abs (clock.dot - target); -if (this_err < err_most) { - *best_clock = clock; - err_most = this_err; - max_n = clock.n; - found = true; - } - } - } - } - } -return found; -} - -/* -* Check if the calculated PLL configuration is more optimal compared to the -* best configuration and error found so far. Return the calculated error. -*/ -static bool vlv_PLL_is_optimal (struct drm_device *dev,int target_freq, -const struct dpll *calculated_clock, -const struct dpll *best_clock, -unsigned int best_error_ppm, -unsigned int *error_ppm) -{ -/* -* For CHV ignore the error and consider only the P value. -* Prefer a bigger P value based on HW requirements. -*/ -if (IS_CHERRYVIEW (to_i915 (dev))) { - *error_ppm =0 ; - -return calculated_clock->p > best_clock->p; - } - -if (drm_WARN_ON_ONCE (dev, !target_freq)) -return false; - - *error_ppm =div_u64 (1000000ULL * -abs (target_freq - calculated_clock->dot), - target_freq); -/* -* Prefer a better P value over a better (smaller) error if the error -* is small. Ensure this preference for future configurations too by -* setting the error to 0. -*/ -if (*error_ppm <100 && calculated_clock->p > best_clock->p) { - *error_ppm =0 ; - -return true; - } - -return *error_ppm +10 < best_error_ppm; -} - -/* -* Returns a set of divisors for the desired target clock with the given -* refclk, or FALSE. The returned values represent the clock equation: -* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. -*/ -static bool -vlv_find_best_dpll (const struct intel_limit *limit, -struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) -{ -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct drm_device *dev = crtc->base.dev; -struct dpll clock; -unsigned int bestppm =1000000 ; -/* min update 19.2 MHz */ -int max_n =min (limit->n.max, refclk /19200 ); -bool found = false; - - target *=5 ;/* fast clock */ - -memset (best_clock,0 ,sizeof (*best_clock)); - -/* based on hardware requirement, prefer smaller n to precision */ -for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { -for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) { -for (clock.p2 = limit->p2.p2_fast; clock.p2 >= limit->p2.p2_slow; - clock.p2 -= clock.p2 >10 ?2 :1 ) { - clock.p = clock.p1 * clock.p2; -/* based on hardware requirement, prefer bigger m1,m2 values */ -for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) { -unsigned int ppm; - - clock.m2 =DIV_ROUND_CLOSEST (target * clock.p * clock.n, - refclk * clock.m1); - -vlv_calc_dpll_params (refclk, &clock); - -if (!intel_pll_is_valid (to_i915 (dev), - limit, - &clock)) -continue ; - -if (!vlv_PLL_is_optimal (dev, target, - &clock, - best_clock, - bestppm, &ppm)) -continue ; - - *best_clock = clock; - bestppm = ppm; - found = true; - } - } - } - } - -return found; -} - -/* -* Returns a set of divisors for the desired target clock with the given -* refclk, or FALSE. The returned values represent the clock equation: -* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. -*/ -static bool -chv_find_best_dpll (const struct intel_limit *limit, -struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) -{ -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct drm_device *dev = crtc->base.dev; -unsigned int best_error_ppm; -struct dpll clock; -u64 m2; -int found = false; - -memset (best_clock,0 ,sizeof (*best_clock)); - best_error_ppm =1000000 ; - -/* -* Based on hardware doc, the n always set to 1, and m1 always -* set to 2. If requires to support 200Mhz refclk, we need to -* revisit this because n may not 1 anymore. -*/ - clock.n =1 ; - clock.m1 =2 ; - target *=5 ;/* fast clock */ - -for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) { -for (clock.p2 = limit->p2.p2_fast; - clock.p2 >= limit->p2.p2_slow; - clock.p2 -= clock.p2 >10 ?2 :1 ) { -unsigned int error_ppm; - - clock.p = clock.p1 * clock.p2; - - m2 =DIV_ROUND_CLOSEST_ULL (mul_u32_u32 (target, clock.p * clock.n) <<22 , - refclk * clock.m1); - -if (m2 >INT_MAX /clock.m1) -continue ; - - clock.m2 = m2; - -chv_calc_dpll_params (refclk, &clock); - -if (!intel_pll_is_valid (to_i915 (dev), limit, &clock)) -continue ; - -if (!vlv_PLL_is_optimal (dev, target, &clock, best_clock, - best_error_ppm, &error_ppm)) -continue ; - - *best_clock = clock; - best_error_ppm = error_ppm; - found = true; - } - } - -return found; -} - -bool bxt_find_best_dpll (struct intel_crtc_state *crtc_state, -struct dpll *best_clock) -{ -int refclk =100000 ; -const struct intel_limit *limit = &intel_limits_bxt; - -return chv_find_best_dpll (limit, crtc_state, - crtc_state->port_clock, refclk, -NULL , best_clock); -} -static bool pipe_scanline_is_moving (struct drm_i915_private *dev_priv,enum pipe pipe) {@@ -5274,7 +4522,7 @@ static void ivb_update_fdi_bc_bifurcation(const struct intel_crtc_state *crtc_st* Finds the encoder associated with the given CRTC. This can only be * used when we know that the CRTC isn't feeding multiple encoders! */ -static struct intel_encoder * +struct intel_encoder *intel_get_crtc_new_encoder (const struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state) {@@ -7950,43 +7198,6 @@ static bool intel_panel_use_ssc(struct drm_i915_private *dev_priv) && !(dev_priv->quirks &QUIRK_LVDS_SSC_DISABLE ); } -static u32 pnv_dpll_compute_fp (struct dpll *dpll) -{ -return (1 << dpll->n) <<16 | dpll->m2; -} - -static u32 i9xx_dpll_compute_fp (struct dpll *dpll) -{ -return dpll->n <<16 | dpll->m1 <<8 | dpll->m2; -} - -static void i9xx_update_pll_dividers (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -u32 fp, fp2 =0 ; - -if (IS_PINEVIEW (dev_priv)) { - fp =pnv_dpll_compute_fp (&crtc_state->dpll); -if (reduced_clock) - fp2 =pnv_dpll_compute_fp (reduced_clock); - }else { - fp =i9xx_dpll_compute_fp (&crtc_state->dpll); -if (reduced_clock) - fp2 =i9xx_dpll_compute_fp (reduced_clock); - } - - crtc_state->dpll_hw_state.fp0 = fp; - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && - reduced_clock) { - crtc_state->dpll_hw_state.fp1 = fp2; - }else { - crtc_state->dpll_hw_state.fp1 = fp; - } -} -static void vlv_pllb_recal_opamp (struct drm_i915_private *dev_priv,enum pipe pipe) {@@ -8111,39 +7322,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_compute_dpll (struct intel_crtc *crtc, -struct intel_crtc_state *pipe_config) -{ - pipe_config->dpll_hw_state.dpll =DPLL_INTEGRATED_REF_CLK_VLV | -DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; -if (crtc->pipe !=PIPE_A ) - pipe_config->dpll_hw_state.dpll |=DPLL_INTEGRATED_CRI_CLK_VLV ; - -/* DPLL not used with DSI, but still need the rest set up */ -if (!intel_crtc_has_type (pipe_config,INTEL_OUTPUT_DSI )) - pipe_config->dpll_hw_state.dpll |=DPLL_VCO_ENABLE | -DPLL_EXT_BUFFER_ENABLE_VLV ; - - pipe_config->dpll_hw_state.dpll_md = - (pipe_config->pixel_multiplier -1 ) <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; -} - -static void chv_compute_dpll (struct intel_crtc *crtc, -struct intel_crtc_state *pipe_config) -{ - pipe_config->dpll_hw_state.dpll =DPLL_SSC_REF_CLK_CHV | -DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; -if (crtc->pipe !=PIPE_A ) - pipe_config->dpll_hw_state.dpll |=DPLL_INTEGRATED_CRI_CLK_VLV ; - -/* DPLL not used with DSI, but still need the rest set up */ -if (!intel_crtc_has_type (pipe_config,INTEL_OUTPUT_DSI )) - pipe_config->dpll_hw_state.dpll |=DPLL_VCO_ENABLE ; - - pipe_config->dpll_hw_state.dpll_md = - (pipe_config->pixel_multiplier -1 ) <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; -} -static void vlv_prepare_pll (struct intel_crtc *crtc,const struct intel_crtc_state *pipe_config) {@@ -8403,128 +7581,7 @@ void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe)vlv_disable_pll (dev_priv, pipe); } -static void i9xx_compute_dpll (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -u32 dpll; -struct dpll *clock = &crtc_state->dpll; -i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock); - - dpll =DPLL_VGA_MODE_DIS ; - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) - dpll |=DPLLB_MODE_LVDS ; -else - dpll |=DPLLB_MODE_DAC_SERIAL ; - -if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || -IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) { - dpll |= (crtc_state->pixel_multiplier -1 ) - <<SDVO_MULTIPLIER_SHIFT_HIRES ; - } - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO ) || -intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) - dpll |=DPLL_SDVO_HIGH_SPEED ; - -if (intel_crtc_has_dp_encoder (crtc_state)) - dpll |=DPLL_SDVO_HIGH_SPEED ; - -/* compute bitmask from p1 value */ -if (IS_PINEVIEW (dev_priv)) - dpll |= (1 << (clock->p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT_PINEVIEW ; -else { - dpll |= (1 << (clock->p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; -if (IS_G4X (dev_priv) && reduced_clock) - dpll |= (1 << (reduced_clock->p1 -1 )) <<DPLL_FPA1_P1_POST_DIV_SHIFT ; - } -switch (clock->p2) { -case 5 : - dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 ; -break ; -case 7 : - dpll |=DPLLB_LVDS_P2_CLOCK_DIV_7 ; -break ; -case 10 : - dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_10 ; -break ; -case 14 : - dpll |=DPLLB_LVDS_P2_CLOCK_DIV_14 ; -break ; - } -if (INTEL_GEN (dev_priv) >=4 ) - dpll |= (6 <<PLL_LOAD_PULSE_PHASE_SHIFT ); - -if (crtc_state->sdvo_tv_clock) - dpll |=PLL_REF_INPUT_TVCLKINBC ; -else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && -intel_panel_use_ssc (dev_priv)) - dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ; -else - dpll |=PLL_REF_INPUT_DREFCLK ; - - dpll |=DPLL_VCO_ENABLE ; - crtc_state->dpll_hw_state.dpll = dpll; - -if (INTEL_GEN (dev_priv) >=4 ) { -u32 dpll_md = (crtc_state->pixel_multiplier -1 ) - <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; - crtc_state->dpll_hw_state.dpll_md = dpll_md; - } -} - -static void i8xx_compute_dpll (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -u32 dpll; -struct dpll *clock = &crtc_state->dpll; - -i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock); - - dpll =DPLL_VGA_MODE_DIS ; - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) { - dpll |= (1 << (clock->p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; - }else { -if (clock->p1 ==2 ) - dpll |=PLL_P1_DIVIDE_BY_TWO ; -else - dpll |= (clock->p1 -2 ) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; -if (clock->p2 ==4 ) - dpll |=PLL_P2_DIVIDE_BY_4 ; - } - -/* -* Bspec: -* "[Almador Errata}: For the correct operation of the muxed DVO pins -* (GDEVSELB/I2Cdata, GIRDBY/I2CClk) and (GFRAMEB/DVI_Data, -* GTRDYB/DVI_Clk): Bit 31 (DPLL VCO Enable) and Bit 30 (2X Clock -* Enable) must be set to “1” in both the DPLL A Control Register -* (06014h-06017h) and DPLL B Control Register (06018h-0601Bh)." -* -* For simplicity We simply keep both bits always enabled in -* both DPLLS. The spec says we should disable the DVO 2X clock -* when not needed, but this seems to work fine in practice. -*/ -if (IS_I830 (dev_priv) || -intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DVO )) - dpll |=DPLL_DVO_2X_MODE ; - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && -intel_panel_use_ssc (dev_priv)) - dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ; -else - dpll |=PLL_REF_INPUT_DREFCLK ; - - dpll |=DPLL_VCO_ENABLE ; - crtc_state->dpll_hw_state.dpll = dpll; -}static void intel_set_transcoder_timings (const struct intel_crtc_state *crtc_state) {@@ -8730,207 +7787,6 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state)intel_de_posting_read (dev_priv,PIPECONF (crtc->pipe)); } -static int i8xx_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -const struct intel_limit *limit; -int refclk =48000 ; - -memset (&crtc_state->dpll_hw_state,0 , -sizeof (crtc_state->dpll_hw_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; -drm_dbg_kms (&dev_priv->drm, -"using SSC reference clock of %d kHz\n" , - refclk); - } - - limit = &intel_limits_i8xx_lvds; - }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DVO )) { - limit = &intel_limits_i8xx_dvo; - }else { - limit = &intel_limits_i8xx_dac; - } - -if (!crtc_state->clock_set && - !i9xx_find_best_dpll (limit, crtc_state, crtc_state->port_clock, - refclk,NULL , &crtc_state->dpll)) { -drm_err (&dev_priv->drm, -"Couldn't find PLL settings for mode!\n" ); -return -EINVAL ; - } - -i8xx_compute_dpll (crtc, crtc_state,NULL ); - -return 0 ; -} - -static int g4x_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct intel_limit *limit; -int refclk =96000 ; - -memset (&crtc_state->dpll_hw_state,0 , -sizeof (crtc_state->dpll_hw_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; -drm_dbg_kms (&dev_priv->drm, -"using SSC reference clock of %d kHz\n" , - refclk); - } - -if (intel_is_dual_link_lvds (dev_priv)) - limit = &intel_limits_g4x_dual_channel_lvds; -else - limit = &intel_limits_g4x_single_channel_lvds; - }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI ) || -intel_crtc_has_type (crtc_state,INTEL_OUTPUT_ANALOG )) { - limit = &intel_limits_g4x_hdmi; - }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO )) { - limit = &intel_limits_g4x_sdvo; - }else { -/* The option is for other outputs */ - limit = &intel_limits_i9xx_sdvo; - } - -if (!crtc_state->clock_set && - !g4x_find_best_dpll (limit, crtc_state, crtc_state->port_clock, - refclk,NULL , &crtc_state->dpll)) { -drm_err (&dev_priv->drm, -"Couldn't find PLL settings for mode!\n" ); -return -EINVAL ; - } - -i9xx_compute_dpll (crtc, crtc_state,NULL ); - -return 0 ; -} - -static int pnv_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -const struct intel_limit *limit; -int refclk =96000 ; - -memset (&crtc_state->dpll_hw_state,0 , -sizeof (crtc_state->dpll_hw_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; -drm_dbg_kms (&dev_priv->drm, -"using SSC reference clock of %d kHz\n" , - refclk); - } - - limit = &pnv_limits_lvds; - }else { - limit = &pnv_limits_sdvo; - } - -if (!crtc_state->clock_set && - !pnv_find_best_dpll (limit, crtc_state, crtc_state->port_clock, - refclk,NULL , &crtc_state->dpll)) { -drm_err (&dev_priv->drm, -"Couldn't find PLL settings for mode!\n" ); -return -EINVAL ; - } - -i9xx_compute_dpll (crtc, crtc_state,NULL ); - -return 0 ; -} - -static int i9xx_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -const struct intel_limit *limit; -int refclk =96000 ; - -memset (&crtc_state->dpll_hw_state,0 , -sizeof (crtc_state->dpll_hw_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; -drm_dbg_kms (&dev_priv->drm, -"using SSC reference clock of %d kHz\n" , - refclk); - } - - limit = &intel_limits_i9xx_lvds; - }else { - limit = &intel_limits_i9xx_sdvo; - } - -if (!crtc_state->clock_set && - !i9xx_find_best_dpll (limit, crtc_state, crtc_state->port_clock, - refclk,NULL , &crtc_state->dpll)) { -drm_err (&dev_priv->drm, -"Couldn't find PLL settings for mode!\n" ); -return -EINVAL ; - } - -i9xx_compute_dpll (crtc, crtc_state,NULL ); - -return 0 ; -} - -static int chv_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -int refclk =100000 ; -const struct intel_limit *limit = &intel_limits_chv; -struct drm_i915_private *i915 =to_i915 (crtc_state->uapi.crtc->dev); - -memset (&crtc_state->dpll_hw_state,0 , -sizeof (crtc_state->dpll_hw_state)); - -if (!crtc_state->clock_set && - !chv_find_best_dpll (limit, crtc_state, crtc_state->port_clock, - refclk,NULL , &crtc_state->dpll)) { -drm_err (&i915->drm,"Couldn't find PLL settings for mode!\n" ); -return -EINVAL ; - } - -chv_compute_dpll (crtc, crtc_state); - -return 0 ; -} - -static int vlv_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -int refclk =100000 ; -const struct intel_limit *limit = &intel_limits_vlv; -struct drm_i915_private *i915 =to_i915 (crtc_state->uapi.crtc->dev); - -memset (&crtc_state->dpll_hw_state,0 , -sizeof (crtc_state->dpll_hw_state)); - -if (!crtc_state->clock_set && - !vlv_find_best_dpll (limit, crtc_state, crtc_state->port_clock, - refclk,NULL , &crtc_state->dpll)) { -drm_err (&i915->drm,"Couldn't find PLL settings for mode!\n" ); -return -EINVAL ; - } - -vlv_compute_dpll (crtc, crtc_state); - -return 0 ; -}static bool i9xx_has_pfit (struct drm_i915_private *dev_priv) {@@ -9941,172 +8797,6 @@ int ilk_get_lanes_required(int target_clock, int link_bw, int bpp)return DIV_ROUND_UP (bps, link_bw *8 ); } -static bool ilk_needs_fb_cb_tune (struct dpll *dpll,int factor) -{ -return i9xx_dpll_compute_m (dpll) < factor * dpll->n; -} - -static void ilk_compute_dpll (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -u32 dpll, fp, fp2; -int factor; - -/* Enable autotuning of the PLL clock (if permissible) */ - 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 ) || - (HAS_PCH_IBX (dev_priv) && -intel_is_dual_link_lvds (dev_priv))) - factor =25 ; - }else if (crtc_state->sdvo_tv_clock) { - factor =20 ; - } - - fp =i9xx_dpll_compute_fp (&crtc_state->dpll); - -if (ilk_needs_fb_cb_tune (&crtc_state->dpll, factor)) - fp |=FP_CB_TUNE ; - -if (reduced_clock) { - fp2 =i9xx_dpll_compute_fp (reduced_clock); - -if (reduced_clock->m < factor * reduced_clock->n) - fp2 |=FP_CB_TUNE ; - }else { - fp2 = fp; - } - - dpll =0 ; - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) - dpll |=DPLLB_MODE_LVDS ; -else - dpll |=DPLLB_MODE_DAC_SERIAL ; - - dpll |= (crtc_state->pixel_multiplier -1 ) - <<PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT ; - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO ) || -intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) - dpll |=DPLL_SDVO_HIGH_SPEED ; - -if (intel_crtc_has_dp_encoder (crtc_state)) - dpll |=DPLL_SDVO_HIGH_SPEED ; - -/* -* The high speed IO clock is only really required for -* SDVO/HDMI/DP, but we also enable it for CRT to make it -* possible to share the DPLL between CRT and HDMI. Enabling -* the clock needlessly does no real harm, except use up a -* bit of power potentially. -* -* We'll limit this to IVB with 3 pipes, since it has only two -* DPLLs and so DPLL sharing is the only way to get three pipes -* driving PCH ports at the same time. On SNB we could do this, -* and potentially avoid enabling the second DPLL, but it's not -* clear if it''s a win or loss power wise. No point in doing -* this on ILK at all since it has a fixed DPLL<->pipe mapping. -*/ -if (INTEL_NUM_PIPES (dev_priv) ==3 && -intel_crtc_has_type (crtc_state,INTEL_OUTPUT_ANALOG )) - dpll |=DPLL_SDVO_HIGH_SPEED ; - -/* compute bitmask from p1 value */ - dpll |= (1 << (crtc_state->dpll.p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; -/* also FPA1 */ - dpll |= (1 << (crtc_state->dpll.p1 -1 )) <<DPLL_FPA1_P1_POST_DIV_SHIFT ; - -switch (crtc_state->dpll.p2) { -case 5 : - dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 ; -break ; -case 7 : - dpll |=DPLLB_LVDS_P2_CLOCK_DIV_7 ; -break ; -case 10 : - dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_10 ; -break ; -case 14 : - dpll |=DPLLB_LVDS_P2_CLOCK_DIV_14 ; -break ; - } - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && -intel_panel_use_ssc (dev_priv)) - dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ; -else - dpll |=PLL_REF_INPUT_DREFCLK ; - - dpll |=DPLL_VCO_ENABLE ; - - crtc_state->dpll_hw_state.dpll = dpll; - crtc_state->dpll_hw_state.fp0 = fp; - crtc_state->dpll_hw_state.fp1 = fp2; -} - -static int ilk_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_atomic_state *state = -to_intel_atomic_state (crtc_state->uapi.state); -const struct intel_limit *limit; -int refclk =120000 ; - -memset (&crtc_state->dpll_hw_state,0 , -sizeof (crtc_state->dpll_hw_state)); - -/* CPU eDP is the only output that doesn't need a PCH PLL of its own. */ -if (!crtc_state->has_pch_encoder) -return 0 ; - -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) { -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; - } - -if (intel_is_dual_link_lvds (dev_priv)) { -if (refclk ==100000 ) - limit = &ilk_limits_dual_lvds_100m; -else - limit = &ilk_limits_dual_lvds; - }else { -if (refclk ==100000 ) - limit = &ilk_limits_single_lvds_100m; -else - limit = &ilk_limits_single_lvds; - } - }else { - limit = &ilk_limits_dac; - } - -if (!crtc_state->clock_set && - !g4x_find_best_dpll (limit, crtc_state, crtc_state->port_clock, - refclk,NULL , &crtc_state->dpll)) { -drm_err (&dev_priv->drm, -"Couldn't find PLL settings for mode!\n" ); -return -EINVAL ; - } - -ilk_compute_dpll (crtc, crtc_state,NULL ); - -if (!intel_reserve_shared_dplls (state, crtc,NULL )) { -drm_dbg_kms (&dev_priv->drm, -"failed to find PLL for pipe %c\n" , -pipe_name (crtc->pipe)); -return -EINVAL ; - } - -return 0 ; -} -static void intel_pch_transcoder_get_m_n (struct intel_crtc *crtc,struct intel_link_m_n *m_n) {@@ -10519,29 +9209,6 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc,return ret; } -static int hsw_crtc_compute_clock (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_atomic_state *state = -to_intel_atomic_state (crtc_state->uapi.state); - -if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ) || -INTEL_GEN (dev_priv) >=11 ) { -struct intel_encoder *encoder = -intel_get_crtc_new_encoder (state, crtc_state); - -if (!intel_reserve_shared_dplls (state, crtc, encoder)) { -drm_dbg_kms (&dev_priv->drm, -"failed to find PLL for pipe %c\n" , -pipe_name (crtc->pipe)); -return -EINVAL ; - } - } - -return 0 ; -} -static void dg1_get_ddi_pll (struct drm_i915_private *dev_priv,enum port port,struct intel_crtc_state *pipe_config) {@@ -16476,69 +15143,27 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) {intel_init_cdclk_hooks (dev_priv); +intel_dpll_init_clock_hook (dev_priv); +if (INTEL_GEN (dev_priv) >=9 ) { dev_priv->display.get_pipe_config = hsw_get_pipe_config; - dev_priv->display.get_initial_plane_config = - skl_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = hsw_crtc_compute_clock; dev_priv->display.crtc_enable = hsw_crtc_enable; dev_priv->display.crtc_disable = hsw_crtc_disable; }else if (HAS_DDI (dev_priv)) { dev_priv->display.get_pipe_config = hsw_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = - hsw_crtc_compute_clock; dev_priv->display.crtc_enable = hsw_crtc_enable; dev_priv->display.crtc_disable = hsw_crtc_disable; }else if (HAS_PCH_SPLIT (dev_priv)) { dev_priv->display.get_pipe_config = ilk_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = - ilk_crtc_compute_clock; dev_priv->display.crtc_enable = ilk_crtc_enable; dev_priv->display.crtc_disable = ilk_crtc_disable; - }else if (IS_CHERRYVIEW (dev_priv)) { - dev_priv->display.get_pipe_config = i9xx_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = chv_crtc_compute_clock; - dev_priv->display.crtc_enable = valleyview_crtc_enable; - dev_priv->display.crtc_disable = i9xx_crtc_disable; - }else if (IS_VALLEYVIEW (dev_priv)) { + }else if (IS_CHERRYVIEW (dev_priv) || +IS_VALLEYVIEW (dev_priv)) { dev_priv->display.get_pipe_config = i9xx_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = vlv_crtc_compute_clock; dev_priv->display.crtc_enable = valleyview_crtc_enable; dev_priv->display.crtc_disable = i9xx_crtc_disable; - }else if (IS_G4X (dev_priv)) { - dev_priv->display.get_pipe_config = i9xx_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = g4x_crtc_compute_clock; - dev_priv->display.crtc_enable = i9xx_crtc_enable; - dev_priv->display.crtc_disable = i9xx_crtc_disable; - }else if (IS_PINEVIEW (dev_priv)) { - dev_priv->display.get_pipe_config = i9xx_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = pnv_crtc_compute_clock; - dev_priv->display.crtc_enable = i9xx_crtc_enable; - dev_priv->display.crtc_disable = i9xx_crtc_disable; - }else if (!IS_GEN (dev_priv,2 )) { - dev_priv->display.get_pipe_config = i9xx_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock; - dev_priv->display.crtc_enable = i9xx_crtc_enable; - dev_priv->display.crtc_disable = i9xx_crtc_disable; }else { dev_priv->display.get_pipe_config = i9xx_get_pipe_config; - dev_priv->display.get_initial_plane_config = - i9xx_get_initial_plane_config; - dev_priv->display.crtc_compute_clock = i8xx_crtc_compute_clock; dev_priv->display.crtc_enable = i9xx_crtc_enable; dev_priv->display.crtc_disable = i9xx_crtc_disable; }@@ -16552,10 +15177,13 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; } -if (INTEL_GEN (dev_priv) >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) { dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables; -else + dev_priv->display.get_initial_plane_config = skl_get_initial_plane_config; + }else { dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables; + dev_priv->display.get_initial_plane_config = i9xx_get_initial_plane_config; + } }drivers/gpu/drm/i915/display/intel_display.h +3
-0@@ -653,6 +653,9 @@ u32 intel_plane_compute_aligned_offset(int *x, int *y, int color_plane);int intel_plane_pin_fb (struct intel_plane_state *plane_state);void intel_plane_unpin_fb (struct intel_plane_state *old_plane_state); +struct intel_encoder * +intel_get_crtc_new_encoder (const struct intel_atomic_state *state, +const struct intel_crtc_state *crtc_state);/* modesetting */ void intel_modeset_init_hw (struct drm_i915_private *i915);drivers/gpu/drm/i915/display/intel_display_types.h +5
-0@@ -1811,4 +1811,9 @@ to_intel_frontbuffer(struct drm_framebuffer *fb) return fb ? to_intel_framebuffer(fb)->frontbuffer : NULL; } +static inline u32 i9xx_dpll_compute_fp (struct dpll *dpll) +{ +return dpll->n <<16 | dpll->m1 <<8 | dpll->m2; +} +#endif /* __INTEL_DISPLAY_TYPES_H__ */ drivers/gpu/drm/i915/display/intel_dpll.c new file +1371
-0@@ -0,0 +1,1371 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation +*/ +#include <linux/kernel.h> +#include "intel_display_types.h" +#include "intel_display.h" +#include "intel_dpll.h" +#include "intel_lvds.h" +#include "intel_panel.h" + +static bool intel_panel_use_ssc (struct drm_i915_private *dev_priv) +{ +if (dev_priv->params.panel_use_ssc >=0 ) +return dev_priv->params.panel_use_ssc !=0 ; +return dev_priv->vbt.lvds_use_ssc + && !(dev_priv->quirks &QUIRK_LVDS_SSC_DISABLE ); +} + +struct intel_limit { +struct { +int min, max; + } dot, vco, n, m, m1, m2, p, p1; + +struct { +int dot_limit; +int p2_slow, p2_fast; + } p2; +}; +static const struct intel_limit intel_limits_i8xx_dac = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =908000 , .max =1512000 }, + .n = { .min =2 , .max =16 }, + .m = { .min =96 , .max =140 }, + .m1 = { .min =18 , .max =26 }, + .m2 = { .min =6 , .max =16 }, + .p = { .min =4 , .max =128 }, + .p1 = { .min =2 , .max =33 }, + .p2 = { .dot_limit =165000 , + .p2_slow =4 , .p2_fast =2 }, +}; + +static const struct intel_limit intel_limits_i8xx_dvo = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =908000 , .max =1512000 }, + .n = { .min =2 , .max =16 }, + .m = { .min =96 , .max =140 }, + .m1 = { .min =18 , .max =26 }, + .m2 = { .min =6 , .max =16 }, + .p = { .min =4 , .max =128 }, + .p1 = { .min =2 , .max =33 }, + .p2 = { .dot_limit =165000 , + .p2_slow =4 , .p2_fast =4 }, +}; + +static const struct intel_limit intel_limits_i8xx_lvds = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =908000 , .max =1512000 }, + .n = { .min =2 , .max =16 }, + .m = { .min =96 , .max =140 }, + .m1 = { .min =18 , .max =26 }, + .m2 = { .min =6 , .max =16 }, + .p = { .min =4 , .max =128 }, + .p1 = { .min =1 , .max =6 }, + .p2 = { .dot_limit =165000 , + .p2_slow =14 , .p2_fast =7 }, +}; + +static const struct intel_limit intel_limits_i9xx_sdvo = { + .dot = { .min =20000 , .max =400000 }, + .vco = { .min =1400000 , .max =2800000 }, + .n = { .min =1 , .max =6 }, + .m = { .min =70 , .max =120 }, + .m1 = { .min =8 , .max =18 }, + .m2 = { .min =3 , .max =7 }, + .p = { .min =5 , .max =80 }, + .p1 = { .min =1 , .max =8 }, + .p2 = { .dot_limit =200000 , + .p2_slow =10 , .p2_fast =5 }, +}; + +static const struct intel_limit intel_limits_i9xx_lvds = { + .dot = { .min =20000 , .max =400000 }, + .vco = { .min =1400000 , .max =2800000 }, + .n = { .min =1 , .max =6 }, + .m = { .min =70 , .max =120 }, + .m1 = { .min =8 , .max =18 }, + .m2 = { .min =3 , .max =7 }, + .p = { .min =7 , .max =98 }, + .p1 = { .min =1 , .max =8 }, + .p2 = { .dot_limit =112000 , + .p2_slow =14 , .p2_fast =7 }, +}; + + +static const struct intel_limit intel_limits_g4x_sdvo = { + .dot = { .min =25000 , .max =270000 }, + .vco = { .min =1750000 , .max =3500000 }, + .n = { .min =1 , .max =4 }, + .m = { .min =104 , .max =138 }, + .m1 = { .min =17 , .max =23 }, + .m2 = { .min =5 , .max =11 }, + .p = { .min =10 , .max =30 }, + .p1 = { .min =1 , .max =3 }, + .p2 = { .dot_limit =270000 , + .p2_slow =10 , + .p2_fast =10 + }, +}; + +static const struct intel_limit intel_limits_g4x_hdmi = { + .dot = { .min =22000 , .max =400000 }, + .vco = { .min =1750000 , .max =3500000 }, + .n = { .min =1 , .max =4 }, + .m = { .min =104 , .max =138 }, + .m1 = { .min =16 , .max =23 }, + .m2 = { .min =5 , .max =11 }, + .p = { .min =5 , .max =80 }, + .p1 = { .min =1 , .max =8 }, + .p2 = { .dot_limit =165000 , + .p2_slow =10 , .p2_fast =5 }, +}; + +static const struct intel_limit intel_limits_g4x_single_channel_lvds = { + .dot = { .min =20000 , .max =115000 }, + .vco = { .min =1750000 , .max =3500000 }, + .n = { .min =1 , .max =3 }, + .m = { .min =104 , .max =138 }, + .m1 = { .min =17 , .max =23 }, + .m2 = { .min =5 , .max =11 }, + .p = { .min =28 , .max =112 }, + .p1 = { .min =2 , .max =8 }, + .p2 = { .dot_limit =0 , + .p2_slow =14 , .p2_fast =14 + }, +}; + +static const struct intel_limit intel_limits_g4x_dual_channel_lvds = { + .dot = { .min =80000 , .max =224000 }, + .vco = { .min =1750000 , .max =3500000 }, + .n = { .min =1 , .max =3 }, + .m = { .min =104 , .max =138 }, + .m1 = { .min =17 , .max =23 }, + .m2 = { .min =5 , .max =11 }, + .p = { .min =14 , .max =42 }, + .p1 = { .min =2 , .max =6 }, + .p2 = { .dot_limit =0 , + .p2_slow =7 , .p2_fast =7 + }, +}; + +static const struct intel_limit pnv_limits_sdvo = { + .dot = { .min =20000 , .max =400000 }, + .vco = { .min =1700000 , .max =3500000 }, +/* Pineview's Ncounter is a ring counter */ + .n = { .min =3 , .max =6 }, + .m = { .min =2 , .max =256 }, +/* Pineview only has one combined m divider, which we treat as m2. */ + .m1 = { .min =0 , .max =0 }, + .m2 = { .min =0 , .max =254 }, + .p = { .min =5 , .max =80 }, + .p1 = { .min =1 , .max =8 }, + .p2 = { .dot_limit =200000 , + .p2_slow =10 , .p2_fast =5 }, +}; + +static const struct intel_limit pnv_limits_lvds = { + .dot = { .min =20000 , .max =400000 }, + .vco = { .min =1700000 , .max =3500000 }, + .n = { .min =3 , .max =6 }, + .m = { .min =2 , .max =256 }, + .m1 = { .min =0 , .max =0 }, + .m2 = { .min =0 , .max =254 }, + .p = { .min =7 , .max =112 }, + .p1 = { .min =1 , .max =8 }, + .p2 = { .dot_limit =112000 , + .p2_slow =14 , .p2_fast =14 }, +}; + +/* Ironlake / Sandybridge +* +* We calculate clock using (register_value + 2) for N/M1/M2, so here +* the range value for them is (actual_value - 2). +*/ +static const struct intel_limit ilk_limits_dac = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =1760000 , .max =3510000 }, + .n = { .min =1 , .max =5 }, + .m = { .min =79 , .max =127 }, + .m1 = { .min =12 , .max =22 }, + .m2 = { .min =5 , .max =9 }, + .p = { .min =5 , .max =80 }, + .p1 = { .min =1 , .max =8 }, + .p2 = { .dot_limit =225000 , + .p2_slow =10 , .p2_fast =5 }, +}; + +static const struct intel_limit ilk_limits_single_lvds = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =1760000 , .max =3510000 }, + .n = { .min =1 , .max =3 }, + .m = { .min =79 , .max =118 }, + .m1 = { .min =12 , .max =22 }, + .m2 = { .min =5 , .max =9 }, + .p = { .min =28 , .max =112 }, + .p1 = { .min =2 , .max =8 }, + .p2 = { .dot_limit =225000 , + .p2_slow =14 , .p2_fast =14 }, +}; + +static const struct intel_limit ilk_limits_dual_lvds = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =1760000 , .max =3510000 }, + .n = { .min =1 , .max =3 }, + .m = { .min =79 , .max =127 }, + .m1 = { .min =12 , .max =22 }, + .m2 = { .min =5 , .max =9 }, + .p = { .min =14 , .max =56 }, + .p1 = { .min =2 , .max =8 }, + .p2 = { .dot_limit =225000 , + .p2_slow =7 , .p2_fast =7 }, +}; + +/* LVDS 100mhz refclk limits. */ +static const struct intel_limit ilk_limits_single_lvds_100m = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =1760000 , .max =3510000 }, + .n = { .min =1 , .max =2 }, + .m = { .min =79 , .max =126 }, + .m1 = { .min =12 , .max =22 }, + .m2 = { .min =5 , .max =9 }, + .p = { .min =28 , .max =112 }, + .p1 = { .min =2 , .max =8 }, + .p2 = { .dot_limit =225000 , + .p2_slow =14 , .p2_fast =14 }, +}; + +static const struct intel_limit ilk_limits_dual_lvds_100m = { + .dot = { .min =25000 , .max =350000 }, + .vco = { .min =1760000 , .max =3510000 }, + .n = { .min =1 , .max =3 }, + .m = { .min =79 , .max =126 }, + .m1 = { .min =12 , .max =22 }, + .m2 = { .min =5 , .max =9 }, + .p = { .min =14 , .max =42 }, + .p1 = { .min =2 , .max =6 }, + .p2 = { .dot_limit =225000 , + .p2_slow =7 , .p2_fast =7 }, +}; + +static const struct intel_limit intel_limits_vlv = { +/* +* These are the data rate limits (measured in fast clocks) +* since those are the strictest limits we have. The fast +* clock and actual rate limits are more relaxed, so checking +* them would make no difference. +*/ + .dot = { .min =25000 *5 , .max =270000 *5 }, + .vco = { .min =4000000 , .max =6000000 }, + .n = { .min =1 , .max =7 }, + .m1 = { .min =2 , .max =3 }, + .m2 = { .min =11 , .max =156 }, + .p1 = { .min =2 , .max =3 }, + .p2 = { .p2_slow =2 , .p2_fast =20 },/* slow=min, fast=max */ +}; + +static const struct intel_limit intel_limits_chv = { +/* +* These are the data rate limits (measured in fast clocks) +* since those are the strictest limits we have. The fast +* clock and actual rate limits are more relaxed, so checking +* them would make no difference. +*/ + .dot = { .min =25000 *5 , .max =540000 *5 }, + .vco = { .min =4800000 , .max =6480000 }, + .n = { .min =1 , .max =1 }, + .m1 = { .min =2 , .max =2 }, + .m2 = { .min =24 <<22 , .max =175 <<22 }, + .p1 = { .min =2 , .max =4 }, + .p2 = { .p2_slow =1 , .p2_fast =14 }, +}; + +static const struct intel_limit intel_limits_bxt = { +/* FIXME: find real dot limits */ + .dot = { .min =0 , .max =INT_MAX }, + .vco = { .min =4800000 , .max =6700000 }, + .n = { .min =1 , .max =1 }, + .m1 = { .min =2 , .max =2 }, +/* FIXME: find real m2 limits */ + .m2 = { .min =2 <<22 , .max =255 <<22 }, + .p1 = { .min =2 , .max =4 }, + .p2 = { .p2_slow =1 , .p2_fast =20 }, +}; + +/* +* Platform specific helpers to calculate the port PLL loopback- (clock.m), +* and post-divider (clock.p) values, pre- (clock.vco) and post-divided fast +* (clock.dot) clock rates. This fast dot clock is fed to the port's IO logic. +* The helpers' return value is the rate of the clock that is fed to the +* display engine's pipe which can be the above fast dot clock rate or a +* divided-down version of it. +*/ +/* m1 is reserved as 0 in Pineview, n is a ring counter */ +int pnv_calc_dpll_params (int refclk,struct dpll *clock) +{ + clock->m = clock->m2 +2 ; + clock->p = clock->p1 * clock->p2; +if (WARN_ON (clock->n ==0 || clock->p ==0 )) +return 0 ; + clock->vco =DIV_ROUND_CLOSEST (refclk * clock->m, clock->n); + clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); + +return clock->dot; +} + +static u32 i9xx_dpll_compute_m (struct dpll *dpll) +{ +return 5 * (dpll->m1 +2 ) + (dpll->m2 +2 ); +} + +int i9xx_calc_dpll_params (int refclk,struct dpll *clock) +{ + clock->m =i9xx_dpll_compute_m (clock); + clock->p = clock->p1 * clock->p2; +if (WARN_ON (clock->n +2 ==0 || clock->p ==0 )) +return 0 ; + clock->vco =DIV_ROUND_CLOSEST (refclk * clock->m, clock->n +2 ); + clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); + +return clock->dot; +} + +int vlv_calc_dpll_params (int refclk,struct dpll *clock) +{ + clock->m = clock->m1 * clock->m2; + clock->p = clock->p1 * clock->p2; +if (WARN_ON (clock->n ==0 || clock->p ==0 )) +return 0 ; + clock->vco =DIV_ROUND_CLOSEST (refclk * clock->m, clock->n); + clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); + +return clock->dot /5 ; +} + +int chv_calc_dpll_params (int refclk,struct dpll *clock) +{ + clock->m = clock->m1 * clock->m2; + clock->p = clock->p1 * clock->p2; +if (WARN_ON (clock->n ==0 || clock->p ==0 )) +return 0 ; + clock->vco =DIV_ROUND_CLOSEST_ULL (mul_u32_u32 (refclk, clock->m), + clock->n <<22 ); + clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p); + +return clock->dot /5 ; +} + +/* +* Returns whether the given set of divisors are valid for a given refclk with +* the given connectors. +*/ +static bool intel_pll_is_valid (struct drm_i915_private *dev_priv, +const struct intel_limit *limit, +const struct dpll *clock) +{ +if (clock->n < limit->n.min || limit->n.max < clock->n) +return false; +if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) +return false; +if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) +return false; +if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) +return false; + +if (!IS_PINEVIEW (dev_priv) && !IS_VALLEYVIEW (dev_priv) && + !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv)) +if (clock->m1 <= clock->m2) +return false; + +if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && + !IS_GEN9_LP (dev_priv)) { +if (clock->p < limit->p.min || limit->p.max < clock->p) +return false; +if (clock->m < limit->m.min || limit->m.max < clock->m) +return false; + } + +if (clock->vco < limit->vco.min || limit->vco.max < clock->vco) +return false; +/* XXX: We may need to be checking "Dot clock" depending on the multiplier, +* connector, etc., rather than just a single range. +*/ +if (clock->dot < limit->dot.min || limit->dot.max < clock->dot) +return false; + +return true; +} + +static int +i9xx_select_p2_div (const struct intel_limit *limit, +const struct intel_crtc_state *crtc_state, +int target) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) { +/* +* For LVDS just rely on its current settings for dual-channel. +* We haven't figured out how to reliably set up different +* single/dual channel state, if we even can. +*/ +if (intel_is_dual_link_lvds (dev_priv)) +return limit->p2.p2_fast; +else +return limit->p2.p2_slow; + }else { +if (target < limit->p2.dot_limit) +return limit->p2.p2_slow; +else +return limit->p2.p2_fast; + } +} + +/* +* Returns a set of divisors for the desired target clock with the given +* refclk, or FALSE. The returned values represent the clock equation: +* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. +* +* Target and reference clocks are specified in kHz. +* +* If match_clock is provided, then best_clock P divider must match the P +* divider from @match_clock used for LVDS downclocking. +*/ +static bool +i9xx_find_best_dpll (const struct intel_limit *limit, +struct intel_crtc_state *crtc_state, +int target,int refclk,struct dpll *match_clock, +struct dpll *best_clock) +{ +struct drm_device *dev = crtc_state->uapi.crtc->dev; +struct dpll clock; +int err = target; + +memset (best_clock,0 ,sizeof (*best_clock)); + + clock.p2 =i9xx_select_p2_div (limit, crtc_state, target); + +for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; + clock.m1++) { +for (clock.m2 = limit->m2.min; + clock.m2 <= limit->m2.max; clock.m2++) { +if (clock.m2 >= clock.m1) +break ; +for (clock.n = limit->n.min; + clock.n <= limit->n.max; clock.n++) { +for (clock.p1 = limit->p1.min; + clock.p1 <= limit->p1.max; clock.p1++) { +int this_err; + +i9xx_calc_dpll_params (refclk, &clock); +if (!intel_pll_is_valid (to_i915 (dev), + limit, + &clock)) +continue ; +if (match_clock && + clock.p != match_clock->p) +continue ; + + this_err =abs (clock.dot - target); +if (this_err < err) { + *best_clock = clock; + err = this_err; + } + } + } + } + } + +return (err != target); +} + +/* +* Returns a set of divisors for the desired target clock with the given +* refclk, or FALSE. The returned values represent the clock equation: +* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. +* +* Target and reference clocks are specified in kHz. +* +* If match_clock is provided, then best_clock P divider must match the P +* divider from @match_clock used for LVDS downclocking. +*/ +static bool +pnv_find_best_dpll (const struct intel_limit *limit, +struct intel_crtc_state *crtc_state, +int target,int refclk,struct dpll *match_clock, +struct dpll *best_clock) +{ +struct drm_device *dev = crtc_state->uapi.crtc->dev; +struct dpll clock; +int err = target; + +memset (best_clock,0 ,sizeof (*best_clock)); + + clock.p2 =i9xx_select_p2_div (limit, crtc_state, target); + +for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; + clock.m1++) { +for (clock.m2 = limit->m2.min; + clock.m2 <= limit->m2.max; clock.m2++) { +for (clock.n = limit->n.min; + clock.n <= limit->n.max; clock.n++) { +for (clock.p1 = limit->p1.min; + clock.p1 <= limit->p1.max; clock.p1++) { +int this_err; + +pnv_calc_dpll_params (refclk, &clock); +if (!intel_pll_is_valid (to_i915 (dev), + limit, + &clock)) +continue ; +if (match_clock && + clock.p != match_clock->p) +continue ; + + this_err =abs (clock.dot - target); +if (this_err < err) { + *best_clock = clock; + err = this_err; + } + } + } + } + } + +return (err != target); +} + +/* +* Returns a set of divisors for the desired target clock with the given +* refclk, or FALSE. The returned values represent the clock equation: +* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. +* +* Target and reference clocks are specified in kHz. +* +* If match_clock is provided, then best_clock P divider must match the P +* divider from @match_clock used for LVDS downclocking. +*/ +static bool +g4x_find_best_dpll (const struct intel_limit *limit, +struct intel_crtc_state *crtc_state, +int target,int refclk,struct dpll *match_clock, +struct dpll *best_clock) +{ +struct drm_device *dev = crtc_state->uapi.crtc->dev; +struct dpll clock; +int max_n; +bool found = false; +/* approximately equals target * 0.00585 */ +int err_most = (target >>8 ) + (target >>9 ); + +memset (best_clock,0 ,sizeof (*best_clock)); + + clock.p2 =i9xx_select_p2_div (limit, crtc_state, target); + + max_n = limit->n.max; +/* based on hardware requirement, prefer smaller n to precision */ +for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { +/* based on hardware requirement, prefere larger m1,m2 */ +for (clock.m1 = limit->m1.max; + clock.m1 >= limit->m1.min; clock.m1--) { +for (clock.m2 = limit->m2.max; + clock.m2 >= limit->m2.min; clock.m2--) { +for (clock.p1 = limit->p1.max; + clock.p1 >= limit->p1.min; clock.p1--) { +int this_err; + +i9xx_calc_dpll_params (refclk, &clock); +if (!intel_pll_is_valid (to_i915 (dev), + limit, + &clock)) +continue ; + + this_err =abs (clock.dot - target); +if (this_err < err_most) { + *best_clock = clock; + err_most = this_err; + max_n = clock.n; + found = true; + } + } + } + } + } +return found; +} + +/* +* Check if the calculated PLL configuration is more optimal compared to the +* best configuration and error found so far. Return the calculated error. +*/ +static bool vlv_PLL_is_optimal (struct drm_device *dev,int target_freq, +const struct dpll *calculated_clock, +const struct dpll *best_clock, +unsigned int best_error_ppm, +unsigned int *error_ppm) +{ +/* +* For CHV ignore the error and consider only the P value. +* Prefer a bigger P value based on HW requirements. +*/ +if (IS_CHERRYVIEW (to_i915 (dev))) { + *error_ppm =0 ; + +return calculated_clock->p > best_clock->p; + } + +if (drm_WARN_ON_ONCE (dev, !target_freq)) +return false; + + *error_ppm =div_u64 (1000000ULL * +abs (target_freq - calculated_clock->dot), + target_freq); +/* +* Prefer a better P value over a better (smaller) error if the error +* is small. Ensure this preference for future configurations too by +* setting the error to 0. +*/ +if (*error_ppm <100 && calculated_clock->p > best_clock->p) { + *error_ppm =0 ; + +return true; + } + +return *error_ppm +10 < best_error_ppm; +} + +/* +* Returns a set of divisors for the desired target clock with the given +* refclk, or FALSE. The returned values represent the clock equation: +* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. +*/ +static bool +vlv_find_best_dpll (const struct intel_limit *limit, +struct intel_crtc_state *crtc_state, +int target,int refclk,struct dpll *match_clock, +struct dpll *best_clock) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +struct drm_device *dev = crtc->base.dev; +struct dpll clock; +unsigned int bestppm =1000000 ; +/* min update 19.2 MHz */ +int max_n =min (limit->n.max, refclk /19200 ); +bool found = false; + + target *=5 ;/* fast clock */ + +memset (best_clock,0 ,sizeof (*best_clock)); + +/* based on hardware requirement, prefer smaller n to precision */ +for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { +for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) { +for (clock.p2 = limit->p2.p2_fast; clock.p2 >= limit->p2.p2_slow; + clock.p2 -= clock.p2 >10 ?2 :1 ) { + clock.p = clock.p1 * clock.p2; +/* based on hardware requirement, prefer bigger m1,m2 values */ +for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) { +unsigned int ppm; + + clock.m2 =DIV_ROUND_CLOSEST (target * clock.p * clock.n, + refclk * clock.m1); + +vlv_calc_dpll_params (refclk, &clock); + +if (!intel_pll_is_valid (to_i915 (dev), + limit, + &clock)) +continue ; + +if (!vlv_PLL_is_optimal (dev, target, + &clock, + best_clock, + bestppm, &ppm)) +continue ; + + *best_clock = clock; + bestppm = ppm; + found = true; + } + } + } + } + +return found; +} + +/* +* Returns a set of divisors for the desired target clock with the given +* refclk, or FALSE. The returned values represent the clock equation: +* reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2. +*/ +static bool +chv_find_best_dpll (const struct intel_limit *limit, +struct intel_crtc_state *crtc_state, +int target,int refclk,struct dpll *match_clock, +struct dpll *best_clock) +{ +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +struct drm_device *dev = crtc->base.dev; +unsigned int best_error_ppm; +struct dpll clock; +u64 m2; +int found = false; + +memset (best_clock,0 ,sizeof (*best_clock)); + best_error_ppm =1000000 ; + +/* +* Based on hardware doc, the n always set to 1, and m1 always +* set to 2. If requires to support 200Mhz refclk, we need to +* revisit this because n may not 1 anymore. +*/ + clock.n =1 ; + clock.m1 =2 ; + target *=5 ;/* fast clock */ + +for (clock.p1 = limit->p1.max; clock.p1 >= limit->p1.min; clock.p1--) { +for (clock.p2 = limit->p2.p2_fast; + clock.p2 >= limit->p2.p2_slow; + clock.p2 -= clock.p2 >10 ?2 :1 ) { +unsigned int error_ppm; + + clock.p = clock.p1 * clock.p2; + + m2 =DIV_ROUND_CLOSEST_ULL (mul_u32_u32 (target, clock.p * clock.n) <<22 , + refclk * clock.m1); + +if (m2 >INT_MAX /clock.m1) +continue ; + + clock.m2 = m2; + +chv_calc_dpll_params (refclk, &clock); + +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock)) +continue ; + +if (!vlv_PLL_is_optimal (dev, target, &clock, best_clock, + best_error_ppm, &error_ppm)) +continue ; + + *best_clock = clock; + best_error_ppm = error_ppm; + found = true; + } + } + +return found; +} + +bool bxt_find_best_dpll (struct intel_crtc_state *crtc_state, +struct dpll *best_clock) +{ +int refclk =100000 ; +const struct intel_limit *limit = &intel_limits_bxt; + +return chv_find_best_dpll (limit, crtc_state, + crtc_state->port_clock, refclk, +NULL , best_clock); +} + +static u32 pnv_dpll_compute_fp (struct dpll *dpll) +{ +return (1 << dpll->n) <<16 | dpll->m2; +} + +static void i9xx_update_pll_dividers (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct dpll *reduced_clock) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +u32 fp, fp2 =0 ; + +if (IS_PINEVIEW (dev_priv)) { + fp =pnv_dpll_compute_fp (&crtc_state->dpll); +if (reduced_clock) + fp2 =pnv_dpll_compute_fp (reduced_clock); + }else { + fp =i9xx_dpll_compute_fp (&crtc_state->dpll); +if (reduced_clock) + fp2 =i9xx_dpll_compute_fp (reduced_clock); + } + + crtc_state->dpll_hw_state.fp0 = fp; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && + reduced_clock) { + crtc_state->dpll_hw_state.fp1 = fp2; + }else { + crtc_state->dpll_hw_state.fp1 = fp; + } +} + +static void i9xx_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct dpll *reduced_clock) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +u32 dpll; +struct dpll *clock = &crtc_state->dpll; + +i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock); + + dpll =DPLL_VGA_MODE_DIS ; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) + dpll |=DPLLB_MODE_LVDS ; +else + dpll |=DPLLB_MODE_DAC_SERIAL ; + +if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) || +IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) { + dpll |= (crtc_state->pixel_multiplier -1 ) + <<SDVO_MULTIPLIER_SHIFT_HIRES ; + } + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO ) || +intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) + dpll |=DPLL_SDVO_HIGH_SPEED ; + +if (intel_crtc_has_dp_encoder (crtc_state)) + dpll |=DPLL_SDVO_HIGH_SPEED ; + +/* compute bitmask from p1 value */ +if (IS_PINEVIEW (dev_priv)) + dpll |= (1 << (clock->p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT_PINEVIEW ; +else { + dpll |= (1 << (clock->p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; +if (IS_G4X (dev_priv) && reduced_clock) + dpll |= (1 << (reduced_clock->p1 -1 )) <<DPLL_FPA1_P1_POST_DIV_SHIFT ; + } +switch (clock->p2) { +case 5 : + dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 ; +break ; +case 7 : + dpll |=DPLLB_LVDS_P2_CLOCK_DIV_7 ; +break ; +case 10 : + dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_10 ; +break ; +case 14 : + dpll |=DPLLB_LVDS_P2_CLOCK_DIV_14 ; +break ; + } +if (INTEL_GEN (dev_priv) >=4 ) + dpll |= (6 <<PLL_LOAD_PULSE_PHASE_SHIFT ); + +if (crtc_state->sdvo_tv_clock) + dpll |=PLL_REF_INPUT_TVCLKINBC ; +else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && +intel_panel_use_ssc (dev_priv)) + dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ; +else + dpll |=PLL_REF_INPUT_DREFCLK ; + + dpll |=DPLL_VCO_ENABLE ; + crtc_state->dpll_hw_state.dpll = dpll; + +if (INTEL_GEN (dev_priv) >=4 ) { +u32 dpll_md = (crtc_state->pixel_multiplier -1 ) + <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; + crtc_state->dpll_hw_state.dpll_md = dpll_md; + } +} + +static void i8xx_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct dpll *reduced_clock) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +u32 dpll; +struct dpll *clock = &crtc_state->dpll; + +i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock); + + dpll =DPLL_VGA_MODE_DIS ; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) { + dpll |= (1 << (clock->p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; + }else { +if (clock->p1 ==2 ) + dpll |=PLL_P1_DIVIDE_BY_TWO ; +else + dpll |= (clock->p1 -2 ) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; +if (clock->p2 ==4 ) + dpll |=PLL_P2_DIVIDE_BY_4 ; + } + +/* +* Bspec: +* "[Almador Errata}: For the correct operation of the muxed DVO pins +* (GDEVSELB/I2Cdata, GIRDBY/I2CClk) and (GFRAMEB/DVI_Data, +* GTRDYB/DVI_Clk): Bit 31 (DPLL VCO Enable) and Bit 30 (2X Clock +* Enable) must be set to “1” in both the DPLL A Control Register +* (06014h-06017h) and DPLL B Control Register (06018h-0601Bh)." +* +* For simplicity We simply keep both bits always enabled in +* both DPLLS. The spec says we should disable the DVO 2X clock +* when not needed, but this seems to work fine in practice. +*/ +if (IS_I830 (dev_priv) || +intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DVO )) + dpll |=DPLL_DVO_2X_MODE ; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && +intel_panel_use_ssc (dev_priv)) + dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ; +else + dpll |=PLL_REF_INPUT_DREFCLK ; + + dpll |=DPLL_VCO_ENABLE ; + crtc_state->dpll_hw_state.dpll = dpll; +} + +static int hsw_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_atomic_state *state = +to_intel_atomic_state (crtc_state->uapi.state); + +if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ) || +INTEL_GEN (dev_priv) >=11 ) { +struct intel_encoder *encoder = +intel_get_crtc_new_encoder (state, crtc_state); + +if (!intel_reserve_shared_dplls (state, crtc, encoder)) { +drm_dbg_kms (&dev_priv->drm, +"failed to find PLL for pipe %c\n" , +pipe_name (crtc->pipe)); +return -EINVAL ; + } + } + +return 0 ; +} + +static bool ilk_needs_fb_cb_tune (struct dpll *dpll,int factor) +{ +return i9xx_dpll_compute_m (dpll) < factor * dpll->n; +} + + +static void ilk_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state, +struct dpll *reduced_clock) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +u32 dpll, fp, fp2; +int factor; + +/* Enable autotuning of the PLL clock (if permissible) */ + 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 ) || + (HAS_PCH_IBX (dev_priv) && +intel_is_dual_link_lvds (dev_priv))) + factor =25 ; + }else if (crtc_state->sdvo_tv_clock) { + factor =20 ; + } + + fp =i9xx_dpll_compute_fp (&crtc_state->dpll); + +if (ilk_needs_fb_cb_tune (&crtc_state->dpll, factor)) + fp |=FP_CB_TUNE ; + +if (reduced_clock) { + fp2 =i9xx_dpll_compute_fp (reduced_clock); + +if (reduced_clock->m < factor * reduced_clock->n) + fp2 |=FP_CB_TUNE ; + }else { + fp2 = fp; + } + + dpll =0 ; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) + dpll |=DPLLB_MODE_LVDS ; +else + dpll |=DPLLB_MODE_DAC_SERIAL ; + + dpll |= (crtc_state->pixel_multiplier -1 ) + <<PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT ; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO ) || +intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) + dpll |=DPLL_SDVO_HIGH_SPEED ; + +if (intel_crtc_has_dp_encoder (crtc_state)) + dpll |=DPLL_SDVO_HIGH_SPEED ; + +/* +* The high speed IO clock is only really required for +* SDVO/HDMI/DP, but we also enable it for CRT to make it +* possible to share the DPLL between CRT and HDMI. Enabling +* the clock needlessly does no real harm, except use up a +* bit of power potentially. +* +* We'll limit this to IVB with 3 pipes, since it has only two +* DPLLs and so DPLL sharing is the only way to get three pipes +* driving PCH ports at the same time. On SNB we could do this, +* and potentially avoid enabling the second DPLL, but it's not +* clear if it''s a win or loss power wise. No point in doing +* this on ILK at all since it has a fixed DPLL<->pipe mapping. +*/ +if (INTEL_NUM_PIPES (dev_priv) ==3 && +intel_crtc_has_type (crtc_state,INTEL_OUTPUT_ANALOG )) + dpll |=DPLL_SDVO_HIGH_SPEED ; + +/* compute bitmask from p1 value */ + dpll |= (1 << (crtc_state->dpll.p1 -1 )) <<DPLL_FPA01_P1_POST_DIV_SHIFT ; +/* also FPA1 */ + dpll |= (1 << (crtc_state->dpll.p1 -1 )) <<DPLL_FPA1_P1_POST_DIV_SHIFT ; + +switch (crtc_state->dpll.p2) { +case 5 : + dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 ; +break ; +case 7 : + dpll |=DPLLB_LVDS_P2_CLOCK_DIV_7 ; +break ; +case 10 : + dpll |=DPLL_DAC_SERIAL_P2_CLOCK_DIV_10 ; +break ; +case 14 : + dpll |=DPLLB_LVDS_P2_CLOCK_DIV_14 ; +break ; + } + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS ) && +intel_panel_use_ssc (dev_priv)) + dpll |=PLLB_REF_INPUT_SPREADSPECTRUMIN ; +else + dpll |=PLL_REF_INPUT_DREFCLK ; + + dpll |=DPLL_VCO_ENABLE ; + + crtc_state->dpll_hw_state.dpll = dpll; + crtc_state->dpll_hw_state.fp0 = fp; + crtc_state->dpll_hw_state.fp1 = fp2; +} + +static int ilk_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_atomic_state *state = +to_intel_atomic_state (crtc_state->uapi.state); +const struct intel_limit *limit; +int refclk =120000 ; + +memset (&crtc_state->dpll_hw_state,0 , +sizeof (crtc_state->dpll_hw_state)); + +/* CPU eDP is the only output that doesn't need a PCH PLL of its own. */ +if (!crtc_state->has_pch_encoder) +return 0 ; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) { +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; + } + +if (intel_is_dual_link_lvds (dev_priv)) { +if (refclk ==100000 ) + limit = &ilk_limits_dual_lvds_100m; +else + limit = &ilk_limits_dual_lvds; + }else { +if (refclk ==100000 ) + limit = &ilk_limits_single_lvds_100m; +else + limit = &ilk_limits_single_lvds; + } + }else { + limit = &ilk_limits_dac; + } + +if (!crtc_state->clock_set && + !g4x_find_best_dpll (limit, crtc_state, crtc_state->port_clock, + refclk,NULL , &crtc_state->dpll)) { +drm_err (&dev_priv->drm, +"Couldn't find PLL settings for mode!\n" ); +return -EINVAL ; + } + +ilk_compute_dpll (crtc, crtc_state,NULL ); + +if (!intel_reserve_shared_dplls (state, crtc,NULL )) { +drm_dbg_kms (&dev_priv->drm, +"failed to find PLL for pipe %c\n" , +pipe_name (crtc->pipe)); +return -EINVAL ; + } + +return 0 ; +} + +void vlv_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) +{ + pipe_config->dpll_hw_state.dpll =DPLL_INTEGRATED_REF_CLK_VLV | +DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; +if (crtc->pipe !=PIPE_A ) + pipe_config->dpll_hw_state.dpll |=DPLL_INTEGRATED_CRI_CLK_VLV ; + +/* DPLL not used with DSI, but still need the rest set up */ +if (!intel_crtc_has_type (pipe_config,INTEL_OUTPUT_DSI )) + pipe_config->dpll_hw_state.dpll |=DPLL_VCO_ENABLE | +DPLL_EXT_BUFFER_ENABLE_VLV ; + + pipe_config->dpll_hw_state.dpll_md = + (pipe_config->pixel_multiplier -1 ) <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; +} + +void chv_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) +{ + pipe_config->dpll_hw_state.dpll =DPLL_SSC_REF_CLK_CHV | +DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; +if (crtc->pipe !=PIPE_A ) + pipe_config->dpll_hw_state.dpll |=DPLL_INTEGRATED_CRI_CLK_VLV ; + +/* DPLL not used with DSI, but still need the rest set up */ +if (!intel_crtc_has_type (pipe_config,INTEL_OUTPUT_DSI )) + pipe_config->dpll_hw_state.dpll |=DPLL_VCO_ENABLE ; + + pipe_config->dpll_hw_state.dpll_md = + (pipe_config->pixel_multiplier -1 ) <<DPLL_MD_UDI_MULTIPLIER_SHIFT ; +} + +static int chv_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +int refclk =100000 ; +const struct intel_limit *limit = &intel_limits_chv; +struct drm_i915_private *i915 =to_i915 (crtc_state->uapi.crtc->dev); + +memset (&crtc_state->dpll_hw_state,0 , +sizeof (crtc_state->dpll_hw_state)); + +if (!crtc_state->clock_set && + !chv_find_best_dpll (limit, crtc_state, crtc_state->port_clock, + refclk,NULL , &crtc_state->dpll)) { +drm_err (&i915->drm,"Couldn't find PLL settings for mode!\n" ); +return -EINVAL ; + } + +chv_compute_dpll (crtc, crtc_state); + +return 0 ; +} + +static int vlv_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +int refclk =100000 ; +const struct intel_limit *limit = &intel_limits_vlv; +struct drm_i915_private *i915 =to_i915 (crtc_state->uapi.crtc->dev); + +memset (&crtc_state->dpll_hw_state,0 , +sizeof (crtc_state->dpll_hw_state)); + +if (!crtc_state->clock_set && + !vlv_find_best_dpll (limit, crtc_state, crtc_state->port_clock, + refclk,NULL , &crtc_state->dpll)) { +drm_err (&i915->drm,"Couldn't find PLL settings for mode!\n" ); +return -EINVAL ; + } + +vlv_compute_dpll (crtc, crtc_state); + +return 0 ; +} + +static int g4x_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +const struct intel_limit *limit; +int refclk =96000 ; + +memset (&crtc_state->dpll_hw_state,0 , +sizeof (crtc_state->dpll_hw_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; +drm_dbg_kms (&dev_priv->drm, +"using SSC reference clock of %d kHz\n" , + refclk); + } + +if (intel_is_dual_link_lvds (dev_priv)) + limit = &intel_limits_g4x_dual_channel_lvds; +else + limit = &intel_limits_g4x_single_channel_lvds; + }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI ) || +intel_crtc_has_type (crtc_state,INTEL_OUTPUT_ANALOG )) { + limit = &intel_limits_g4x_hdmi; + }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO )) { + limit = &intel_limits_g4x_sdvo; + }else { +/* The option is for other outputs */ + limit = &intel_limits_i9xx_sdvo; + } + +if (!crtc_state->clock_set && + !g4x_find_best_dpll (limit, crtc_state, crtc_state->port_clock, + refclk,NULL , &crtc_state->dpll)) { +drm_err (&dev_priv->drm, +"Couldn't find PLL settings for mode!\n" ); +return -EINVAL ; + } + +i9xx_compute_dpll (crtc, crtc_state,NULL ); + +return 0 ; +} + +static int pnv_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +const struct intel_limit *limit; +int refclk =96000 ; + +memset (&crtc_state->dpll_hw_state,0 , +sizeof (crtc_state->dpll_hw_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; +drm_dbg_kms (&dev_priv->drm, +"using SSC reference clock of %d kHz\n" , + refclk); + } + + limit = &pnv_limits_lvds; + }else { + limit = &pnv_limits_sdvo; + } + +if (!crtc_state->clock_set && + !pnv_find_best_dpll (limit, crtc_state, crtc_state->port_clock, + refclk,NULL , &crtc_state->dpll)) { +drm_err (&dev_priv->drm, +"Couldn't find PLL settings for mode!\n" ); +return -EINVAL ; + } + +i9xx_compute_dpll (crtc, crtc_state,NULL ); + +return 0 ; +} + +static int i9xx_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +const struct intel_limit *limit; +int refclk =96000 ; + +memset (&crtc_state->dpll_hw_state,0 , +sizeof (crtc_state->dpll_hw_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; +drm_dbg_kms (&dev_priv->drm, +"using SSC reference clock of %d kHz\n" , + refclk); + } + + limit = &intel_limits_i9xx_lvds; + }else { + limit = &intel_limits_i9xx_sdvo; + } + +if (!crtc_state->clock_set && + !i9xx_find_best_dpll (limit, crtc_state, crtc_state->port_clock, + refclk,NULL , &crtc_state->dpll)) { +drm_err (&dev_priv->drm, +"Couldn't find PLL settings for mode!\n" ); +return -EINVAL ; + } + +i9xx_compute_dpll (crtc, crtc_state,NULL ); + +return 0 ; +} + +static int i8xx_crtc_compute_clock (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +const struct intel_limit *limit; +int refclk =48000 ; + +memset (&crtc_state->dpll_hw_state,0 , +sizeof (crtc_state->dpll_hw_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; +drm_dbg_kms (&dev_priv->drm, +"using SSC reference clock of %d kHz\n" , + refclk); + } + + limit = &intel_limits_i8xx_lvds; + }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DVO )) { + limit = &intel_limits_i8xx_dvo; + }else { + limit = &intel_limits_i8xx_dac; + } + +if (!crtc_state->clock_set && + !i9xx_find_best_dpll (limit, crtc_state, crtc_state->port_clock, + refclk,NULL , &crtc_state->dpll)) { +drm_err (&dev_priv->drm, +"Couldn't find PLL settings for mode!\n" ); +return -EINVAL ; + } + +i8xx_compute_dpll (crtc, crtc_state,NULL ); + +return 0 ; +} + +void +intel_dpll_init_clock_hook (struct drm_i915_private *dev_priv) +{ +if (INTEL_GEN (dev_priv) >=9 ||HAS_DDI (dev_priv)) + dev_priv->display.crtc_compute_clock = hsw_crtc_compute_clock; +else if (HAS_PCH_SPLIT (dev_priv)) + dev_priv->display.crtc_compute_clock = ilk_crtc_compute_clock; +else if (IS_CHERRYVIEW (dev_priv)) + dev_priv->display.crtc_compute_clock = chv_crtc_compute_clock; +else if (IS_VALLEYVIEW (dev_priv)) + dev_priv->display.crtc_compute_clock = vlv_crtc_compute_clock; +else if (IS_G4X (dev_priv)) + dev_priv->display.crtc_compute_clock = g4x_crtc_compute_clock; +else if (IS_PINEVIEW (dev_priv)) + dev_priv->display.crtc_compute_clock = pnv_crtc_compute_clock; +else if (!IS_GEN (dev_priv,2 )) + dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock; +else + dev_priv->display.crtc_compute_clock = i8xx_crtc_compute_clock; +}drivers/gpu/drm/i915/display/intel_dpll.h new file +22
-0@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_DPLL_H_ +#define _INTEL_DPLL_H_ + +struct dpll ; +struct intel_crtc ; +struct intel_crtc_state ; + +void intel_dpll_init_clock_hook (struct drm_i915_private *dev_priv); +int vlv_calc_dpll_params (int refclk,struct dpll *clock); +int pnv_calc_dpll_params (int refclk,struct dpll *clock); +int i9xx_calc_dpll_params (int refclk,struct dpll *clock); +void vlv_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config); +void chv_compute_dpll (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config); + +#endif
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 7/11 drm/i915: split fdi code out from intel_display.c
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
This just refactors out the fdi code to a separate file.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 685 +----------------- .../drm/i915/display/intel_display_types.h | 9 + drivers/gpu/drm/i915/display/intel_fdi.c | 683 +++++++++++++++++ drivers/gpu/drm/i915/display/intel_fdi.h | 21 + 5 files changed, 717 insertions(+), 682 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.c create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -206,6 +206,7 @@ i915-y += \ display/intel_dpll_mgr.o \ display/intel_dsb.o \ display/intel_fbc.o \ + display/intel_fdi.o \ display/intel_fifo_underrun.o \ display/intel_frontbuffer.o \ display/intel_global_state.o \
drivers/gpu/drm/i915/display/intel_display.c +3 -682
721 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_types.h +9 -0
@@ -1816,4 +1816,13 @@ static inline u32 i9xx_dpll_compute_fp(struct dpll *dpll) return dpll->n << 16 | dpll->m1 << 8 | dpll->m2; } +static inline u32 intel_fdi_link_freq (struct drm_i915_private *dev_priv, +const struct intel_crtc_state *pipe_config) +{ +if (HAS_DDI (dev_priv)) +return pipe_config->port_clock;/* SPLL */ +else +return dev_priv->fdi_pll_freq; +} +#endif /* __INTEL_DISPLAY_TYPES_H__ */
drivers/gpu/drm/i915/display/intel_fdi.c new file +683 -0
683 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_fdi.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_FDI_H_ +#define _INTEL_FDI_H_ + +struct intel_crtc ; +struct intel_crtc_state ; + +#define I915_DISPLAY_CONFIG_RETRY 1 +int ilk_fdi_compute_config (struct intel_crtc *intel_crtc, +struct intel_crtc_state *pipe_config); +void intel_fdi_normal_train (struct intel_crtc *crtc); +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); + +#endif
Signature · 6 lines
2.27.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 07/11] drm/i915: split fdi code out from intel_display.c
Quoted 3 lines · Dave Airlie
From: Dave Airlie <[email protected]>
This just refactors out the fdi code to a separate file.
LGTM, save for another header fix that I made locally. ;)
See CONFIG_DRM_I915_WERROR=y for what we do in CI to keep stuff clean.
BR,
Jani.
Quoted 1,489 lines
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 685 +----------------- .../drm/i915/display/intel_display_types.h | 9 + drivers/gpu/drm/i915/display/intel_fdi.c | 683 +++++++++++++++++ drivers/gpu/drm/i915/display/intel_fdi.h | 21 + 5 files changed, 717 insertions(+), 682 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.c create mode 100644 drivers/gpu/drm/i915/display/intel_fdi.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -206,6 +206,7 @@ i915-y += \ display/intel_dpll_mgr.o \ display/intel_dsb.o \ display/intel_fbc.o \ + display/intel_fdi.o \ display/intel_fifo_underrun.o \ display/intel_frontbuffer.o \ display/intel_global_state.o \drivers/gpu/drm/i915/display/intel_display.c +3
-682@@ -74,6 +74,7 @@#include "intel_display_types.h" #include "intel_dp_link_training.h" #include "intel_fbc.h" +#include "intel_fdi.h" #include "intel_fbdev.h" #include "intel_fifo_underrun.h" #include "intel_frontbuffer.h" @@ -172,16 +173,6 @@ static void intel_update_czclk(struct drm_i915_private *dev_priv) dev_priv->czclk_freq); } -/* units of 100MHz */ -static u32 intel_fdi_link_freq (struct drm_i915_private *dev_priv, -const struct intel_crtc_state *pipe_config) -{ -if (HAS_DDI (dev_priv)) -return pipe_config->port_clock;/* SPLL */ -else -return dev_priv->fdi_pll_freq; -} -/* WA Display #0827: Gen9:all */ static void skl_wa_827 (struct drm_i915_private *dev_priv,enum pipe pipe,bool enable)@@ -3766,532 +3757,6 @@ static void icl_set_pipe_chicken(struct intel_crtc *crtc)intel_de_write (dev_priv,PIPE_CHICKEN (pipe), tmp); } -static void intel_fdi_normal_train (struct intel_crtc *crtc) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = crtc->pipe; -i915_reg_t reg; -u32 temp; - -/* enable normal train */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -if (IS_IVYBRIDGE (dev_priv)) { - temp &= ~FDI_LINK_TRAIN_NONE_IVB ; - temp |=FDI_LINK_TRAIN_NONE_IVB |FDI_TX_ENHANCE_FRAME_ENABLE ; - }else { - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_NONE |FDI_TX_ENHANCE_FRAME_ENABLE ; - } -intel_de_write (dev_priv, reg, temp); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -if (HAS_PCH_CPT (dev_priv)) { - temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; - temp |=FDI_LINK_TRAIN_NORMAL_CPT ; - }else { - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_NONE ; - } -intel_de_write (dev_priv, reg, temp |FDI_RX_ENHANCE_FRAME_ENABLE ); - -/* wait one idle pattern time */ -intel_de_posting_read (dev_priv, reg); -udelay (1000 ); - -/* IVB wants error correction enabled */ -if (IS_IVYBRIDGE (dev_priv)) -intel_de_write (dev_priv, reg, -intel_de_read (dev_priv, reg) |FDI_FS_ERRC_ENABLE |FDI_FE_ERRC_ENABLE ); -} - -/* The FDI link training functions for ILK/Ibexpeak. */ -static void ilk_fdi_link_train (struct intel_crtc *crtc, -const struct intel_crtc_state *crtc_state) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = crtc->pipe; -i915_reg_t reg; -u32 temp, tries; - -/* FDI needs bits from pipe first */ -assert_pipe_enabled (dev_priv, crtc_state->cpu_transcoder); - -/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit -for train result */ - reg =FDI_RX_IMR (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_RX_SYMBOL_LOCK ; - temp &= ~FDI_RX_BIT_LOCK ; -intel_de_write (dev_priv, reg, temp); -intel_de_read (dev_priv, reg); -udelay (150 ); - -/* enable CPU FDI TX and PCH FDI RX */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_1 ; -intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_1 ; -intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); - -intel_de_posting_read (dev_priv, reg); -udelay (150 ); - -/* Ironlake workaround, enable clock pointer after FDI enable*/ -intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), -FDI_RX_PHASE_SYNC_POINTER_OVR ); -intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), -FDI_RX_PHASE_SYNC_POINTER_OVR |FDI_RX_PHASE_SYNC_POINTER_EN ); - - reg =FDI_RX_IIR (pipe); -for (tries =0 ; tries <5 ; tries++) { - temp =intel_de_read (dev_priv, reg); -drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); - -if ((temp &FDI_RX_BIT_LOCK )) { -drm_dbg_kms (&dev_priv->drm,"FDI train 1 done.\n" ); -intel_de_write (dev_priv, reg, temp |FDI_RX_BIT_LOCK ); -break ; - } - } -if (tries ==5 ) -drm_err (&dev_priv->drm,"FDI train 1 fail!\n" ); - -/* Train 2 */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_2 ; -intel_de_write (dev_priv, reg, temp); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_2 ; -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (150 ); - - reg =FDI_RX_IIR (pipe); -for (tries =0 ; tries <5 ; tries++) { - temp =intel_de_read (dev_priv, reg); -drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); - -if (temp &FDI_RX_SYMBOL_LOCK ) { -intel_de_write (dev_priv, reg, - temp |FDI_RX_SYMBOL_LOCK ); -drm_dbg_kms (&dev_priv->drm,"FDI train 2 done.\n" ); -break ; - } - } -if (tries ==5 ) -drm_err (&dev_priv->drm,"FDI train 2 fail!\n" ); - -drm_dbg_kms (&dev_priv->drm,"FDI train done\n" ); - -} - -static const int snb_b_fdi_train_param[] = { -FDI_LINK_TRAIN_400MV_0DB_SNB_B , -FDI_LINK_TRAIN_400MV_6DB_SNB_B , -FDI_LINK_TRAIN_600MV_3_5DB_SNB_B , -FDI_LINK_TRAIN_800MV_0DB_SNB_B , -}; - -/* The FDI link training functions for SNB/Cougarpoint. */ -static void gen6_fdi_link_train (struct intel_crtc *crtc, -const struct intel_crtc_state *crtc_state) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = crtc->pipe; -i915_reg_t reg; -u32 temp, i, retry; - -/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit -for train result */ - reg =FDI_RX_IMR (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_RX_SYMBOL_LOCK ; - temp &= ~FDI_RX_BIT_LOCK ; -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (150 ); - -/* enable CPU FDI TX and PCH FDI RX */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_1 ; - temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; -/* SNB-B */ - temp |=FDI_LINK_TRAIN_400MV_0DB_SNB_B ; -intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); - -intel_de_write (dev_priv,FDI_RX_MISC (pipe), -FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -if (HAS_PCH_CPT (dev_priv)) { - temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; - temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; - }else { - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_1 ; - } -intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); - -intel_de_posting_read (dev_priv, reg); -udelay (150 ); - -for (i =0 ; i <4 ; i++) { - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; - temp |= snb_b_fdi_train_param[i]; -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (500 ); - -for (retry =0 ; retry <5 ; retry++) { - reg =FDI_RX_IIR (pipe); - temp =intel_de_read (dev_priv, reg); -drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); -if (temp &FDI_RX_BIT_LOCK ) { -intel_de_write (dev_priv, reg, - temp |FDI_RX_BIT_LOCK ); -drm_dbg_kms (&dev_priv->drm, -"FDI train 1 done.\n" ); -break ; - } -udelay (50 ); - } -if (retry <5 ) -break ; - } -if (i ==4 ) -drm_err (&dev_priv->drm,"FDI train 1 fail!\n" ); - -/* Train 2 */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_2 ; -if (IS_GEN (dev_priv,6 )) { - temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; -/* SNB-B */ - temp |=FDI_LINK_TRAIN_400MV_0DB_SNB_B ; - } -intel_de_write (dev_priv, reg, temp); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -if (HAS_PCH_CPT (dev_priv)) { - temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; - temp |=FDI_LINK_TRAIN_PATTERN_2_CPT ; - }else { - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_2 ; - } -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (150 ); - -for (i =0 ; i <4 ; i++) { - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; - temp |= snb_b_fdi_train_param[i]; -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (500 ); - -for (retry =0 ; retry <5 ; retry++) { - reg =FDI_RX_IIR (pipe); - temp =intel_de_read (dev_priv, reg); -drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); -if (temp &FDI_RX_SYMBOL_LOCK ) { -intel_de_write (dev_priv, reg, - temp |FDI_RX_SYMBOL_LOCK ); -drm_dbg_kms (&dev_priv->drm, -"FDI train 2 done.\n" ); -break ; - } -udelay (50 ); - } -if (retry <5 ) -break ; - } -if (i ==4 ) -drm_err (&dev_priv->drm,"FDI train 2 fail!\n" ); - -drm_dbg_kms (&dev_priv->drm,"FDI train done.\n" ); -} - -/* Manual link training for Ivy Bridge A0 parts */ -static void ivb_manual_fdi_link_train (struct intel_crtc *crtc, -const struct intel_crtc_state *crtc_state) -{ -struct drm_device *dev = crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = crtc->pipe; -i915_reg_t reg; -u32 temp, i, j; - -/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit -for train result */ - reg =FDI_RX_IMR (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_RX_SYMBOL_LOCK ; - temp &= ~FDI_RX_BIT_LOCK ; -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (150 ); - -drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR before link train 0x%x\n" , -intel_de_read (dev_priv,FDI_RX_IIR (pipe))); - -/* Try each vswing and preemphasis setting twice before moving on */ -for (j =0 ; j <ARRAY_SIZE (snb_b_fdi_train_param) *2 ; j++) { -/* disable first in case we need to retry */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~(FDI_LINK_TRAIN_AUTO |FDI_LINK_TRAIN_NONE_IVB ); - temp &= ~FDI_TX_ENABLE ; -intel_de_write (dev_priv, reg, temp); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_AUTO ; - temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; - temp &= ~FDI_RX_ENABLE ; -intel_de_write (dev_priv, reg, temp); - -/* enable CPU FDI TX and PCH FDI RX */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_DP_PORT_WIDTH_MASK ; - temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); - temp |=FDI_LINK_TRAIN_PATTERN_1_IVB ; - temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; - temp |= snb_b_fdi_train_param[j/2 ]; - temp |=FDI_COMPOSITE_SYNC ; -intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); - -intel_de_write (dev_priv,FDI_RX_MISC (pipe), -FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; - temp |=FDI_COMPOSITE_SYNC ; -intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); - -intel_de_posting_read (dev_priv, reg); -udelay (1 );/* should be 0.5us */ - -for (i =0 ; i <4 ; i++) { - reg =FDI_RX_IIR (pipe); - temp =intel_de_read (dev_priv, reg); -drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); - -if (temp &FDI_RX_BIT_LOCK || - (intel_de_read (dev_priv, reg) &FDI_RX_BIT_LOCK )) { -intel_de_write (dev_priv, reg, - temp |FDI_RX_BIT_LOCK ); -drm_dbg_kms (&dev_priv->drm, -"FDI train 1 done, level %i.\n" , - i); -break ; - } -udelay (1 );/* should be 0.5us */ - } -if (i ==4 ) { -drm_dbg_kms (&dev_priv->drm, -"FDI train 1 fail on vswing %d\n" , j /2 ); -continue ; - } - -/* Train 2 */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_NONE_IVB ; - temp |=FDI_LINK_TRAIN_PATTERN_2_IVB ; -intel_de_write (dev_priv, reg, temp); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; - temp |=FDI_LINK_TRAIN_PATTERN_2_CPT ; -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (2 );/* should be 1.5us */ - -for (i =0 ; i <4 ; i++) { - reg =FDI_RX_IIR (pipe); - temp =intel_de_read (dev_priv, reg); -drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); - -if (temp &FDI_RX_SYMBOL_LOCK || - (intel_de_read (dev_priv, reg) &FDI_RX_SYMBOL_LOCK )) { -intel_de_write (dev_priv, reg, - temp |FDI_RX_SYMBOL_LOCK ); -drm_dbg_kms (&dev_priv->drm, -"FDI train 2 done, level %i.\n" , - i); - goto train_done; - } -udelay (2 );/* should be 1.5us */ - } -if (i ==4 ) -drm_dbg_kms (&dev_priv->drm, -"FDI train 2 fail on vswing %d\n" , j /2 ); - } - -train_done: -drm_dbg_kms (&dev_priv->drm,"FDI train done.\n" ); -} - -static void ilk_fdi_pll_enable (const struct intel_crtc_state *crtc_state) -{ -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev); -enum pipe pipe = intel_crtc->pipe; -i915_reg_t reg; -u32 temp; - -/* enable PCH FDI RX PLL, wait warmup plus DMI latency */ - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~(FDI_DP_PORT_WIDTH_MASK | (0x7 <<16 )); - temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); - temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; -intel_de_write (dev_priv, reg, temp |FDI_RX_PLL_ENABLE ); - -intel_de_posting_read (dev_priv, reg); -udelay (200 ); - -/* Switch from Rawclk to PCDclk */ - temp =intel_de_read (dev_priv, reg); -intel_de_write (dev_priv, reg, temp |FDI_PCDCLK ); - -intel_de_posting_read (dev_priv, reg); -udelay (200 ); - -/* Enable CPU FDI TX PLL, always on for Ironlake */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -if ((temp &FDI_TX_PLL_ENABLE ) ==0 ) { -intel_de_write (dev_priv, reg, temp |FDI_TX_PLL_ENABLE ); - -intel_de_posting_read (dev_priv, reg); -udelay (100 ); - } -} - -static void ilk_fdi_pll_disable (struct intel_crtc *intel_crtc) -{ -struct drm_device *dev = intel_crtc->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -enum pipe pipe = intel_crtc->pipe; -i915_reg_t reg; -u32 temp; - -/* Switch from PCDclk to Rawclk */ - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -intel_de_write (dev_priv, reg, temp & ~FDI_PCDCLK ); - -/* Disable CPU FDI TX PLL */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -intel_de_write (dev_priv, reg, temp & ~FDI_TX_PLL_ENABLE ); - -intel_de_posting_read (dev_priv, reg); -udelay (100 ); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -intel_de_write (dev_priv, reg, temp & ~FDI_RX_PLL_ENABLE ); - -/* Wait for the clocks to turn off. */ -intel_de_posting_read (dev_priv, reg); -udelay (100 ); -} - -static void ilk_fdi_disable (struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum pipe pipe = crtc->pipe; -i915_reg_t reg; -u32 temp; - -/* disable CPU FDI tx and PCH FDI rx */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -intel_de_write (dev_priv, reg, temp & ~FDI_TX_ENABLE ); -intel_de_posting_read (dev_priv, reg); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~(0x7 <<16 ); - temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; -intel_de_write (dev_priv, reg, temp & ~FDI_RX_ENABLE ); - -intel_de_posting_read (dev_priv, reg); -udelay (100 ); - -/* Ironlake workaround, disable clock pointer after downing FDI */ -if (HAS_PCH_IBX (dev_priv)) -intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), -FDI_RX_PHASE_SYNC_POINTER_OVR ); - -/* still set train pattern 1 */ - reg =FDI_TX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_1 ; -intel_de_write (dev_priv, reg, temp); - - reg =FDI_RX_CTL (pipe); - temp =intel_de_read (dev_priv, reg); -if (HAS_PCH_CPT (dev_priv)) { - temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; - temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; - }else { - temp &= ~FDI_LINK_TRAIN_NONE ; - temp |=FDI_LINK_TRAIN_PATTERN_1 ; - } -/* BPC in FDI rx is consistent with that in PIPECONF */ - temp &= ~(0x07 <<16 ); - temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; -intel_de_write (dev_priv, reg, temp); - -intel_de_posting_read (dev_priv, reg); -udelay (100 ); -} -bool intel_has_pending_fb_unpin (struct drm_i915_private *dev_priv) {struct drm_crtc *crtc;@@ -6698,143 +6163,6 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state, } } -static int pipe_required_fdi_lanes (struct intel_crtc_state *crtc_state) -{ -if (crtc_state->hw.enable && crtc_state->has_pch_encoder) -return crtc_state->fdi_lanes; - -return 0 ; -} - -static int ilk_check_fdi_lanes (struct drm_device *dev,enum pipe pipe, -struct intel_crtc_state *pipe_config) -{ -struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state = pipe_config->uapi.state; -struct intel_crtc *other_crtc; -struct intel_crtc_state *other_crtc_state; - -drm_dbg_kms (&dev_priv->drm, -"checking fdi config on pipe %c, lanes %i\n" , -pipe_name (pipe), pipe_config->fdi_lanes); -if (pipe_config->fdi_lanes >4 ) { -drm_dbg_kms (&dev_priv->drm, -"invalid fdi lane config on pipe %c: %i lanes\n" , -pipe_name (pipe), pipe_config->fdi_lanes); -return -EINVAL ; - } - -if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { -if (pipe_config->fdi_lanes >2 ) { -drm_dbg_kms (&dev_priv->drm, -"only 2 lanes on haswell, required: %i lanes\n" , - pipe_config->fdi_lanes); -return -EINVAL ; - }else { -return 0 ; - } - } - -if (INTEL_NUM_PIPES (dev_priv) ==2 ) -return 0 ; - -/* Ivybridge 3 pipe is really complicated */ -switch (pipe) { -case PIPE_A : -return 0 ; -case PIPE_B : -if (pipe_config->fdi_lanes <=2 ) -return 0 ; - - other_crtc =intel_get_crtc_for_pipe (dev_priv,PIPE_C ); - other_crtc_state = -intel_atomic_get_crtc_state (state, other_crtc); -if (IS_ERR (other_crtc_state)) -return PTR_ERR (other_crtc_state); - -if (pipe_required_fdi_lanes (other_crtc_state) >0 ) { -drm_dbg_kms (&dev_priv->drm, -"invalid shared fdi lane config on pipe %c: %i lanes\n" , -pipe_name (pipe), pipe_config->fdi_lanes); -return -EINVAL ; - } -return 0 ; -case PIPE_C : -if (pipe_config->fdi_lanes >2 ) { -drm_dbg_kms (&dev_priv->drm, -"only 2 lanes on pipe %c: required %i lanes\n" , -pipe_name (pipe), pipe_config->fdi_lanes); -return -EINVAL ; - } - - other_crtc =intel_get_crtc_for_pipe (dev_priv,PIPE_B ); - other_crtc_state = -intel_atomic_get_crtc_state (state, other_crtc); -if (IS_ERR (other_crtc_state)) -return PTR_ERR (other_crtc_state); - -if (pipe_required_fdi_lanes (other_crtc_state) >2 ) { -drm_dbg_kms (&dev_priv->drm, -"fdi link B uses too many lanes to enable link C\n" ); -return -EINVAL ; - } -return 0 ; -default : -BUG (); - } -} - -#define RETRY 1 -static int ilk_fdi_compute_config (struct intel_crtc *intel_crtc, -struct intel_crtc_state *pipe_config) -{ -struct drm_device *dev = intel_crtc->base.dev; -struct drm_i915_private *i915 =to_i915 (dev); -const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; -int lane, link_bw, fdi_dotclock, ret; -bool needs_recompute = false; - -retry: -/* FDI is a binary signal running at ~2.7GHz, encoding -* each output octet as 10 bits. The actual frequency -* is stored as a divider into a 100MHz clock, and the -* mode pixel clock is stored in units of 1KHz. -* Hence the bw of each lane in terms of the mode signal -* is: -*/ - link_bw =intel_fdi_link_freq (i915, pipe_config); - - fdi_dotclock = adjusted_mode->crtc_clock; - - lane =ilk_get_lanes_required (fdi_dotclock, link_bw, - pipe_config->pipe_bpp); - - pipe_config->fdi_lanes = lane; - -intel_link_compute_m_n (pipe_config->pipe_bpp, lane, fdi_dotclock, - link_bw, &pipe_config->fdi_m_n, false, false); - - ret =ilk_check_fdi_lanes (dev, intel_crtc->pipe, pipe_config); -if (ret == -EDEADLK ) -return ret; - -if (ret == -EINVAL && pipe_config->pipe_bpp >6 *3 ) { - pipe_config->pipe_bpp -=2 *3 ; -drm_dbg_kms (&i915->drm, -"fdi link bw constraint, reducing pipe bpp to %i\n" , - pipe_config->pipe_bpp); - needs_recompute = true; - pipe_config->bw_constrained = true; - - goto retry; - } - -if (needs_recompute) -return RETRY ; - -return ret; -} -bool hsw_crtc_state_ips_capable (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);@@ -11369,7 +10697,7 @@ intel_modeset_pipe_config(struct intel_atomic_state *state,return ret; } -if (ret ==RETRY ) { +if (ret ==I915_DISPLAY_CONFIG_RETRY ) {if (drm_WARN (&i915->drm, !retry,"loop in pipe configuration computation\n" ))return -EINVAL ;@@ -15168,14 +14496,7 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) dev_priv->display.crtc_disable = i9xx_crtc_disable; } -if (IS_GEN (dev_priv,5 )) { - dev_priv->display.fdi_link_train = ilk_fdi_link_train; - }else if (IS_GEN (dev_priv,6 )) { - dev_priv->display.fdi_link_train = gen6_fdi_link_train; - }else if (IS_IVYBRIDGE (dev_priv)) { -/* FIXME: detect B0+ stepping and use auto training */ - dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; - } +intel_fdi_init_hook (dev_priv);if (INTEL_GEN (dev_priv) >=9 ) { dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables;drivers/gpu/drm/i915/display/intel_display_types.h +9
-0@@ -1816,4 +1816,13 @@ static inline u32 i9xx_dpll_compute_fp(struct dpll *dpll) return dpll->n << 16 | dpll->m1 << 8 | dpll->m2; } +static inline u32 intel_fdi_link_freq (struct drm_i915_private *dev_priv, +const struct intel_crtc_state *pipe_config) +{ +if (HAS_DDI (dev_priv)) +return pipe_config->port_clock;/* SPLL */ +else +return dev_priv->fdi_pll_freq; +} +#endif /* __INTEL_DISPLAY_TYPES_H__ */ drivers/gpu/drm/i915/display/intel_fdi.c new file +683
-0@@ -0,0 +1,683 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation +*/ +#include "intel_atomic.h" +#include "intel_display_types.h" +#include "intel_fdi.h" + +/* units of 100MHz */ +static int pipe_required_fdi_lanes (struct intel_crtc_state *crtc_state) +{ +if (crtc_state->hw.enable && crtc_state->has_pch_encoder) +return crtc_state->fdi_lanes; + +return 0 ; +} + +static int ilk_check_fdi_lanes (struct drm_device *dev,enum pipe pipe, +struct intel_crtc_state *pipe_config) +{ +struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_atomic_state *state = pipe_config->uapi.state; +struct intel_crtc *other_crtc; +struct intel_crtc_state *other_crtc_state; + +drm_dbg_kms (&dev_priv->drm, +"checking fdi config on pipe %c, lanes %i\n" , +pipe_name (pipe), pipe_config->fdi_lanes); +if (pipe_config->fdi_lanes >4 ) { +drm_dbg_kms (&dev_priv->drm, +"invalid fdi lane config on pipe %c: %i lanes\n" , +pipe_name (pipe), pipe_config->fdi_lanes); +return -EINVAL ; + } + +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { +if (pipe_config->fdi_lanes >2 ) { +drm_dbg_kms (&dev_priv->drm, +"only 2 lanes on haswell, required: %i lanes\n" , + pipe_config->fdi_lanes); +return -EINVAL ; + }else { +return 0 ; + } + } + +if (INTEL_NUM_PIPES (dev_priv) ==2 ) +return 0 ; + +/* Ivybridge 3 pipe is really complicated */ +switch (pipe) { +case PIPE_A : +return 0 ; +case PIPE_B : +if (pipe_config->fdi_lanes <=2 ) +return 0 ; + + other_crtc =intel_get_crtc_for_pipe (dev_priv,PIPE_C ); + other_crtc_state = +intel_atomic_get_crtc_state (state, other_crtc); +if (IS_ERR (other_crtc_state)) +return PTR_ERR (other_crtc_state); + +if (pipe_required_fdi_lanes (other_crtc_state) >0 ) { +drm_dbg_kms (&dev_priv->drm, +"invalid shared fdi lane config on pipe %c: %i lanes\n" , +pipe_name (pipe), pipe_config->fdi_lanes); +return -EINVAL ; + } +return 0 ; +case PIPE_C : +if (pipe_config->fdi_lanes >2 ) { +drm_dbg_kms (&dev_priv->drm, +"only 2 lanes on pipe %c: required %i lanes\n" , +pipe_name (pipe), pipe_config->fdi_lanes); +return -EINVAL ; + } + + other_crtc =intel_get_crtc_for_pipe (dev_priv,PIPE_B ); + other_crtc_state = +intel_atomic_get_crtc_state (state, other_crtc); +if (IS_ERR (other_crtc_state)) +return PTR_ERR (other_crtc_state); + +if (pipe_required_fdi_lanes (other_crtc_state) >2 ) { +drm_dbg_kms (&dev_priv->drm, +"fdi link B uses too many lanes to enable link C\n" ); +return -EINVAL ; + } +return 0 ; +default : +BUG (); + } +} + +int ilk_fdi_compute_config (struct intel_crtc *intel_crtc, +struct intel_crtc_state *pipe_config) +{ +struct drm_device *dev = intel_crtc->base.dev; +struct drm_i915_private *i915 =to_i915 (dev); +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; +int lane, link_bw, fdi_dotclock, ret; +bool needs_recompute = false; + +retry: +/* FDI is a binary signal running at ~2.7GHz, encoding +* each output octet as 10 bits. The actual frequency +* is stored as a divider into a 100MHz clock, and the +* mode pixel clock is stored in units of 1KHz. +* Hence the bw of each lane in terms of the mode signal +* is: +*/ + link_bw =intel_fdi_link_freq (i915, pipe_config); + + fdi_dotclock = adjusted_mode->crtc_clock; + + lane =ilk_get_lanes_required (fdi_dotclock, link_bw, + pipe_config->pipe_bpp); + + pipe_config->fdi_lanes = lane; + +intel_link_compute_m_n (pipe_config->pipe_bpp, lane, fdi_dotclock, + link_bw, &pipe_config->fdi_m_n, false, false); + + ret =ilk_check_fdi_lanes (dev, intel_crtc->pipe, pipe_config); +if (ret == -EDEADLK ) +return ret; + +if (ret == -EINVAL && pipe_config->pipe_bpp >6 *3 ) { + pipe_config->pipe_bpp -=2 *3 ; +drm_dbg_kms (&i915->drm, +"fdi link bw constraint, reducing pipe bpp to %i\n" , + pipe_config->pipe_bpp); + needs_recompute = true; + pipe_config->bw_constrained = true; + + goto retry; + } + +if (needs_recompute) +return I915_DISPLAY_CONFIG_RETRY ; + +return ret; +} + +void intel_fdi_normal_train (struct intel_crtc *crtc) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +enum pipe pipe = crtc->pipe; +i915_reg_t reg; +u32 temp; + +/* enable normal train */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +if (IS_IVYBRIDGE (dev_priv)) { + temp &= ~FDI_LINK_TRAIN_NONE_IVB ; + temp |=FDI_LINK_TRAIN_NONE_IVB |FDI_TX_ENHANCE_FRAME_ENABLE ; + }else { + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_NONE |FDI_TX_ENHANCE_FRAME_ENABLE ; + } +intel_de_write (dev_priv, reg, temp); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +if (HAS_PCH_CPT (dev_priv)) { + temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; + temp |=FDI_LINK_TRAIN_NORMAL_CPT ; + }else { + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_NONE ; + } +intel_de_write (dev_priv, reg, temp |FDI_RX_ENHANCE_FRAME_ENABLE ); + +/* wait one idle pattern time */ +intel_de_posting_read (dev_priv, reg); +udelay (1000 ); + +/* IVB wants error correction enabled */ +if (IS_IVYBRIDGE (dev_priv)) +intel_de_write (dev_priv, reg, +intel_de_read (dev_priv, reg) |FDI_FS_ERRC_ENABLE |FDI_FE_ERRC_ENABLE ); +} + +/* The FDI link training functions for ILK/Ibexpeak. */ +static void ilk_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +enum pipe pipe = crtc->pipe; +i915_reg_t reg; +u32 temp, tries; + +/* FDI needs bits from pipe first */ +assert_pipe_enabled (dev_priv, crtc_state->cpu_transcoder); + +/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit +for train result */ + reg =FDI_RX_IMR (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_RX_SYMBOL_LOCK ; + temp &= ~FDI_RX_BIT_LOCK ; +intel_de_write (dev_priv, reg, temp); +intel_de_read (dev_priv, reg); +udelay (150 ); + +/* enable CPU FDI TX and PCH FDI RX */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_DP_PORT_WIDTH_MASK ; + temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_1 ; +intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_1 ; +intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); + +intel_de_posting_read (dev_priv, reg); +udelay (150 ); + +/* Ironlake workaround, enable clock pointer after FDI enable*/ +intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), +FDI_RX_PHASE_SYNC_POINTER_OVR ); +intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), +FDI_RX_PHASE_SYNC_POINTER_OVR |FDI_RX_PHASE_SYNC_POINTER_EN ); + + reg =FDI_RX_IIR (pipe); +for (tries =0 ; tries <5 ; tries++) { + temp =intel_de_read (dev_priv, reg); +drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); + +if ((temp &FDI_RX_BIT_LOCK )) { +drm_dbg_kms (&dev_priv->drm,"FDI train 1 done.\n" ); +intel_de_write (dev_priv, reg, temp |FDI_RX_BIT_LOCK ); +break ; + } + } +if (tries ==5 ) +drm_err (&dev_priv->drm,"FDI train 1 fail!\n" ); + +/* Train 2 */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_2 ; +intel_de_write (dev_priv, reg, temp); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_2 ; +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (150 ); + + reg =FDI_RX_IIR (pipe); +for (tries =0 ; tries <5 ; tries++) { + temp =intel_de_read (dev_priv, reg); +drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); + +if (temp &FDI_RX_SYMBOL_LOCK ) { +intel_de_write (dev_priv, reg, + temp |FDI_RX_SYMBOL_LOCK ); +drm_dbg_kms (&dev_priv->drm,"FDI train 2 done.\n" ); +break ; + } + } +if (tries ==5 ) +drm_err (&dev_priv->drm,"FDI train 2 fail!\n" ); + +drm_dbg_kms (&dev_priv->drm,"FDI train done\n" ); + +} + +static const int snb_b_fdi_train_param[] = { +FDI_LINK_TRAIN_400MV_0DB_SNB_B , +FDI_LINK_TRAIN_400MV_6DB_SNB_B , +FDI_LINK_TRAIN_600MV_3_5DB_SNB_B , +FDI_LINK_TRAIN_800MV_0DB_SNB_B , +}; + +/* The FDI link training functions for SNB/Cougarpoint. */ +static void gen6_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +enum pipe pipe = crtc->pipe; +i915_reg_t reg; +u32 temp, i, retry; + +/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit +for train result */ + reg =FDI_RX_IMR (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_RX_SYMBOL_LOCK ; + temp &= ~FDI_RX_BIT_LOCK ; +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (150 ); + +/* enable CPU FDI TX and PCH FDI RX */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_DP_PORT_WIDTH_MASK ; + temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_1 ; + temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; +/* SNB-B */ + temp |=FDI_LINK_TRAIN_400MV_0DB_SNB_B ; +intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); + +intel_de_write (dev_priv,FDI_RX_MISC (pipe), +FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +if (HAS_PCH_CPT (dev_priv)) { + temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; + temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; + }else { + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_1 ; + } +intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); + +intel_de_posting_read (dev_priv, reg); +udelay (150 ); + +for (i =0 ; i <4 ; i++) { + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; + temp |= snb_b_fdi_train_param[i]; +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (500 ); + +for (retry =0 ; retry <5 ; retry++) { + reg =FDI_RX_IIR (pipe); + temp =intel_de_read (dev_priv, reg); +drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); +if (temp &FDI_RX_BIT_LOCK ) { +intel_de_write (dev_priv, reg, + temp |FDI_RX_BIT_LOCK ); +drm_dbg_kms (&dev_priv->drm, +"FDI train 1 done.\n" ); +break ; + } +udelay (50 ); + } +if (retry <5 ) +break ; + } +if (i ==4 ) +drm_err (&dev_priv->drm,"FDI train 1 fail!\n" ); + +/* Train 2 */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_2 ; +if (IS_GEN (dev_priv,6 )) { + temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; +/* SNB-B */ + temp |=FDI_LINK_TRAIN_400MV_0DB_SNB_B ; + } +intel_de_write (dev_priv, reg, temp); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +if (HAS_PCH_CPT (dev_priv)) { + temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; + temp |=FDI_LINK_TRAIN_PATTERN_2_CPT ; + }else { + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_2 ; + } +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (150 ); + +for (i =0 ; i <4 ; i++) { + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; + temp |= snb_b_fdi_train_param[i]; +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (500 ); + +for (retry =0 ; retry <5 ; retry++) { + reg =FDI_RX_IIR (pipe); + temp =intel_de_read (dev_priv, reg); +drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); +if (temp &FDI_RX_SYMBOL_LOCK ) { +intel_de_write (dev_priv, reg, + temp |FDI_RX_SYMBOL_LOCK ); +drm_dbg_kms (&dev_priv->drm, +"FDI train 2 done.\n" ); +break ; + } +udelay (50 ); + } +if (retry <5 ) +break ; + } +if (i ==4 ) +drm_err (&dev_priv->drm,"FDI train 2 fail!\n" ); + +drm_dbg_kms (&dev_priv->drm,"FDI train done.\n" ); +} + +/* Manual link training for Ivy Bridge A0 parts */ +static void ivb_manual_fdi_link_train (struct intel_crtc *crtc, +const struct intel_crtc_state *crtc_state) +{ +struct drm_device *dev = crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +enum pipe pipe = crtc->pipe; +i915_reg_t reg; +u32 temp, i, j; + +/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit +for train result */ + reg =FDI_RX_IMR (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_RX_SYMBOL_LOCK ; + temp &= ~FDI_RX_BIT_LOCK ; +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (150 ); + +drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR before link train 0x%x\n" , +intel_de_read (dev_priv,FDI_RX_IIR (pipe))); + +/* Try each vswing and preemphasis setting twice before moving on */ +for (j =0 ; j <ARRAY_SIZE (snb_b_fdi_train_param) *2 ; j++) { +/* disable first in case we need to retry */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~(FDI_LINK_TRAIN_AUTO |FDI_LINK_TRAIN_NONE_IVB ); + temp &= ~FDI_TX_ENABLE ; +intel_de_write (dev_priv, reg, temp); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_AUTO ; + temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; + temp &= ~FDI_RX_ENABLE ; +intel_de_write (dev_priv, reg, temp); + +/* enable CPU FDI TX and PCH FDI RX */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_DP_PORT_WIDTH_MASK ; + temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); + temp |=FDI_LINK_TRAIN_PATTERN_1_IVB ; + temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; + temp |= snb_b_fdi_train_param[j/2 ]; + temp |=FDI_COMPOSITE_SYNC ; +intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); + +intel_de_write (dev_priv,FDI_RX_MISC (pipe), +FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; + temp |=FDI_COMPOSITE_SYNC ; +intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); + +intel_de_posting_read (dev_priv, reg); +udelay (1 );/* should be 0.5us */ + +for (i =0 ; i <4 ; i++) { + reg =FDI_RX_IIR (pipe); + temp =intel_de_read (dev_priv, reg); +drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); + +if (temp &FDI_RX_BIT_LOCK || + (intel_de_read (dev_priv, reg) &FDI_RX_BIT_LOCK )) { +intel_de_write (dev_priv, reg, + temp |FDI_RX_BIT_LOCK ); +drm_dbg_kms (&dev_priv->drm, +"FDI train 1 done, level %i.\n" , + i); +break ; + } +udelay (1 );/* should be 0.5us */ + } +if (i ==4 ) { +drm_dbg_kms (&dev_priv->drm, +"FDI train 1 fail on vswing %d\n" , j /2 ); +continue ; + } + +/* Train 2 */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_NONE_IVB ; + temp |=FDI_LINK_TRAIN_PATTERN_2_IVB ; +intel_de_write (dev_priv, reg, temp); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; + temp |=FDI_LINK_TRAIN_PATTERN_2_CPT ; +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (2 );/* should be 1.5us */ + +for (i =0 ; i <4 ; i++) { + reg =FDI_RX_IIR (pipe); + temp =intel_de_read (dev_priv, reg); +drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp); + +if (temp &FDI_RX_SYMBOL_LOCK || + (intel_de_read (dev_priv, reg) &FDI_RX_SYMBOL_LOCK )) { +intel_de_write (dev_priv, reg, + temp |FDI_RX_SYMBOL_LOCK ); +drm_dbg_kms (&dev_priv->drm, +"FDI train 2 done, level %i.\n" , + i); + goto train_done; + } +udelay (2 );/* should be 1.5us */ + } +if (i ==4 ) +drm_dbg_kms (&dev_priv->drm, +"FDI train 2 fail on vswing %d\n" , j /2 ); + } + +train_done: +drm_dbg_kms (&dev_priv->drm,"FDI train done.\n" ); +} + +void ilk_fdi_pll_enable (const struct intel_crtc_state *crtc_state) +{ +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc); +struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev); +enum pipe pipe = intel_crtc->pipe; +i915_reg_t reg; +u32 temp; + +/* enable PCH FDI RX PLL, wait warmup plus DMI latency */ + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~(FDI_DP_PORT_WIDTH_MASK | (0x7 <<16 )); + temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); + temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; +intel_de_write (dev_priv, reg, temp |FDI_RX_PLL_ENABLE ); + +intel_de_posting_read (dev_priv, reg); +udelay (200 ); + +/* Switch from Rawclk to PCDclk */ + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp |FDI_PCDCLK ); + +intel_de_posting_read (dev_priv, reg); +udelay (200 ); + +/* Enable CPU FDI TX PLL, always on for Ironlake */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +if ((temp &FDI_TX_PLL_ENABLE ) ==0 ) { +intel_de_write (dev_priv, reg, temp |FDI_TX_PLL_ENABLE ); + +intel_de_posting_read (dev_priv, reg); +udelay (100 ); + } +} + +void ilk_fdi_pll_disable (struct intel_crtc *intel_crtc) +{ +struct drm_device *dev = intel_crtc->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +enum pipe pipe = intel_crtc->pipe; +i915_reg_t reg; +u32 temp; + +/* Switch from PCDclk to Rawclk */ + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_PCDCLK ); + +/* Disable CPU FDI TX PLL */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_TX_PLL_ENABLE ); + +intel_de_posting_read (dev_priv, reg); +udelay (100 ); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_RX_PLL_ENABLE ); + +/* Wait for the clocks to turn off. */ +intel_de_posting_read (dev_priv, reg); +udelay (100 ); +} + +void ilk_fdi_disable (struct intel_crtc *crtc) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +enum pipe pipe = crtc->pipe; +i915_reg_t reg; +u32 temp; + +/* disable CPU FDI tx and PCH FDI rx */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_TX_ENABLE ); +intel_de_posting_read (dev_priv, reg); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~(0x7 <<16 ); + temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; +intel_de_write (dev_priv, reg, temp & ~FDI_RX_ENABLE ); + +intel_de_posting_read (dev_priv, reg); +udelay (100 ); + +/* Ironlake workaround, disable clock pointer after downing FDI */ +if (HAS_PCH_IBX (dev_priv)) +intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), +FDI_RX_PHASE_SYNC_POINTER_OVR ); + +/* still set train pattern 1 */ + reg =FDI_TX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_1 ; +intel_de_write (dev_priv, reg, temp); + + reg =FDI_RX_CTL (pipe); + temp =intel_de_read (dev_priv, reg); +if (HAS_PCH_CPT (dev_priv)) { + temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; + temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; + }else { + temp &= ~FDI_LINK_TRAIN_NONE ; + temp |=FDI_LINK_TRAIN_PATTERN_1 ; + } +/* BPC in FDI rx is consistent with that in PIPECONF */ + temp &= ~(0x07 <<16 ); + temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; +intel_de_write (dev_priv, reg, temp); + +intel_de_posting_read (dev_priv, reg); +udelay (100 ); +} + +void +intel_fdi_init_hook (struct drm_i915_private *dev_priv) +{ +if (IS_GEN (dev_priv,5 )) { + dev_priv->display.fdi_link_train = ilk_fdi_link_train; + }else if (IS_GEN (dev_priv,6 )) { + dev_priv->display.fdi_link_train = gen6_fdi_link_train; + }else if (IS_IVYBRIDGE (dev_priv)) { +/* FIXME: detect B0+ stepping and use auto training */ + dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; + } +}drivers/gpu/drm/i915/display/intel_fdi.h new file +21
-0@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation +*/ + +#ifndef _INTEL_FDI_H_ +#define _INTEL_FDI_H_ + +struct intel_crtc ; +struct intel_crtc_state ; + +#define I915_DISPLAY_CONFIG_RETRY 1 +int ilk_fdi_compute_config (struct intel_crtc *intel_crtc, +struct intel_crtc_state *pipe_config); +void intel_fdi_normal_train (struct intel_crtc *crtc); +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); + +#endif
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 8/11 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 | 14 ++- drivers/gpu/drm/i915/display/intel_fdi.c | 147 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_fdi.h | 3 + 5 files changed, 168 insertions(+), 148 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 +5 -146
181 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_ddi.h +12 -2
@@ -9,6 +9,12 @@#include "intel_display.h" #include "i915_reg.h" +struct ddi_buf_trans { +u32 trans1;/* balance leg enable, de-emph level */ +u32 trans2;/* vref sel, vswing */ +u8 i_boost;/* SKL: I_boost; valid: 0x0, 0x1, 0x3, 0x7 */ +}; +struct drm_connector_state ;struct drm_i915_private ;struct intel_connector ;
@@ -17,6 +23,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 +34,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 +147 -0
159 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_fdi.h +3 -0
@@ -8,6 +8,7 @@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,
@@ -17,5 +18,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
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 08/11] drm/i915: migrate hsw fdi code to new file.
Quoted 4 lines · Dave Airlie
From: 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.
Cleaned it up some locally by moving both hsw and bdw buf trans tables to intel_fdi.c, and adding a function to get them.
Surely this could be improved further, but I think it's forward progress.
BR,
Jani.
Quoted 436 lines
Signed-off-by Dave Airlie <[email protected]>--- 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 | 14 ++- drivers/gpu/drm/i915/display/intel_fdi.c | 147 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_fdi.h | 3 + 5 files changed, 168 insertions(+), 148 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 +5
-146@@ -51,12 +51,6 @@#include "intel_tc.h" #include "intel_vdsc.h" -struct ddi_buf_trans { -u32 trans1;/* balance leg enable, de-emph level */ -u32 trans2;/* vref sel, vswing */ -u8 i_boost;/* SKL: I_boost; valid: 0x0, 0x1, 0x3, 0x7 */ -}; -static const u8 index_to_dp_signal_levels[] = { [0 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 |DP_TRAIN_PRE_EMPH_LEVEL_0 , [1 ] =DP_TRAIN_VOLTAGE_SWING_LEVEL_0 |DP_TRAIN_PRE_EMPH_LEVEL_1 ,@@ -1398,8 +1392,8 @@ static int intel_ddi_hdmi_level(struct intel_encoder *encoder,* values in advance. This function programs the correct values for * DP/eDP/FDI use cases. */ -static void intel_prepare_dp_ddi_buffers (struct intel_encoder *encoder, -const struct intel_crtc_state *crtc_state) +void intel_prepare_dp_ddi_buffers (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);u32 iboost_bit =0 ;@@ -1461,8 +1455,8 @@ static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, ddi_translations[level].trans2); } -static void intel_wait_ddi_buf_idle (struct drm_i915_private *dev_priv, -enum port port) +void intel_wait_ddi_buf_idle (struct drm_i915_private *dev_priv, +enum port port) {if (IS_BROXTON (dev_priv)) {udelay (16 );@@ -1490,7 +1484,7 @@ static void intel_wait_ddi_buf_active(struct drm_i915_private *dev_priv, port_name(port)); } -static u32 hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll) +u32 hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll) {switch (pll->info->id) {case DPLL_ID_WRPLL1 :@@ -1550,141 +1544,6 @@ static u32 icl_pll_to_ddi_clk_sel(struct intel_encoder *encoder, } } -/* Starting with Haswell, different DDI ports can work in FDI mode for -* connection to the PCH-located connectors. For this, it is necessary to train -* both the DDI port and PCH receiver for the desired DDI buffer settings. -* -* The recommended port to work in FDI mode is DDI E, which we use here. Also, -* please note that when FDI mode is active on DDI E, it shares 2 lines with -* DDI A (which is used for eDP) -*/ - -void hsw_fdi_link_train (struct intel_encoder *encoder, -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); -u32 temp, i, rx_ctl_val, ddi_pll_sel; - -intel_prepare_dp_ddi_buffers (encoder, crtc_state); - -/* Set the FDI_RX_MISC pwrdn lanes and the 2 workarounds listed at the -* mode set "sequence for CRT port" document: -* - TP1 to TP2 time with the default value -* - FDI delay to 90h -* -* WaFDIAutoLinkSetTimingOverrride:hsw -*/ -intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), -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 | -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); -intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A )); -udelay (220 ); - -/* Switch from Rawclk to PCDclk */ - rx_ctl_val |=FDI_PCDCLK ; -intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); - -/* Configure Port Clock Select */ - ddi_pll_sel =hsw_pll_to_ddi_pll_sel (crtc_state->shared_dpll); -intel_de_write (dev_priv,PORT_CLK_SEL (PORT_E ), ddi_pll_sel); -drm_WARN_ON (&dev_priv->drm, ddi_pll_sel !=PORT_CLK_SEL_SPLL ); - -/* Start the training iterating through available voltages and emphasis, -* testing each value twice. */ -for (i =0 ; i <ARRAY_SIZE (hsw_ddi_translations_fdi) *2 ; i++) { -/* Configure DP_TP_CTL with auto-training */ -intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), -DP_TP_CTL_FDI_AUTOTRAIN | -DP_TP_CTL_ENHANCED_FRAME_ENABLE | -DP_TP_CTL_LINK_TRAIN_PAT1 | -DP_TP_CTL_ENABLE ); - -/* Configure and enable DDI_BUF_CTL for DDI E with next voltage. -* DDI E does not support port reversal, the functionality is -* achieved on the PCH side in FDI_RX_CTL, so no need to set the -* port reversal bit */ -intel_de_write (dev_priv,DDI_BUF_CTL (PORT_E ), -DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes -1 ) <<1 ) |DDI_BUF_TRANS_SELECT (i /2 )); -intel_de_posting_read (dev_priv,DDI_BUF_CTL (PORT_E )); - -udelay (600 ); - -/* Program PCH FDI Receiver TU */ -intel_de_write (dev_priv,FDI_RX_TUSIZE1 (PIPE_A ),TU_SIZE (64 )); - -/* Enable PCH FDI Receiver with auto-training */ - rx_ctl_val |=FDI_RX_ENABLE |FDI_LINK_TRAIN_AUTO ; -intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); -intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A )); - -/* Wait for FDI receiver lane calibration */ -udelay (30 ); - -/* Unset FDI_RX_MISC pwrdn lanes */ - temp =intel_de_read (dev_priv,FDI_RX_MISC (PIPE_A )); - temp &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK ); -intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), temp); -intel_de_posting_read (dev_priv,FDI_RX_MISC (PIPE_A )); - -/* Wait for FDI auto training time */ -udelay (5 ); - - temp =intel_de_read (dev_priv,DP_TP_STATUS (PORT_E )); -if (temp &DP_TP_STATUS_AUTOTRAIN_DONE ) { -drm_dbg_kms (&dev_priv->drm, -"FDI link training done on step %d\n" , i); -break ; - } - -/* -* Leave things enabled even if we failed to train FDI. -* Results in less fireworks from the state checker. -*/ -if (i ==ARRAY_SIZE (hsw_ddi_translations_fdi) *2 -1 ) { -drm_err (&dev_priv->drm,"FDI link training failed!\n" ); -break ; - } - - rx_ctl_val &= ~FDI_RX_ENABLE ; -intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); -intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A )); - - temp =intel_de_read (dev_priv,DDI_BUF_CTL (PORT_E )); - temp &= ~DDI_BUF_CTL_ENABLE ; -intel_de_write (dev_priv,DDI_BUF_CTL (PORT_E ), temp); -intel_de_posting_read (dev_priv,DDI_BUF_CTL (PORT_E )); - -/* Disable DP_TP_CTL and FDI_RX_CTL and retry */ - temp =intel_de_read (dev_priv,DP_TP_CTL (PORT_E )); - temp &= ~(DP_TP_CTL_ENABLE |DP_TP_CTL_LINK_TRAIN_MASK ); - temp |=DP_TP_CTL_LINK_TRAIN_PAT1 ; -intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), temp); -intel_de_posting_read (dev_priv,DP_TP_CTL (PORT_E )); - -intel_wait_ddi_buf_idle (dev_priv,PORT_E ); - -/* Reset FDI_RX_MISC pwrdn lanes */ - temp =intel_de_read (dev_priv,FDI_RX_MISC (PIPE_A )); - temp &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK ); - temp |=FDI_RX_PWRDN_LANE1_VAL (2 ) |FDI_RX_PWRDN_LANE0_VAL (2 ); -intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), temp); -intel_de_posting_read (dev_priv,FDI_RX_MISC (PIPE_A )); - } - -/* Enable normal pixel sending for FDI */ -intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), -DP_TP_CTL_FDI_AUTOTRAIN | -DP_TP_CTL_LINK_TRAIN_NORMAL | -DP_TP_CTL_ENHANCED_FRAME_ENABLE | -DP_TP_CTL_ENABLE ); -} -static void intel_ddi_init_dp_buf_reg (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) {drivers/gpu/drm/i915/display/intel_ddi.h +12
-2@@ -9,6 +9,12 @@#include "intel_display.h" #include "i915_reg.h" +struct ddi_buf_trans { +u32 trans1;/* balance leg enable, de-emph level */ +u32 trans2;/* vref sel, vswing */ +u8 i_boost;/* SKL: I_boost; valid: 0x0, 0x1, 0x3, 0x7 */ +}; +struct drm_connector_state ;struct drm_i915_private ;struct intel_connector ;@@ -17,6 +23,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 +34,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 +147
-0@@ -5,6 +5,19 @@#include "intel_atomic.h" #include "intel_display_types.h" #include "intel_fdi.h" +#include "intel_ddi.h" + +static const struct ddi_buf_trans hsw_ddi_translations_fdi[] = { + {0x00FFFFFF ,0x0007000E ,0x0 }, + {0x00D75FFF ,0x000F000A ,0x0 }, + {0x00C30FFF ,0x00060006 ,0x0 }, + {0x00AAAFFF ,0x001E0000 ,0x0 }, + {0x00FFFFFF ,0x000F000A ,0x0 }, + {0x00D75FFF ,0x00160004 ,0x0 }, + {0x00C30FFF ,0x001E0000 ,0x0 }, + {0x00FFFFFF ,0x00060006 ,0x0 }, + {0x00D75FFF ,0x001E0000 ,0x0 }, +};/* units of 100MHz */ static int pipe_required_fdi_lanes (struct intel_crtc_state *crtc_state)@@ -550,6 +563,140 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,drm_dbg_kms (&dev_priv->drm,"FDI train done.\n" ); } +/* Starting with Haswell, different DDI ports can work in FDI mode for +* connection to the PCH-located connectors. For this, it is necessary to train +* both the DDI port and PCH receiver for the desired DDI buffer settings. +* +* The recommended port to work in FDI mode is DDI E, which we use here. Also, +* please note that when FDI mode is active on DDI E, it shares 2 lines with +* DDI A (which is used for eDP) +*/ +void hsw_fdi_link_train (struct intel_encoder *encoder, +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); +u32 temp, i, rx_ctl_val, ddi_pll_sel; + +intel_prepare_dp_ddi_buffers (encoder, crtc_state); + +/* Set the FDI_RX_MISC pwrdn lanes and the 2 workarounds listed at the +* mode set "sequence for CRT port" document: +* - TP1 to TP2 time with the default value +* - FDI delay to 90h +* +* WaFDIAutoLinkSetTimingOverrride:hsw +*/ +intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), +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 | +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); +intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A )); +udelay (220 ); + +/* Switch from Rawclk to PCDclk */ + rx_ctl_val |=FDI_PCDCLK ; +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); + +/* Configure Port Clock Select */ + ddi_pll_sel =hsw_pll_to_ddi_pll_sel (crtc_state->shared_dpll); +intel_de_write (dev_priv,PORT_CLK_SEL (PORT_E ), ddi_pll_sel); +drm_WARN_ON (&dev_priv->drm, ddi_pll_sel !=PORT_CLK_SEL_SPLL ); + +/* Start the training iterating through available voltages and emphasis, +* testing each value twice. */ +for (i =0 ; i <ARRAY_SIZE (hsw_ddi_translations_fdi) *2 ; i++) { +/* Configure DP_TP_CTL with auto-training */ +intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), +DP_TP_CTL_FDI_AUTOTRAIN | +DP_TP_CTL_ENHANCED_FRAME_ENABLE | +DP_TP_CTL_LINK_TRAIN_PAT1 | +DP_TP_CTL_ENABLE ); + +/* Configure and enable DDI_BUF_CTL for DDI E with next voltage. +* DDI E does not support port reversal, the functionality is +* achieved on the PCH side in FDI_RX_CTL, so no need to set the +* port reversal bit */ +intel_de_write (dev_priv,DDI_BUF_CTL (PORT_E ), +DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes -1 ) <<1 ) |DDI_BUF_TRANS_SELECT (i /2 )); +intel_de_posting_read (dev_priv,DDI_BUF_CTL (PORT_E )); + +udelay (600 ); + +/* Program PCH FDI Receiver TU */ +intel_de_write (dev_priv,FDI_RX_TUSIZE1 (PIPE_A ),TU_SIZE (64 )); + +/* Enable PCH FDI Receiver with auto-training */ + rx_ctl_val |=FDI_RX_ENABLE |FDI_LINK_TRAIN_AUTO ; +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); +intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A )); + +/* Wait for FDI receiver lane calibration */ +udelay (30 ); + +/* Unset FDI_RX_MISC pwrdn lanes */ + temp =intel_de_read (dev_priv,FDI_RX_MISC (PIPE_A )); + temp &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK ); +intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), temp); +intel_de_posting_read (dev_priv,FDI_RX_MISC (PIPE_A )); + +/* Wait for FDI auto training time */ +udelay (5 ); + + temp =intel_de_read (dev_priv,DP_TP_STATUS (PORT_E )); +if (temp &DP_TP_STATUS_AUTOTRAIN_DONE ) { +drm_dbg_kms (&dev_priv->drm, +"FDI link training done on step %d\n" , i); +break ; + } + +/* +* Leave things enabled even if we failed to train FDI. +* Results in less fireworks from the state checker. +*/ +if (i ==ARRAY_SIZE (hsw_ddi_translations_fdi) *2 -1 ) { +drm_err (&dev_priv->drm,"FDI link training failed!\n" ); +break ; + } + + rx_ctl_val &= ~FDI_RX_ENABLE ; +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); +intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A )); + + temp =intel_de_read (dev_priv,DDI_BUF_CTL (PORT_E )); + temp &= ~DDI_BUF_CTL_ENABLE ; +intel_de_write (dev_priv,DDI_BUF_CTL (PORT_E ), temp); +intel_de_posting_read (dev_priv,DDI_BUF_CTL (PORT_E )); + +/* Disable DP_TP_CTL and FDI_RX_CTL and retry */ + temp =intel_de_read (dev_priv,DP_TP_CTL (PORT_E )); + temp &= ~(DP_TP_CTL_ENABLE |DP_TP_CTL_LINK_TRAIN_MASK ); + temp |=DP_TP_CTL_LINK_TRAIN_PAT1 ; +intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), temp); +intel_de_posting_read (dev_priv,DP_TP_CTL (PORT_E )); + +intel_wait_ddi_buf_idle (dev_priv,PORT_E ); + +/* Reset FDI_RX_MISC pwrdn lanes */ + temp =intel_de_read (dev_priv,FDI_RX_MISC (PIPE_A )); + temp &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK ); + temp |=FDI_RX_PWRDN_LANE1_VAL (2 ) |FDI_RX_PWRDN_LANE0_VAL (2 ); +intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), temp); +intel_de_posting_read (dev_priv,FDI_RX_MISC (PIPE_A )); + } + +/* Enable normal pixel sending for FDI */ +intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), +DP_TP_CTL_FDI_AUTOTRAIN | +DP_TP_CTL_LINK_TRAIN_NORMAL | +DP_TP_CTL_ENHANCED_FRAME_ENABLE | +DP_TP_CTL_ENABLE ); +} +void ilk_fdi_pll_enable (const struct intel_crtc_state *crtc_state) {struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);drivers/gpu/drm/i915/display/intel_fdi.h +3
-0@@ -8,6 +8,7 @@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,@@ -17,5 +18,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 · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerPATCH 9/11 drm/i915: migrate skl planes code new file
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
rework the plane init calls to do the gen test one level higher.
--- drivers/gpu/drm/i915/Makefile | 1 + .../gpu/drm/i915/display/intel_atomic_plane.c | 76 - drivers/gpu/drm/i915/display/intel_crtc.c | 16 +- drivers/gpu/drm/i915/display/intel_display.c | 1410 +------- drivers/gpu/drm/i915/display/intel_display.h | 36 +- .../drm/i915/display/intel_display_types.h | 21 + .../gpu/drm/i915/display/intel_gen9_plane.c | 2832 +++++++++++++++++ drivers/gpu/drm/i915/display/intel_sprite.c | 1417 +-------- 8 files changed, 2931 insertions(+), 2878 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_gen9_plane.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -210,6 +210,7 @@ i915-y += \ display/intel_fifo_underrun.o \ display/intel_frontbuffer.o \ display/intel_global_state.o \ + display/intel_gen9_plane.o \ display/intel_hdcp.o \ display/intel_hotplug.o \ display/intel_lpe_audio.o \
drivers/gpu/drm/i915/display/intel_atomic_plane.c +0 -76
88 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_crtc.c +10 -6
@@ -617,10 +617,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;
@@ -871,7 +867,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;
@@ -881,7 +881,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_display.c +33 -1377
1,504 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +23 -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 ;
@@ -615,23 +616,12 @@ 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); -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); +void skl_detach_scalers (const struct intel_crtc_state *crtc_state);int i9xx_check_plane_surface (struct intel_plane_state *plane_state);int skl_format_to_fourcc (int format,bool rgb_order,bool alpha); +void skl_pfit_enable (const struct intel_crtc_state *crtc_state);unsigned int i9xx_plane_max_stride (struct intel_plane *plane,u32 pixel_format,u64 modifier,unsigned int rotation);
@@ -657,6 +647,26 @@ 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); +int main_to_ccs_plane (const struct drm_framebuffer *fb,int main_plane); +int ccs_to_main_plane (const struct drm_framebuffer *fb,int ccs_plane); +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); +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); +void +skl_get_initial_plane_config (struct intel_crtc *crtc, +struct intel_initial_plane_config *plane_config); +/* 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 +21 -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>
@@ -1825,4 +1826,24 @@ 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_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); +} +#endif /* __INTEL_DISPLAY_TYPES_H__ */
drivers/gpu/drm/i915/display/intel_gen9_plane.c new file +2832 -0
1,278 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_sprite.c +11 -1406
1,417 lines not on this page · 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.
kernel test robot
build botRe: [Intel-gfx] [PATCH 09/11] drm/i915: migrate skl planes code new file
I love your patch! Perhaps something to improve:
Hi Dave,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip next-20201211] [cannot apply to v5.10-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Dave-Airlie/drm-i915-display-move-needs_modeset-to-an-inline-in-header/20201211-163119 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-a003-20201210 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 5ff35356f1af2bb92785b38c657463924d9ec386)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/a5c9dca8844730c679e9716efd016bfe04f9d002
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Dave-Airlie/drm-i915-display-move-needs_modeset-to-an-inline-in-header/20201211-163119 git checkout a5c9dca8844730c679e9716efd016bfe04f9d002
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1396:5: warning: no previous prototype for function 'skl_plane_ctl_crtc' [-Wmissing-prototypes]
u32 skl_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)
^
drivers/gpu/drm/i915/display/intel_gen9_plane.c:1396:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
u32 skl_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)
^
static
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1416:5: warning: no previous prototype for function 'skl_plane_ctl' [-Wmissing-prototypes]
u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
^
drivers/gpu/drm/i915/display/intel_gen9_plane.c:1416:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
^
static
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1455:5: warning: no previous prototype for function 'glk_plane_color_ctl_crtc' [-Wmissing-prototypes]
u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state)
^
drivers/gpu/drm/i915/display/intel_gen9_plane.c:1455:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state)
^
static
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1472:5: warning: no previous prototype for function 'glk_plane_color_ctl' [-Wmissing-prototypes]
u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
^ drivers/gpu/drm/i915/display/intel_gen9_plane.c:1472:1: note: declare 'static' if the function is not intended to be used outside of this translation unit u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
^
static
4 warnings generated.
vim +/skl_plane_ctl_crtc +1396 drivers/gpu/drm/i915/display/intel_gen9_plane.c
1395
> 1396 u32 skl_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)
1397 {
1398 struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
1399 u32 plane_ctl = 0;
1400
1401 if (crtc_state->uapi.async_flip)
1402 plane_ctl |= PLANE_CTL_ASYNC_FLIP;
1403
1404 if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
1405 return plane_ctl;
1406
1407 if (crtc_state->gamma_enable)
1408 plane_ctl |= PLANE_CTL_PIPE_GAMMA_ENABLE;
1409
1410 if (crtc_state->csc_enable)
1411 plane_ctl |= PLANE_CTL_PIPE_CSC_ENABLE;
1412
1413 return plane_ctl;
1414 }
1415
> 1416 u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
1417 const struct intel_plane_state *plane_state)
1418 {
1419 struct drm_i915_private *dev_priv =
1420 to_i915(plane_state->uapi.plane->dev);
1421 const struct drm_framebuffer *fb = plane_state->hw.fb;
1422 unsigned int rotation = plane_state->hw.rotation;
1423 const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
1424 u32 plane_ctl;
1425
1426 plane_ctl = PLANE_CTL_ENABLE;
1427
1428 if (INTEL_GEN(dev_priv) < 10 && !IS_GEMINILAKE(dev_priv)) {
1429 plane_ctl |= skl_plane_ctl_alpha(plane_state);
1430 plane_ctl |= PLANE_CTL_PLANE_GAMMA_DISABLE;
1431
1432 if (plane_state->hw.color_encoding == DRM_COLOR_YCBCR_BT709)
1433 plane_ctl |= PLANE_CTL_YUV_TO_RGB_CSC_FORMAT_BT709;
1434
1435 if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
1436 plane_ctl |= PLANE_CTL_YUV_RANGE_CORRECTION_DISABLE;
1437 }
1438
1439 plane_ctl |= skl_plane_ctl_format(fb->format->format);
1440 plane_ctl |= skl_plane_ctl_tiling(fb->modifier);
1441 plane_ctl |= skl_plane_ctl_rotate(rotation & DRM_MODE_ROTATE_MASK);
1442
1443 if (INTEL_GEN(dev_priv) >= 10)
1444 plane_ctl |= cnl_plane_ctl_flip(rotation &
1445 DRM_MODE_REFLECT_MASK);
1446
1447 if (key->flags & I915_SET_COLORKEY_DESTINATION)
1448 plane_ctl |= PLANE_CTL_KEY_ENABLE_DESTINATION;
1449 else if (key->flags & I915_SET_COLORKEY_SOURCE)
1450 plane_ctl |= PLANE_CTL_KEY_ENABLE_SOURCE;
1451
1452 return plane_ctl;
1453 }
1454
> 1455 u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state)
1456 {
1457 struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
1458 u32 plane_color_ctl = 0;
1459
1460 if (INTEL_GEN(dev_priv) >= 11)
1461 return plane_color_ctl;
1462
1463 if (crtc_state->gamma_enable)
1464 plane_color_ctl |= PLANE_COLOR_PIPE_GAMMA_ENABLE;
1465
1466 if (crtc_state->csc_enable)
1467 plane_color_ctl |= PLANE_COLOR_PIPE_CSC_ENABLE;
1468
1469 return plane_color_ctl;
1470 }
1471
> 1472 u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, 1473 const struct intel_plane_state *plane_state)
1474 {
1475 struct drm_i915_private *dev_priv =
1476 to_i915(plane_state->uapi.plane->dev);
1477 const struct drm_framebuffer *fb = plane_state->hw.fb;
1478 struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
1479 u32 plane_color_ctl = 0;
1480
1481 plane_color_ctl |= PLANE_COLOR_PLANE_GAMMA_DISABLE;
1482 plane_color_ctl |= glk_plane_color_ctl_alpha(plane_state);
1483
1484 if (fb->format->is_yuv && !icl_is_hdr_plane(dev_priv, plane->id)) {
1485 switch (plane_state->hw.color_encoding) {
1486 case DRM_COLOR_YCBCR_BT709:
1487 plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
1488 break;
1489 case DRM_COLOR_YCBCR_BT2020:
1490 plane_color_ctl |=
1491 PLANE_COLOR_CSC_MODE_YUV2020_TO_RGB2020;
1492 break;
1493 default:
1494 plane_color_ctl |=
1495 PLANE_COLOR_CSC_MODE_YUV601_TO_RGB601;
1496 }
1497 if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
1498 plane_color_ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
1499 } else if (fb->format->is_yuv) {
1500 plane_color_ctl |= PLANE_COLOR_INPUT_CSC_ENABLE;
1501 }
1502
1503 return plane_color_ctl;
1504 }
1505
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 09/11] drm/i915: migrate skl planes code new file
In reply to Dave AirlieI love your patch! Yet something to improve:
Hi Dave,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip next-20201211] [cannot apply to v5.10-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Dave-Airlie/drm-i915-display-move-needs_modeset-to-an-inline-in-header/20201211-163119 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-randconfig-s002-20201209 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-179-ga00755aa-dirty # https://github.com/0day-ci/linux/commit/a5c9dca8844730c679e9716efd016bfe04f9d002 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Dave-Airlie/drm-i915-display-move-needs_modeset-to-an-inline-in-header/20201211-163119 git checkout a5c9dca8844730c679e9716efd016bfe04f9d002 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1396:5: error: no previous prototype for 'skl_plane_ctl_crtc' [-Werror=missing-prototypes]
1396 | u32 skl_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1416:5: error: no previous prototype for 'skl_plane_ctl' [-Werror=missing-prototypes]
1416 | u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
| ^~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1455:5: error: no previous prototype for 'glk_plane_color_ctl_crtc' [-Werror=missing-prototypes]
1455 | u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state)
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1472:5: error: no previous prototype for 'glk_plane_color_ctl' [-Werror=missing-prototypes] 1472 | u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
| ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
vim +/skl_plane_ctl_crtc +1396 drivers/gpu/drm/i915/display/intel_gen9_plane.c
1395
> 1396 u32 skl_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)
1397 {
1398 struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
1399 u32 plane_ctl = 0;
1400
1401 if (crtc_state->uapi.async_flip)
1402 plane_ctl |= PLANE_CTL_ASYNC_FLIP;
1403
1404 if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
1405 return plane_ctl;
1406
1407 if (crtc_state->gamma_enable)
1408 plane_ctl |= PLANE_CTL_PIPE_GAMMA_ENABLE;
1409
1410 if (crtc_state->csc_enable)
1411 plane_ctl |= PLANE_CTL_PIPE_CSC_ENABLE;
1412
1413 return plane_ctl;
1414 }
1415
> 1416 u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
1417 const struct intel_plane_state *plane_state)
1418 {
1419 struct drm_i915_private *dev_priv =
1420 to_i915(plane_state->uapi.plane->dev);
1421 const struct drm_framebuffer *fb = plane_state->hw.fb;
1422 unsigned int rotation = plane_state->hw.rotation;
1423 const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
1424 u32 plane_ctl;
1425
1426 plane_ctl = PLANE_CTL_ENABLE;
1427
1428 if (INTEL_GEN(dev_priv) < 10 && !IS_GEMINILAKE(dev_priv)) {
1429 plane_ctl |= skl_plane_ctl_alpha(plane_state);
1430 plane_ctl |= PLANE_CTL_PLANE_GAMMA_DISABLE;
1431
1432 if (plane_state->hw.color_encoding == DRM_COLOR_YCBCR_BT709)
1433 plane_ctl |= PLANE_CTL_YUV_TO_RGB_CSC_FORMAT_BT709;
1434
1435 if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
1436 plane_ctl |= PLANE_CTL_YUV_RANGE_CORRECTION_DISABLE;
1437 }
1438
1439 plane_ctl |= skl_plane_ctl_format(fb->format->format);
1440 plane_ctl |= skl_plane_ctl_tiling(fb->modifier);
1441 plane_ctl |= skl_plane_ctl_rotate(rotation & DRM_MODE_ROTATE_MASK);
1442
1443 if (INTEL_GEN(dev_priv) >= 10)
1444 plane_ctl |= cnl_plane_ctl_flip(rotation &
1445 DRM_MODE_REFLECT_MASK);
1446
1447 if (key->flags & I915_SET_COLORKEY_DESTINATION)
1448 plane_ctl |= PLANE_CTL_KEY_ENABLE_DESTINATION;
1449 else if (key->flags & I915_SET_COLORKEY_SOURCE)
1450 plane_ctl |= PLANE_CTL_KEY_ENABLE_SOURCE;
1451
1452 return plane_ctl;
1453 }
1454
> 1455 u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state)
1456 {
1457 struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
1458 u32 plane_color_ctl = 0;
1459
1460 if (INTEL_GEN(dev_priv) >= 11)
1461 return plane_color_ctl;
1462
1463 if (crtc_state->gamma_enable)
1464 plane_color_ctl |= PLANE_COLOR_PIPE_GAMMA_ENABLE;
1465
1466 if (crtc_state->csc_enable)
1467 plane_color_ctl |= PLANE_COLOR_PIPE_CSC_ENABLE;
1468
1469 return plane_color_ctl;
1470 }
1471
> 1472 u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, 1473 const struct intel_plane_state *plane_state)
1474 {
1475 struct drm_i915_private *dev_priv =
1476 to_i915(plane_state->uapi.plane->dev);
1477 const struct drm_framebuffer *fb = plane_state->hw.fb;
1478 struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
1479 u32 plane_color_ctl = 0;
1480
1481 plane_color_ctl |= PLANE_COLOR_PLANE_GAMMA_DISABLE;
1482 plane_color_ctl |= glk_plane_color_ctl_alpha(plane_state);
1483
1484 if (fb->format->is_yuv && !icl_is_hdr_plane(dev_priv, plane->id)) {
1485 switch (plane_state->hw.color_encoding) {
1486 case DRM_COLOR_YCBCR_BT709:
1487 plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
1488 break;
1489 case DRM_COLOR_YCBCR_BT2020:
1490 plane_color_ctl |=
1491 PLANE_COLOR_CSC_MODE_YUV2020_TO_RGB2020;
1492 break;
1493 default:
1494 plane_color_ctl |=
1495 PLANE_COLOR_CSC_MODE_YUV601_TO_RGB601;
1496 }
1497 if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
1498 plane_color_ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
1499 } else if (fb->format->is_yuv) {
1500 plane_color_ctl |= PLANE_COLOR_INPUT_CSC_ENABLE;
1501 }
1502
1503 return plane_color_ctl;
1504 }
1505
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 09/11] drm/i915: migrate skl planes code new file
In reply to Dave AirlieI love your patch! Perhaps something to improve:
Hi Dave,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip next-20201211] [cannot apply to v5.10-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Dave-Airlie/drm-i915-display-move-needs_modeset-to-an-inline-in-header/20201211-163119 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-s022-20201210 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-179-ga00755aa-dirty # https://github.com/0day-ci/linux/commit/a5c9dca8844730c679e9716efd016bfe04f9d002 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Dave-Airlie/drm-i915-display-move-needs_modeset-to-an-inline-in-header/20201211-163119 git checkout a5c9dca8844730c679e9716efd016bfe04f9d002 # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
"sparse warnings: (new ones prefixed by >>)"
>> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1396:5: sparse: sparse: symbol 'skl_plane_ctl_crtc' was not declared. Should it be static? >> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1416:5: sparse: sparse: symbol 'skl_plane_ctl' was not declared. Should it be static? >> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1455:5: sparse: sparse: symbol 'glk_plane_color_ctl_crtc' was not declared. Should it be static? >> drivers/gpu/drm/i915/display/intel_gen9_plane.c:1472:5: sparse: sparse: symbol 'glk_plane_color_ctl' was not declared. Should it be static?
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build bot[Intel-gfx] [RFC PATCH] drm/i915: skl_plane_ctl_crtc() can be static
In reply to Dave AirlieReported-by: kernel test robot <[email protected]>
--- intel_gen9_plane.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_gen9_plane.c +6 -6
@@ -1393,7 +1393,7 @@ static u32 cnl_plane_ctl_flip(unsigned int reflect)return 0 ; } -u32 skl_plane_ctl_crtc (const struct intel_crtc_state *crtc_state) +static u32 skl_plane_ctl_crtc (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);u32 plane_ctl =0 ;
@@ -1413,8 +1413,8 @@ u32 skl_plane_ctl_crtc(const struct intel_crtc_state *crtc_state)return plane_ctl; } -u32 skl_plane_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) +static u32 skl_plane_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) {struct drm_i915_private *dev_priv =to_i915 (plane_state->uapi.plane->dev);
@@ -1452,7 +1452,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,return plane_ctl; } -u32 glk_plane_color_ctl_crtc (const struct intel_crtc_state *crtc_state) +static u32 glk_plane_color_ctl_crtc (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);u32 plane_color_ctl =0 ;
@@ -1469,8 +1469,8 @@ u32 glk_plane_color_ctl_crtc(const struct intel_crtc_state *crtc_state)return plane_color_ctl; } -u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) +static u32 glk_plane_color_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) {struct drm_i915_private *dev_priv =to_i915 (plane_state->uapi.plane->dev);
Dave Airlie
maintainerPATCH 10/11 drm/i915: move pipe update code into crtc.
In reply to Dave AirlieFrom: Dave Airlie <[email protected]>
Daniel suggested this should move here.
--- drivers/gpu/drm/i915/display/intel_crtc.c | 230 ++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_sprite.c | 228 ------------------- 2 files changed, 230 insertions(+), 228 deletions(-)
drivers/gpu/drm/i915/display/intel_crtc.c +230 -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,7 +20,9 @@#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" /* Primary plane formats for gen <= 3 */
@@ -955,3 +960,228 @@ 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); +} + +/** +* 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 ; + + vblank_start = adjusted_mode->crtc_vblank_start; +if (adjusted_mode->flags &DRM_MODE_FLAG_INTERLACE ) + vblank_start =DIV_ROUND_UP (vblank_start,2 ); + +/* 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 (); + +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 -228
236 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 11/11 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_gen9_plane.c | 4 ++-- drivers/gpu/drm/i915/display/intel_sprite.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_gen9_plane.c +2 -2
@@ -2139,7 +2139,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;
@@ -2172,7 +2172,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); }
drivers/gpu/drm/i915/display/intel_sprite.c +3 -4
@@ -1282,19 +1282,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; }
@@ -1371,7 +1370,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 ;
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/11] drm/i915/display: move needs_modeset to an inline in header
In reply to Dave Airlie== Series Details ==
== Series Details ==
Series: series starting with [01/11] drm/i915/display: move needs_modeset to an inline in header
URL : https://patchwork.freedesktop.org/series/84812/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
HDRTEST drivers/gpu/drm/i915/display/intel_fdi.h
In file included from <command-line>:./drivers/gpu/drm/i915/display/intel_fdi.h:20:33: error: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
void intel_fdi_init_hook(struct drm_i915_private *dev_priv);
^~~~~~~~~~~~~~~~cc1: all warnings being treated as errorsdrivers/gpu/drm/i915/Makefile:310: recipe for target 'drivers/gpu/drm/i915/display/intel_fdi.hdrtest' failed make[4]: *** [drivers/gpu/drm/i915/display/intel_fdi.hdrtest] Error 1 scripts/Makefile.build:496: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:496: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:496: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1805: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx