Watermark atomic fixes (v2)
Subsystems (2)
cover Watermark atomic fixes (v2)
I'm in the process of reworking watermarks to play more nicely with atomic driver design. It sounds like a few people are already running into watermark-related problems caused by the atomic changes, so I've extracted a few early patches here that might solve those immediate issues.
Note that the first patch here moves all of the watermark code out of intel_pm.c and into intel_wm.c. Watermarks are already very complicated and the move to atomic is just adding to the complexity, so it's probably a good idea to give them their own file before we start making a lot of other changes.
v2: Rebased against latest di-nightly. A few watermark changes had landed
since I last rebased my watermark branch, so the original patch series no longer applied cleanly.
Matt Roper (3):
drm/i915: Move watermark handling to intel_wm.c (v2) drm/i915: Kill intel_crtc->cursor_{width,height} (v2) drm/i915: Use plane->state->fb in watermark code (v2)
drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_debugfs.c | 3 +- drivers/gpu/drm/i915/intel_display.c | 21 +- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_pm.c | 3499 --------------------------------- drivers/gpu/drm/i915/intel_wm.c | 3588 ++++++++++++++++++++++++++++++++++ 6 files changed, 3605 insertions(+), 3513 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_wm.c
Signature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915: Move watermark handling to intel_wm.c (v2)
Move watermark handling from intel_pm.c to intel_wm.c and add a little bit of kerneldoc to exported functions. We also add a new intel_init_wm() function to setup memory timing information and initialize the relevant watermark vfuncs.
v2: Rebase
Jira: VIZ-4612
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/intel_display.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_pm.c | 3499 --------------------------------- drivers/gpu/drm/i915/intel_wm.c | 3588 ++++++++++++++++++++++++++++++++++ 5 files changed, 3594 insertions(+), 3500 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_wm.c
drivers/gpu/drm/i915/Makefile +2 -1
@@ -55,7 +55,8 @@ i915-y += intel_audio.o \ intel_overlay.o \ intel_psr.o \ intel_sideband.o \ - intel_sprite.o + intel_sprite.o \ + intel_wm.o i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
drivers/gpu/drm/i915/intel_display.c +1 -0
@@ -13325,6 +13325,7 @@ void intel_modeset_init(struct drm_device *dev)intel_init_quirks (dev);intel_init_pm (dev); +intel_init_wm (dev);if (INTEL_INFO (dev)->num_pipes ==0 )return ;
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1261,6 +1261,9 @@ void intel_pre_disable_primary(struct drm_crtc *crtc);/* intel_tv.c */ void intel_tv_init (struct drm_device *dev); +/* intel_wm.c */ +void intel_init_wm (struct drm_device *dev); +/* intel_atomic.c */ int intel_atomic_check (struct drm_device *dev,struct drm_atomic_state *state);
drivers/gpu/drm/i915/intel_pm.c +0 -3499
2,975 lines not on this page · raw message
drivers/gpu/drm/i915/intel_wm.c new file +3588 -0
3,588 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
PATCH 2/3 drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
In reply to Matt RoperThe cursor size fields in intel_crtc just duplicate the data from cursor->state.crtc_{w,h} so we don't need them any more. Worse, their use in the watermark code actually introduces a subtle bug since they don't get updated to mirror the state values until the plane commit stage, which is *after* we've already used them to calculate new watermark values. This happens because we had to move watermark updates slightly earlier (outside vblank evasion) in commit
commit 32b7eeec4d1e861230b09d437e95d76c86ff4a68
Author: Matt Roper <[email protected]>
Date: Wed Dec 24 07:59:06 2014 -0800
drm/i915: Refactor work that can sleep out of commit (v7)
Dropping the intel_crtc fields and just using the state values (which are properly updated by the time watermark updates happen) should solve the problem.
Aside from the actual removal of the struct fields (which are formatted in a way that I couldn't figure out how to match in Coccinelle), the rest of this patch was generated via the following semantic patch:
// Drop assignment
@@
struct intel_crtc *C;
struct drm_plane_state S;
@@
(
- C->cursor_width = S.crtc_w;
|
- C->cursor_height = S.crtc_h;
)
// Replace usage
@@
struct intel_crtc *C;
expression E;
@@
(
- C->cursor_width
+ C->base.cursor->state->crtc_w
|
- C->cursor_height
+ C->base.cursor->state->crtc_h
|
- to_intel_crtc(E)->cursor_width
+ E->cursor->state->crtc_w
|
- to_intel_crtc(E)->cursor_height
+ E->cursor->state->crtc_h
)v2: Rebase
Cc: Ville Syrjälä <[email protected]>
Cc: Joe Konno <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89346
--- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- drivers/gpu/drm/i915/intel_display.c | 20 +++++++++----------- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_wm.c | 12 ++++++------ 4 files changed, 17 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -1
@@ -2677,7 +2677,8 @@ static int i915_display_info(struct seq_file *m, void *unused) active =cursor_position (dev, crtc->pipe, &x, &y);seq_printf (m,"\tcursor visible? %s, position (%d, %d), size %dx%d, addr 0x%08x, active? %s\n" ,yesno (crtc->cursor_base), - x, y, crtc->cursor_width, crtc->cursor_height, + x, y, crtc->base.cursor->state->crtc_w, + crtc->base.cursor->state->crtc_h, crtc->cursor_addr,yesno (active)); }
drivers/gpu/drm/i915/intel_display.c +9 -11
@@ -8409,8 +8409,8 @@ static void i845_update_cursor(struct drm_crtc *crtc, u32 base)uint32_t cntl =0 , size =0 ;if (base) { -unsigned int width = intel_crtc->cursor_width; -unsigned int height = intel_crtc->cursor_height; +unsigned int width = intel_crtc->base.cursor->state->crtc_w; +unsigned int height = intel_crtc->base.cursor->state->crtc_h;unsigned int stride =roundup_pow_of_two (width) *4 ;switch (stride) {
@@ -8474,7 +8474,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base) cntl =0 ;if (base) { cntl =MCURSOR_GAMMA_ENABLE ; -switch (intel_crtc->cursor_width) { +switch (intel_crtc->base.cursor->state->crtc_w) {case 64 : cntl |=CURSOR_MODE_64_ARGB_AX ;break ;
@@ -8485,7 +8485,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base) cntl |=CURSOR_MODE_256_ARGB_AX ;break ;default : -MISSING_CASE (intel_crtc->cursor_width); +MISSING_CASE (intel_crtc->base.cursor->state->crtc_w);return ; } cntl |= pipe <<28 ;/* Connect to correct pipe */
@@ -8532,7 +8532,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, base =0 ;if (x <0 ) { -if (x + intel_crtc->cursor_width <=0 ) +if (x + intel_crtc->base.cursor->state->crtc_w <=0 ) base =0 ; pos |=CURSOR_POS_SIGN <<CURSOR_X_SHIFT ;
@@ -8541,7 +8541,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, pos |= x <<CURSOR_X_SHIFT ;if (y <0 ) { -if (y + intel_crtc->cursor_height <=0 ) +if (y + intel_crtc->base.cursor->state->crtc_h <=0 ) base =0 ; pos |=CURSOR_POS_SIGN <<CURSOR_Y_SHIFT ;
@@ -8557,8 +8557,8 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,/* ILK+ do this automagically */ if (HAS_GMCH_DISPLAY (dev) && crtc->cursor->state->rotation ==BIT (DRM_ROTATE_180 )) { - base += (intel_crtc->cursor_height * - intel_crtc->cursor_width -1 ) *4 ; + base += (intel_crtc->base.cursor->state->crtc_h * + intel_crtc->base.cursor->state->crtc_w -1 ) *4 ; }if (IS_845G (dev) ||IS_I865G (dev))
@@ -12299,7 +12299,7 @@ intel_check_cursor_plane(struct drm_plane *plane, finish:if (intel_crtc->active) { -if (intel_crtc->cursor_width != state->base.crtc_w) +if (intel_crtc->base.cursor->state->crtc_w != state->base.crtc_w) intel_crtc->atomic.update_wm = true; intel_crtc->atomic.fb_bits |=
@@ -12342,8 +12342,6 @@ intel_commit_cursor_plane(struct drm_plane *plane, intel_crtc->cursor_addr = addr; intel_crtc->cursor_bo = obj; update: - intel_crtc->cursor_width = state->base.crtc_w; - intel_crtc->cursor_height = state->base.crtc_h;if (intel_crtc->active)intel_crtc_update_cursor (crtc, state->visible);
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -464,7 +464,6 @@ struct intel_crtc {struct drm_i915_gem_object *cursor_bo;uint32_t cursor_addr; -int16_t cursor_width, cursor_height;uint32_t cursor_cntl;uint32_t cursor_size;uint32_t cursor_base;
drivers/gpu/drm/i915/intel_wm.c +6 -6
@@ -587,7 +587,7 @@ static bool g4x_compute_wm0(struct drm_device *dev,/* Use the large buffer method to calculate cursor watermark */ line_time_us =max (htotal *1000 / clock,1 ); line_count = (cursor_latency_ns / line_time_us +1000 ) /1000 ; - entries = line_count *to_intel_crtc (crtc)->cursor_width * pixel_size; + entries = line_count * crtc->cursor->state->crtc_w * pixel_size; tlb_miss = cursor->fifo_size*cursor->cacheline_size - hdisplay *8 ;if (tlb_miss >0 ) entries += tlb_miss;
@@ -673,7 +673,7 @@ static bool g4x_compute_srwm(struct drm_device *dev, *display_wm = entries + display->guard_size;/* calculate the self-refresh watermark for display cursor */ - entries = line_count * pixel_size *to_intel_crtc (crtc)->cursor_width; + entries = line_count * pixel_size * crtc->cursor->state->crtc_w; entries =DIV_ROUND_UP (entries, cursor->cacheline_size); *cursor_wm = entries + cursor->guard_size;
@@ -1041,7 +1041,7 @@ static void i965_update_wm(struct drm_crtc *unused_crtc) entries, srwm); entries = (((sr_latency_ns / line_time_us) +1000 ) /1000 ) * - pixel_size *to_intel_crtc (crtc)->cursor_width; + pixel_size * crtc->cursor->state->crtc_w; entries =DIV_ROUND_UP (entries, i965_cursor_wm_info.cacheline_size); cursor_sr = i965_cursor_wm_info.fifo_size -
@@ -1877,7 +1877,7 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc, p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel /8 ; p->cur.bytes_per_pixel =4 ; p->pri.horiz_pixels = intel_crtc->config->pipe_src_w; - p->cur.horiz_pixels = intel_crtc->cursor_width; + p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;/* TODO: for now, assume primary and cursor planes are always enabled. */ p->pri.enabled = true; p->cur.enabled = true;
@@ -2673,8 +2673,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, p->cursor.enabled = true; p->cursor.bytes_per_pixel =4 ; - p->cursor.horiz_pixels = intel_crtc->cursor_width ? - intel_crtc->cursor_width :64 ; + p->cursor.horiz_pixels = intel_crtc->base.cursor->state->crtc_w ? + intel_crtc->base.cursor->state->crtc_w :64 ; }list_for_each_entry (plane, &dev->mode_config.plane_list, head) {
Signature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: Use plane->state->fb in watermark code (v2)
In reply to Matt Roperplane->fb is a legacy pointer that not always be up-to-date (or updated early enough). Make sure the watermark code uses plane->state->fb so that we're always doing our calculations based on the correct framebuffers.
This patch was generated by Coccinelle with the following semantic patch:
@@
struct drm_plane *P;
@@
- P->fb
+ P->state->fbv2: Rebase
--- drivers/gpu/drm/i915/intel_wm.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_wm.c +11 -11
@@ -496,7 +496,7 @@ static void pineview_update_wm(struct drm_crtc *unused_crtc) crtc =single_enabled_crtc (dev);if (crtc) {const struct drm_display_mode *adjusted_mode; -int pixel_size = crtc->primary->fb->bits_per_pixel /8 ; +int pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;int clock; adjusted_mode = &to_intel_crtc (crtc)->config->base.adjusted_mode;
@@ -572,7 +572,7 @@ static bool g4x_compute_wm0(struct drm_device *dev, clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; - pixel_size = crtc->primary->fb->bits_per_pixel /8 ; + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;/* Use the small buffer method to calculate plane watermark */ entries = ((clock * pixel_size /1000 ) * display_latency_ns) /1000 ;
@@ -659,7 +659,7 @@ static bool g4x_compute_srwm(struct drm_device *dev, clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; - pixel_size = crtc->primary->fb->bits_per_pixel /8 ; + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ; line_time_us =max (htotal *1000 / clock,1 ); line_count = (latency_ns / line_time_us +1000 ) /1000 ;
@@ -742,7 +742,7 @@ static void vlv_update_drain_latency(struct drm_crtc *crtc) }/* Primary plane Drain Latency */ - pixel_size = crtc->primary->fb->bits_per_pixel /8 ;/* BPP */ + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;/* BPP */ if (vlv_compute_drain_latency (crtc, pixel_size, &prec_mult, &drain_latency)) { plane_prec = (prec_mult == high_precision) ? DDL_PLANE_PRECISION_HIGH :
@@ -1023,7 +1023,7 @@ static void i965_update_wm(struct drm_crtc *unused_crtc)int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; -int pixel_size = crtc->primary->fb->bits_per_pixel /8 ; +int pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;unsigned long line_time_us;int entries;
@@ -1100,7 +1100,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) crtc =intel_get_crtc_for_plane (dev,0 );if (intel_crtc_active (crtc)) {const struct drm_display_mode *adjusted_mode; -int cpp = crtc->primary->fb->bits_per_pixel /8 ; +int cpp = crtc->primary->state->fb->bits_per_pixel /8 ;if (IS_GEN2 (dev)) cpp =4 ;
@@ -1122,7 +1122,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) crtc =intel_get_crtc_for_plane (dev,1 );if (intel_crtc_active (crtc)) {const struct drm_display_mode *adjusted_mode; -int cpp = crtc->primary->fb->bits_per_pixel /8 ; +int cpp = crtc->primary->state->fb->bits_per_pixel /8 ;if (IS_GEN2 (dev)) cpp =4 ;
@@ -1145,7 +1145,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)if (IS_I915GM (dev) && enabled) {struct drm_i915_gem_object *obj; - obj =intel_fb_obj (enabled->primary->fb); + obj =intel_fb_obj (enabled->primary->state->fb);/* self-refresh seems busted with untiled */ if (obj->tiling_mode ==I915_TILING_NONE )
@@ -1169,7 +1169,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (enabled)->config->pipe_src_w; -int pixel_size = enabled->primary->fb->bits_per_pixel /8 ; +int pixel_size = enabled->primary->state->fb->bits_per_pixel /8 ;unsigned long line_time_us;int entries;
@@ -1874,7 +1874,7 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc, p->active = true; p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal; p->pixel_rate =ilk_pipe_pixel_rate (dev, crtc); - p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel /8 ; + p->pri.bytes_per_pixel = crtc->primary->state->fb->bits_per_pixel /8 ; p->cur.bytes_per_pixel =4 ; p->pri.horiz_pixels = intel_crtc->config->pipe_src_w; p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
@@ -2659,7 +2659,7 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,*/ p->plane[0 ].enabled = true; p->plane[0 ].bytes_per_pixel = - crtc->primary->fb->bits_per_pixel /8 ; + crtc->primary->state->fb->bits_per_pixel /8 ; p->plane[0 ].horiz_pixels = intel_crtc->config->pipe_src_w; p->plane[0 ].vert_pixels = intel_crtc->config->pipe_src_h; p->plane[0 ].tiling =DRM_FORMAT_MOD_NONE ;
Signature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: Use plane->state->fb in watermark code (v2)
Hi
2015-02-27 15:12 GMT-03:00 Matt Roper <[email protected]>:
Quoted 4 lines
plane->fbis a legacy pointer that not always be up-to-date (or updated early enough). Make sure the watermark code usesplane->state->fbso that we're always doing our calculations based on the correct framebuffers.
QA reported a regression caused by this patch: Kernel NULL pointer dereference.
https://bugs.freedesktop.org/show_bug.cgi?id=89388
Quoted 127 lines
This patch was generated by Coccinelle with the following semantic patch:
@@ struct drm_plane *P; @@ - P->fb + P->state->fbv2: Rebase
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/intel_wm.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/intel_wm.c +11
-12@@ -496,7 +496,7 @@ static void pineview_update_wm(struct drm_crtc *unused_crtc) crtc =single_enabled_crtc (dev);if (crtc) {const struct drm_display_mode *adjusted_mode; -int pixel_size = crtc->primary->fb->bits_per_pixel /8 ; +int pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;int clock; adjusted_mode = &to_intel_crtc (crtc)->config->base.adjusted_mode;@@ -572,7 +572,7 @@ static bool g4x_compute_wm0(struct drm_device *dev, clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; - pixel_size = crtc->primary->fb->bits_per_pixel /8 ; + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;/* Use the small buffer method to calculate plane watermark */ entries = ((clock * pixel_size /1000 ) * display_latency_ns) /1000 ;@@ -659,7 +659,7 @@ static bool g4x_compute_srwm(struct drm_device *dev, clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; - pixel_size = crtc->primary->fb->bits_per_pixel /8 ; + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ; line_time_us =max (htotal *1000 / clock,1 ); line_count = (latency_ns / line_time_us +1000 ) /1000 ;@@ -742,7 +742,7 @@ static void vlv_update_drain_latency(struct drm_crtc *crtc) }/* Primary plane Drain Latency */ - pixel_size = crtc->primary->fb->bits_per_pixel /8 ;/* BPP */ + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;/* BPP */ if (vlv_compute_drain_latency (crtc, pixel_size, &prec_mult, &drain_latency)) { plane_prec = (prec_mult == high_precision) ? DDL_PLANE_PRECISION_HIGH :@@ -1023,7 +1023,7 @@ static void i965_update_wm(struct drm_crtc *unused_crtc)int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; -int pixel_size = crtc->primary->fb->bits_per_pixel /8 ; +int pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;unsigned long line_time_us;int entries;@@ -1100,7 +1100,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) crtc =intel_get_crtc_for_plane (dev,0 );if (intel_crtc_active (crtc)) {const struct drm_display_mode *adjusted_mode; -int cpp = crtc->primary->fb->bits_per_pixel /8 ; +int cpp = crtc->primary->state->fb->bits_per_pixel /8 ;if (IS_GEN2 (dev)) cpp =4 ;@@ -1122,7 +1122,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) crtc =intel_get_crtc_for_plane (dev,1 );if (intel_crtc_active (crtc)) {const struct drm_display_mode *adjusted_mode; -int cpp = crtc->primary->fb->bits_per_pixel /8 ; +int cpp = crtc->primary->state->fb->bits_per_pixel /8 ;if (IS_GEN2 (dev)) cpp =4 ;@@ -1145,7 +1145,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)if (IS_I915GM (dev) && enabled) {struct drm_i915_gem_object *obj; - obj =intel_fb_obj (enabled->primary->fb); + obj =intel_fb_obj (enabled->primary->state->fb);/* self-refresh seems busted with untiled */ if (obj->tiling_mode ==I915_TILING_NONE )@@ -1169,7 +1169,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (enabled)->config->pipe_src_w; -int pixel_size = enabled->primary->fb->bits_per_pixel /8 ; +int pixel_size = enabled->primary->state->fb->bits_per_pixel /8 ;unsigned long line_time_us;int entries;@@ -1874,7 +1874,7 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc, p->active = true; p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal; p->pixel_rate =ilk_pipe_pixel_rate (dev, crtc); - p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel /8 ; + p->pri.bytes_per_pixel = crtc->primary->state->fb->bits_per_pixel /8 ; p->cur.bytes_per_pixel =4 ; p->pri.horiz_pixels = intel_crtc->config->pipe_src_w; p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;@@ -2659,7 +2659,7 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,*/ p->plane[0 ].enabled = true; p->plane[0 ].bytes_per_pixel = - crtc->primary->fb->bits_per_pixel /8 ; + crtc->primary->state->fb->bits_per_pixel /8 ; p->plane[0 ].horiz_pixels = intel_crtc->config->pipe_src_w; p->plane[0 ].vert_pixels = intel_crtc->config->pipe_src_h; p->plane[0 ].tiling =DRM_FORMAT_MOD_NONE ; --1.8.5.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Paulo Zanoni _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: Use plane->state->fb in watermark code (v2)
Quoted 12 lines · Paulo Zanoni
Hi
2015-02-27 15:12 GMT-03:00 Matt Roper <[email protected]>:
Quoted 4 lines
plane->fbis a legacy pointer that not always be up-to-date (or updated early enough). Make sure the watermark code usesplane->state->fbso that we're always doing our calculations based on the correct framebuffers.QA reported a regression caused by this patch: Kernel NULL pointer dereference.
Yeah, I just saw this. I'll have to look more closely later today, but I'm wondering whether I should have just done this replacement driver-wide instead of restricted to just the watermark code. I suspect killing off all of our uses of the old, legacy fields and using the new atomic state values instead will make the driver more internally consistent so we quit running into issues like this.
Matt
Quoted 133 lines
Quoted 128 lines
This patch was generated by Coccinelle with the following semantic patch:
@@ struct drm_plane *P; @@ - P->fb + P->state->fbv2: Rebase
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/intel_wm.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/intel_wm.c +11
-12@@ -496,7 +496,7 @@ static void pineview_update_wm(struct drm_crtc *unused_crtc) crtc =single_enabled_crtc (dev);if (crtc) {const struct drm_display_mode *adjusted_mode; -int pixel_size = crtc->primary->fb->bits_per_pixel /8 ; +int pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;int clock; adjusted_mode = &to_intel_crtc (crtc)->config->base.adjusted_mode;@@ -572,7 +572,7 @@ static bool g4x_compute_wm0(struct drm_device *dev, clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; - pixel_size = crtc->primary->fb->bits_per_pixel /8 ; + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;/* Use the small buffer method to calculate plane watermark */ entries = ((clock * pixel_size /1000 ) * display_latency_ns) /1000 ;@@ -659,7 +659,7 @@ static bool g4x_compute_srwm(struct drm_device *dev, clock = adjusted_mode->crtc_clock; htotal = adjusted_mode->crtc_htotal; hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; - pixel_size = crtc->primary->fb->bits_per_pixel /8 ; + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ; line_time_us =max (htotal *1000 / clock,1 ); line_count = (latency_ns / line_time_us +1000 ) /1000 ;@@ -742,7 +742,7 @@ static void vlv_update_drain_latency(struct drm_crtc *crtc) }/* Primary plane Drain Latency */ - pixel_size = crtc->primary->fb->bits_per_pixel /8 ;/* BPP */ + pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;/* BPP */ if (vlv_compute_drain_latency (crtc, pixel_size, &prec_mult, &drain_latency)) { plane_prec = (prec_mult == high_precision) ? DDL_PLANE_PRECISION_HIGH :@@ -1023,7 +1023,7 @@ static void i965_update_wm(struct drm_crtc *unused_crtc)int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (crtc)->config->pipe_src_w; -int pixel_size = crtc->primary->fb->bits_per_pixel /8 ; +int pixel_size = crtc->primary->state->fb->bits_per_pixel /8 ;unsigned long line_time_us;int entries;@@ -1100,7 +1100,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) crtc =intel_get_crtc_for_plane (dev,0 );if (intel_crtc_active (crtc)) {const struct drm_display_mode *adjusted_mode; -int cpp = crtc->primary->fb->bits_per_pixel /8 ; +int cpp = crtc->primary->state->fb->bits_per_pixel /8 ;if (IS_GEN2 (dev)) cpp =4 ;@@ -1122,7 +1122,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) crtc =intel_get_crtc_for_plane (dev,1 );if (intel_crtc_active (crtc)) {const struct drm_display_mode *adjusted_mode; -int cpp = crtc->primary->fb->bits_per_pixel /8 ; +int cpp = crtc->primary->state->fb->bits_per_pixel /8 ;if (IS_GEN2 (dev)) cpp =4 ;@@ -1145,7 +1145,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)if (IS_I915GM (dev) && enabled) {struct drm_i915_gem_object *obj; - obj =intel_fb_obj (enabled->primary->fb); + obj =intel_fb_obj (enabled->primary->state->fb);/* self-refresh seems busted with untiled */ if (obj->tiling_mode ==I915_TILING_NONE )@@ -1169,7 +1169,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)int clock = adjusted_mode->crtc_clock;int htotal = adjusted_mode->crtc_htotal;int hdisplay =to_intel_crtc (enabled)->config->pipe_src_w; -int pixel_size = enabled->primary->fb->bits_per_pixel /8 ; +int pixel_size = enabled->primary->state->fb->bits_per_pixel /8 ;unsigned long line_time_us;int entries;@@ -1874,7 +1874,7 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc, p->active = true; p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal; p->pixel_rate =ilk_pipe_pixel_rate (dev, crtc); - p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel /8 ; + p->pri.bytes_per_pixel = crtc->primary->state->fb->bits_per_pixel /8 ; p->cur.bytes_per_pixel =4 ; p->pri.horiz_pixels = intel_crtc->config->pipe_src_w; p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;@@ -2659,7 +2659,7 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,*/ p->plane[0 ].enabled = true; p->plane[0 ].bytes_per_pixel = - crtc->primary->fb->bits_per_pixel /8 ; + crtc->primary->state->fb->bits_per_pixel /8 ; p->plane[0 ].horiz_pixels = intel_crtc->config->pipe_src_w; p->plane[0 ].vert_pixels = intel_crtc->config->pipe_src_h; p->plane[0 ].tiling =DRM_FORMAT_MOD_NONE ; --1.8.5.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 1 line
Paulo Zanoni
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Matt Roper
I'm in the process of reworking watermarks to play more nicely with atomic driver design. It sounds like a few people are already running into watermark-related problems caused by the atomic changes, so I've extracted a few early patches here that might solve those immediate issues.
Note that the first patch here moves all of the watermark code out of
intel_pm.cand intointel_wm.c. Watermarks are already very complicated and the move to atomic is just adding to the complexity, so it's probably a good idea to give them their own file before we start making a lot of other changes.
Quoted 8 lines
v2: Rebased against latest di-nightly. A few watermark changes had landed
since I last rebased my watermark branch, so the original patch series no longer applied cleanly.Matt Roper (3):
drm/i915: Move watermark handling tointel_wm.c(v2) drm/i915: Kill intel_crtc->cursor_{width,height} (v2) drm/i915: Useplane->state->fbin watermark code (v2)
Merged patches 2&3. Imo you can bring on the intel_wm.c extraction (without the display freq detection like Ville suggested maybe) anytime you want, resolving conflicts with hand-editing diffs is a breezy for me.
Thanks, Daniel
Quoted 17 lines
drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_debugfs.c | 3 +- drivers/gpu/drm/i915/intel_display.c | 21 +- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_pm.c | 3499 --------------------------------- drivers/gpu/drm/i915/intel_wm.c | 3588 ++++++++++++++++++++++++++++++++++ 6 files changed, 3605 insertions(+), 3513 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_wm.cSignature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx