Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit 50741abcd1b022c6555925837601624ca5a238cd

Authored by Ville Syrjälä
Committed by Daniel Vetter
1 parent 7668851fec
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

drm/i915: Prepare to track new pipe config per pipe 

Add a new_config pointer to intel_crtc which will point to the new pipe
config for said crtc while intel_crtc.config will still contain the old
config during first parts of the modeset operation. This is a step
towards having the entire new state available during the compute phase,
so that we can make accurate decisions about global resource usage.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Showing 2 changed files with 6 additions and 0 deletions Side-by-side Diff

drivers/gpu/drm/i915/intel_display.c
Diff comments   View file @ 50741ab
... ... @@ -9225,6 +9225,7 @@
9225 9225 list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list,
9226 9226 base.head) {
9227 9227 WARN_ON(intel_crtc->base.enabled != intel_crtc_in_use(&intel_crtc->base));
  9228 + WARN_ON(intel_crtc->new_config != &intel_crtc->config);
9228 9229 }
9229 9230  
9230 9231 list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
... ... @@ -9656,6 +9657,7 @@
9656 9657 }
9657 9658 intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config,
9658 9659 "[modeset]");
  9660 + to_intel_crtc(crtc)->new_config = pipe_config;
9659 9661 }
9660 9662  
9661 9663 /*
... ... @@ -9689,6 +9691,7 @@
9689 9691 /* mode_set/enable/disable functions rely on a correct pipe
9690 9692 * config. */
9691 9693 to_intel_crtc(crtc)->config = *pipe_config;
  9694 + to_intel_crtc(crtc)->new_config = &to_intel_crtc(crtc)->config;
9692 9695  
9693 9696 /*
9694 9697 * Calculate and store various constants which
... ... @@ -10260,6 +10263,8 @@
10260 10263 dev_priv->plane_to_crtc_mapping[intel_crtc->plane] != NULL);
10261 10264 dev_priv->plane_to_crtc_mapping[intel_crtc->plane] = &intel_crtc->base;
10262 10265 dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base;
  10266 +
  10267 + intel_crtc->new_config = &intel_crtc->config;
10263 10268  
10264 10269 drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
10265 10270 }
drivers/gpu/drm/i915/intel_drv.h
Diff comments   View file @ 50741ab
... ... @@ -359,6 +359,7 @@
359 359 bool cursor_visible;
360 360  
361 361 struct intel_crtc_config config;
  362 + struct intel_crtc_config *new_config;
362 363 bool new_enabled;
363 364  
364 365 uint32_t ddi_pll_sel;