Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/dmc: Pass crtc_state to intel_dmc_{enable,disable}_pipe()

I'll need to examine the crtc state during intel_dmc_enable_pipe().
To that end pass the whole crtc into intel_dmc_{enable,disable}_pipe().

Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250617170759.19552-9-ville.syrjala@linux.intel.com

+24 -9
+12 -4
drivers/gpu/drm/i915/display/intel_display.c
··· 1659 1659 1660 1660 if (drm_WARN_ON(display->drm, crtc->active)) 1661 1661 return; 1662 - for_each_pipe_crtc_modeset_enable(display, pipe_crtc, new_crtc_state, i) 1663 - intel_dmc_enable_pipe(display, pipe_crtc->pipe); 1662 + for_each_pipe_crtc_modeset_enable(display, pipe_crtc, new_crtc_state, i) { 1663 + const struct intel_crtc_state *new_pipe_crtc_state = 1664 + intel_atomic_get_new_crtc_state(state, pipe_crtc); 1665 + 1666 + intel_dmc_enable_pipe(new_pipe_crtc_state); 1667 + } 1664 1668 1665 1669 intel_encoders_pre_pll_enable(state, crtc); 1666 1670 ··· 1802 1798 1803 1799 intel_encoders_post_pll_disable(state, crtc); 1804 1800 1805 - for_each_pipe_crtc_modeset_disable(display, pipe_crtc, old_crtc_state, i) 1806 - intel_dmc_disable_pipe(display, pipe_crtc->pipe); 1801 + for_each_pipe_crtc_modeset_disable(display, pipe_crtc, old_crtc_state, i) { 1802 + const struct intel_crtc_state *old_pipe_crtc_state = 1803 + intel_atomic_get_old_crtc_state(state, pipe_crtc); 1804 + 1805 + intel_dmc_disable_pipe(old_pipe_crtc_state); 1806 + } 1807 1807 } 1808 1808 1809 1809 /* Prefer intel_encoder_is_combo() */
+8 -2
drivers/gpu/drm/i915/display/intel_dmc.c
··· 699 699 return false; 700 700 } 701 701 702 - void intel_dmc_enable_pipe(struct intel_display *display, enum pipe pipe) 702 + void intel_dmc_enable_pipe(const struct intel_crtc_state *crtc_state) 703 703 { 704 + struct intel_display *display = to_intel_display(crtc_state); 705 + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); 706 + enum pipe pipe = crtc->pipe; 704 707 enum intel_dmc_id dmc_id = PIPE_TO_DMC_ID(pipe); 705 708 706 709 if (!is_valid_dmc_id(dmc_id) || !has_dmc_id_fw(display, dmc_id)) ··· 727 724 intel_de_rmw(display, PIPEDMC_CONTROL(pipe), 0, PIPEDMC_ENABLE); 728 725 } 729 726 730 - void intel_dmc_disable_pipe(struct intel_display *display, enum pipe pipe) 727 + void intel_dmc_disable_pipe(const struct intel_crtc_state *crtc_state) 731 728 { 729 + struct intel_display *display = to_intel_display(crtc_state); 730 + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); 731 + enum pipe pipe = crtc->pipe; 732 732 enum intel_dmc_id dmc_id = PIPE_TO_DMC_ID(pipe); 733 733 734 734 if (!is_valid_dmc_id(dmc_id) || !has_dmc_id_fw(display, dmc_id))
+3 -2
drivers/gpu/drm/i915/display/intel_dmc.h
··· 10 10 11 11 enum pipe; 12 12 struct drm_printer; 13 + struct intel_crtc_state; 13 14 struct intel_display; 14 15 struct intel_dmc_snapshot; 15 16 16 17 void intel_dmc_init(struct intel_display *display); 17 18 void intel_dmc_load_program(struct intel_display *display); 18 19 void intel_dmc_disable_program(struct intel_display *display); 19 - void intel_dmc_enable_pipe(struct intel_display *display, enum pipe pipe); 20 - void intel_dmc_disable_pipe(struct intel_display *display, enum pipe pipe); 20 + void intel_dmc_enable_pipe(const struct intel_crtc_state *crtc_state); 21 + void intel_dmc_disable_pipe(const struct intel_crtc_state *crtc_state); 21 22 void intel_dmc_block_pkgc(struct intel_display *display, enum pipe pipe, 22 23 bool block); 23 24 void intel_dmc_start_pkgc_exit_at_start_of_undelayed_vblank(struct intel_display *display,
+1 -1
drivers/gpu/drm/i915/display/intel_modeset_setup.c
··· 961 961 drm_crtc_vblank_reset(&crtc->base); 962 962 963 963 if (crtc_state->hw.active) { 964 - intel_dmc_enable_pipe(display, crtc->pipe); 964 + intel_dmc_enable_pipe(crtc_state); 965 965 intel_crtc_vblank_on(crtc_state); 966 966 } 967 967 }