git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From a2c8327a1b534574d51f5ea42009876e0008efd2 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Mon, 9 Sep 2024 17:28:00 +0100
   4 Subject: [PATCH 1346/1350] drm/vc4: Do not include writeback conn load in load
   5  tracker
   6
   7 The transposer/writeback connector should be running with a
   8 lower priority, so shouldn't be factored into the load
   9 calculations.
  10
  11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  12 ---
  13  drivers/gpu/drm/vc4/vc4_kms.c | 17 +++++++++++++----
  14  1 file changed, 13 insertions(+), 4 deletions(-)
  15
  16 --- a/drivers/gpu/drm/vc4/vc4_kms.c
  17 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
  18 @@ -674,17 +674,26 @@ static int vc4_load_tracker_atomic_check
  19         for_each_oldnew_plane_in_state(state, plane, old_plane_state,
  20                                        new_plane_state, i) {
  21                 struct vc4_plane_state *vc4_plane_state;
  22 +               struct vc4_crtc *vc4_crtc;
  23
  24                 if (old_plane_state->fb && old_plane_state->crtc) {
  25                         vc4_plane_state = to_vc4_plane_state(old_plane_state);
  26 -                       load_state->membus_load -= vc4_plane_state->membus_load;
  27 -                       load_state->hvs_load -= vc4_plane_state->hvs_load;
  28 +                       vc4_crtc = to_vc4_crtc(old_plane_state->crtc);
  29 +
  30 +                       if (!vc4_crtc->feeds_txp) {
  31 +                               load_state->membus_load -= vc4_plane_state->membus_load;
  32 +                               load_state->hvs_load -= vc4_plane_state->hvs_load;
  33 +                       }
  34                 }
  35
  36                 if (new_plane_state->fb && new_plane_state->crtc) {
  37                         vc4_plane_state = to_vc4_plane_state(new_plane_state);
  38 -                       load_state->membus_load += vc4_plane_state->membus_load;
  39 -                       load_state->hvs_load += vc4_plane_state->hvs_load;
  40 +                       vc4_crtc = to_vc4_crtc(new_plane_state->crtc);
  41 +
  42 +                       if (!vc4_crtc->feeds_txp) {
  43 +                               load_state->membus_load += vc4_plane_state->membus_load;
  44 +                               load_state->hvs_load += vc4_plane_state->hvs_load;
  45 +                       }
  46                 }
  47         }
  48