Tegra DRM: Support memory bandwidth management for display
v2 cover Tegra DRM: Support memory bandwidth management for display
Hello,
Display controllers have a need for minimum memory bandwidth in order to maintain data-stream to output at a required rate. There is a visual corruption once the requirement is violated and CRTC reset may be required in order to recover. This series adds preliminary support for the memory bandwidth management, it will become active once Memory Controller drivers will get support for the PM memory bandwidth QoS.
Changelog:
v2: The total size of framebuffer is now calculated more accurately for
planar formats, taking into account chroma sub-sampling.
Dmitry Osipenko (3):
drm/tegra: dc: Tune up high priority request controls on Tegra20 drm/tegra: dc: Extend debug stats with total number of events drm/tegra: Support PM QoS memory bandwidth management
drivers/gpu/drm/tegra/dc.c | 250 +++++++++++++++++++++++++++++++++- drivers/gpu/drm/tegra/dc.h | 13 ++ drivers/gpu/drm/tegra/drm.c | 18 +++ drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/plane.h | 4 +- 5 files changed, 280 insertions(+), 6 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/3 drm/tegra: dc: Tune up high priority request controls on Tegra20
Tegra20 has a high priority request control that allow to configure when display's memory client should perform read requests with a higher priority (Tegra30+ uses other means). Set up the controls for a more aggressive prefetching to reliably avoid FIFO underflow on a lower memory frequency, this allow to safely drop the memory bandwidth requirement by about two times in a most popular cases (only one display active, video overlay inactive, no scaling is done).
--- drivers/gpu/drm/tegra/dc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/tegra/dc.c +4 -4
@@ -1828,12 +1828,12 @@ static void tegra_crtc_atomic_enable(struct drm_crtc *crtc,tegra_dc_writel (dc, value,DC_CMD_INT_POLARITY );/* initialize timer */ - value =CURSOR_THRESHOLD (0 ) |WINDOW_A_THRESHOLD (0x20 ) | -WINDOW_B_THRESHOLD (0x20 ) |WINDOW_C_THRESHOLD (0x20 ); + value =CURSOR_THRESHOLD (0 ) |WINDOW_A_THRESHOLD (0x70 ) | +WINDOW_B_THRESHOLD (0x30 ) |WINDOW_C_THRESHOLD (0x70 );tegra_dc_writel (dc, value,DC_DISP_DISP_MEM_HIGH_PRIORITY ); - value =CURSOR_THRESHOLD (0 ) |WINDOW_A_THRESHOLD (1 ) | -WINDOW_B_THRESHOLD (1 ) |WINDOW_C_THRESHOLD (1 ); + value =CURSOR_THRESHOLD (0 ) |WINDOW_A_THRESHOLD (0 ) | +WINDOW_B_THRESHOLD (0 ) |WINDOW_C_THRESHOLD (0 );tegra_dc_writel (dc, value,DC_DISP_DISP_MEM_HIGH_PRIORITY_TIMER ); value = VBLANK_INT | WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT |
Signature · 1 line
2.21.0
PATCH v2 2/3 drm/tegra: dc: Extend debug stats with total number of events
In reply to Dmitry OsipenkoI found useful to know the total number of underflow events while was working on adding support for memory bandwidth management. Currently the debug stats are getting reset after disabling CRTC, let's account the overall number of events that doesn't get reset.
--- drivers/gpu/drm/tegra/dc.c | 10 ++++++++++ drivers/gpu/drm/tegra/dc.h | 5 +++++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/tegra/dc.c +10 -0
@@ -1477,6 +1477,11 @@ static int tegra_dc_show_stats(struct seq_file *s, void *data)seq_printf (s,"underflow: %lu\n" , dc->stats.underflow);seq_printf (s,"overflow: %lu\n" , dc->stats.overflow); +seq_printf (s,"frames total: %lu\n" , dc->stats.frames_total); +seq_printf (s,"vblank total: %lu\n" , dc->stats.vblank_total); +seq_printf (s,"underflow total: %lu\n" , dc->stats.underflow_total); +seq_printf (s,"overflow total: %lu\n" , dc->stats.overflow_total); +return 0 ; }
@@ -1940,6 +1945,7 @@ static irqreturn_t tegra_dc_irq(int irq, void *data)/* dev_dbg(dc->dev, "%s(): frame end\n", __func__); */ + dc->stats.frames_total++; dc->stats.frames++; }
@@ -1948,6 +1954,7 @@ static irqreturn_t tegra_dc_irq(int irq, void *data)dev_dbg(dc->dev, "%s(): vertical blank\n", __func__); */ drm_crtc_handle_vblank (&dc->base); + dc->stats.vblank_total++; dc->stats.vblank++; }
@@ -1955,6 +1962,7 @@ static irqreturn_t tegra_dc_irq(int irq, void *data)/* dev_dbg(dc->dev, "%s(): underflow\n", __func__); */ + dc->stats.underflow_total++; dc->stats.underflow++; }
@@ -1962,11 +1970,13 @@ static irqreturn_t tegra_dc_irq(int irq, void *data)/* dev_dbg(dc->dev, "%s(): overflow\n", __func__); */ + dc->stats.overflow_total++; dc->stats.overflow++; }if (status &HEAD_UF_INT ) {dev_dbg_ratelimited (dc->dev,"%s(): head underflow\n" , __func__); + dc->stats.underflow_total++; dc->stats.underflow++; }
drivers/gpu/drm/tegra/dc.h +5 -0
@@ -41,6 +41,11 @@ struct tegra_dc_stats {unsigned long vblank;unsigned long underflow;unsigned long overflow; + +unsigned long frames_total; +unsigned long vblank_total; +unsigned long underflow_total; +unsigned long overflow_total; };struct tegra_windowgroup_soc {
Signature · 1 line
2.21.0
PATCH v2 3/3 drm/tegra: Support PM QoS memory bandwidth management
In reply to Dmitry OsipenkoDisplay controller (DC) performs isochronous memory transfers and thus has a requirement for a minimum memory bandwidth that shall be fulfilled, otherwise framebuffer data can't be fetched fast enough and this results in a DC's data-FIFO underflow that follows by a visual corruption.
The External Memory Controller drivers will provide memory bandwidth management facility via the generic Power Management QoS API soonish. This patch wires up the PM QoS API support for the display driver beforehand.
Display won't have visual corruption on coming up from suspend state when devfreq driver is active once all prerequisite bits will get upstreamed. The devfreq reaction has a quite significant latency and it also doesn't take into account the ISO transfers which may result in assumption about lower memory bandwidth requirement than actually needed.
--- drivers/gpu/drm/tegra/dc.c | 232 +++++++++++++++++++++++++++++++++- drivers/gpu/drm/tegra/dc.h | 8 ++ drivers/gpu/drm/tegra/drm.c | 18 +++ drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/plane.h | 4 +- 5 files changed, 261 insertions(+), 2 deletions(-)
drivers/gpu/drm/tegra/dc.c +231 -1
@@ -517,6 +517,123 @@ static void tegra_dc_setup_window(struct tegra_plane *plane,tegra_plane_setup_blending (plane, window); } +static unsigned long +tegra_plane_memory_bandwidth (struct drm_plane_state *state, +struct tegra_dc_window *window) +{ +struct tegra_plane_state *tegra_state; +struct drm_crtc_state *crtc_state; +const struct drm_format_info *fmt; +struct tegra_dc_window win; +unsigned int bpp_plane; +unsigned int bpp; +unsigned int mul; +unsigned int i; + +if (!state->fb || !state->visible) +return 0 ; + + crtc_state =drm_atomic_get_new_crtc_state (state->state, state->crtc); + tegra_state =to_tegra_plane_state (state); + +if (!window) + window = &win; + + window->src.w =drm_rect_width (&state->src) >>16 ; + window->src.h =drm_rect_height (&state->src) >>16 ; + window->dst.w =drm_rect_width (&state->dst); + window->dst.h =drm_rect_height (&state->dst); + window->tiling = tegra_state->tiling; + + fmt = state->fb->format; + +/* +* Note that real memory bandwidth vary depending on format and +* memory layout, we are not taking that into account because small +* estimation error isn't important since bandwidth is rounded up +* anyway. +*/ +for (i =0 , bpp =0 ; i < fmt->num_planes; i++) { + bpp_plane = fmt->cpp[i] *8 ; + +/* +* Sub-sampling is relevant for chroma planes only and vertical +* readouts are not cached, hence only horizontal sub-sampling +* matters. +*/ +if (i >0 ) + bpp_plane /= fmt->hsub; + + bpp += bpp_plane; + } + +/* +* Horizontal downscale takes extra bandwidth which roughly depends +* on the scaled width. +*/ +if (window->src.w > window->dst.w) + mul = (window->src.w - window->dst.w) * bpp /2048 +1 ; +else + mul =1 ; + +/* +* Ignore window if its width is small enough such that data-prefetch +* FIFO will easily help to overcome temporal memory pressure. This is +* a typical case for the cursor's plane. +*/ +if (mul ==1 && window->src.w * bpp <=2048 ) +return 0 ; + +/* mode.clock in kHz, bandwidth in Mbit/s */ +return crtc_state->mode.clock /1000 * bpp * mul; +} + +static unsigned long +tegra20_plane_memory_bandwidth (struct drm_plane_state *state) +{ +/* x2: ~50% efficiency */ +return tegra_plane_memory_bandwidth (state,NULL ) *2 ; +} + +static unsigned long +tegra30_plane_memory_bandwidth (struct drm_plane_state *state) +{ +struct tegra_dc_window window; +unsigned long bandwidth; + + bandwidth =tegra_plane_memory_bandwidth (state, &window); + +/* x2 memory overfetch for tiled framebuffer and DDR3 */ +if (window.tiling.mode ==TEGRA_BO_TILING_MODE_TILED ) + bandwidth *=2 ; + +/* x2: ~50% efficiency */ +return bandwidth *2 ; +} + +static unsigned long +tegra114_plane_memory_bandwidth (struct drm_plane_state *state) +{ +struct tegra_dc_window window; +unsigned long bandwidth; + + bandwidth =tegra_plane_memory_bandwidth (state, &window); + +/* x2 memory overfetch for tiled framebuffer and DDR3 */ +if (window.tiling.mode ==TEGRA_BO_TILING_MODE_TILED ) + bandwidth *=2 ; + +/* 2-channel memory */ +return bandwidth; +} + +static unsigned long +tegra124_plane_memory_bandwidth (struct drm_plane_state *state) +{ +/* 64bit memory bus */ +return tegra_plane_memory_bandwidth (state,NULL ); +} +static const u32 tegra20_primary_formats[] = {DRM_FORMAT_ARGB4444 ,DRM_FORMAT_ARGB1555 ,
@@ -606,8 +723,10 @@ static int tegra_plane_atomic_check(struct drm_plane *plane,int err;/* no need for further checks if the plane is being disabled */ -if (!state->crtc) +if (!state->crtc) { + plane_state->memory_bandwidth =0 ;return 0 ; + } err = tegra_plane_format(state->fb->format->format, &plane_state->format,
@@ -660,6 +779,8 @@ static int tegra_plane_atomic_check(struct drm_plane *plane,if (err <0 )return err; + plane_state->memory_bandwidth = dc->soc->plane_memory_bandwidth (state); +return 0 ; }
@@ -1182,6 +1303,7 @@ tegra_crtc_atomic_duplicate_state(struct drm_crtc *crtc) copy->pclk = state->pclk; copy->div = state->div; copy->planes = state->planes; + copy->memory_bandwidth = state->memory_bandwidth;return ©->base; }
@@ -1775,6 +1897,9 @@ static void tegra_crtc_atomic_disable(struct drm_crtc *crtc,spin_unlock_irq (&crtc->dev->event_lock);pm_runtime_put_sync (dc->dev); + +pm_qos_update_request (&dc->pm_qos_req, +PM_QOS_MEMORY_BANDWIDTH_DEFAULT_VALUE ); } static void tegra_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -1785,6 +1910,8 @@ static void tegra_crtc_atomic_enable(struct drm_crtc *crtc,struct tegra_dc *dc =to_tegra_dc (crtc);u32 value; +pm_qos_update_request (&dc->pm_qos_req, state->memory_bandwidth); +pm_runtime_get_sync (dc->dev);/* initialize display controller */
@@ -1894,6 +2021,9 @@ static void tegra_crtc_atomic_enable(struct drm_crtc *crtc,static void tegra_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state) { +struct tegra_dc_state *dc_old_state =to_dc_state (old_crtc_state); +struct tegra_dc_state *dc_state =to_dc_state (crtc->state); +struct tegra_dc *dc =to_tegra_dc (crtc);unsigned long flags;if (crtc->state->event) {
@@ -1908,6 +2038,23 @@ static void tegra_crtc_atomic_begin(struct drm_crtc *crtc, crtc->state->event =NULL ; } + +if (old_crtc_state && old_crtc_state->active) { +/* +* Raise memory bandwidth before changes take effect if it +* goes from low to high. +*/ +if (dc_old_state->memory_bandwidth < dc_state->memory_bandwidth) +pm_qos_update_request (&dc->pm_qos_req, + dc_state->memory_bandwidth); + }else { +/* +* Raise memory bandwidth before changes take effect if +* CRTC is turning on. +*/ +pm_qos_update_request (&dc->pm_qos_req, + dc_state->memory_bandwidth); + } } static void tegra_crtc_atomic_flush(struct drm_crtc *crtc,
@@ -1926,7 +2073,78 @@ static void tegra_crtc_atomic_flush(struct drm_crtc *crtc, value =tegra_dc_readl (dc,DC_CMD_STATE_CONTROL ); } +static bool +tegra_plane_intersects_with_other_plane (struct drm_crtc_state *state, +const struct drm_plane_state *plane_state) +{ +const struct drm_plane_state *other_state; +struct drm_plane *plane; +struct drm_rect rect; + +drm_atomic_crtc_state_for_each_plane_state (plane, other_state, state) { + rect = plane_state->dst; + +if (other_state == plane_state) +continue ; + +if (!other_state->visible || !other_state->fb) +continue ; + +if (drm_rect_intersect (&rect, &other_state->dst)) +return true; + } + +return false; +} + +static int tegra_crtc_atomic_check (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct tegra_dc_state *dc_state =to_dc_state (state); +const struct drm_plane_state *plane_state; +const struct tegra_plane_state *tegra; +unsigned long bandwidth =0 ; +struct drm_plane *plane; + +/* +* For overlapping planes pixel's data is fetched for each plane at +* the same time, hence bandwidth is accumulated in this case. +*/ +drm_atomic_crtc_state_for_each_plane_state (plane, plane_state, state) { + tegra =to_tegra_plane_state (plane_state); + +if (tegra_plane_intersects_with_other_plane (state, plane_state)) + bandwidth += tegra->memory_bandwidth; +else + bandwidth =max (bandwidth, tegra->memory_bandwidth); + } + + dc_state->memory_bandwidth = bandwidth; + +return 0 ; +} + +void tegra_crtc_atomic_post_commit (struct drm_crtc *crtc, +struct drm_crtc_state *old_crtc_state) +{ +struct tegra_dc_state *dc_old_state =to_dc_state (old_crtc_state); +struct tegra_dc_state *dc_state =to_dc_state (crtc->state); +struct tegra_dc *dc =to_tegra_dc (crtc); + +if (!dc_old_state) +return ; + +/* +* Drop memory bandwidth after changes take effect if it goes from +* high to low. +*/ +if (dc_old_state->memory_bandwidth > dc_state->memory_bandwidth) +pm_qos_update_request (&dc->pm_qos_req, + dc_state->memory_bandwidth); +} +static const struct drm_crtc_helper_funcs tegra_crtc_helper_funcs = { + .atomic_check = tegra_crtc_atomic_check, .atomic_begin = tegra_crtc_atomic_begin, .atomic_flush = tegra_crtc_atomic_flush, .atomic_enable = tegra_crtc_atomic_enable,
@@ -2082,6 +2300,9 @@ static int tegra_dc_init(struct host1x_client *client) goto cleanup; } +pm_qos_add_request (&dc->pm_qos_req,PM_QOS_MEMORY_BANDWIDTH , +PM_QOS_MEMORY_BANDWIDTH_DEFAULT_VALUE ); +return 0 ; cleanup:
@@ -2102,6 +2323,8 @@ static int tegra_dc_exit(struct host1x_client *client)struct tegra_dc *dc =host1x_client_to_dc (client);int err; +pm_qos_remove_request (&dc->pm_qos_req); +if (!tegra_dc_has_window_groups (dc))return 0 ;
@@ -2141,6 +2364,7 @@ static const struct tegra_dc_soc_info tegra20_dc_soc_info = { .modifiers = tegra20_modifiers, .has_win_a_without_filters = true, .has_win_c_without_vert_filter = true, + .plane_memory_bandwidth = tegra20_plane_memory_bandwidth, };static const struct tegra_dc_soc_info tegra30_dc_soc_info = {
@@ -2160,6 +2384,7 @@ static const struct tegra_dc_soc_info tegra30_dc_soc_info = { .modifiers = tegra20_modifiers, .has_win_a_without_filters = false, .has_win_c_without_vert_filter = false, + .plane_memory_bandwidth = tegra30_plane_memory_bandwidth, };static const struct tegra_dc_soc_info tegra114_dc_soc_info = {
@@ -2179,6 +2404,7 @@ static const struct tegra_dc_soc_info tegra114_dc_soc_info = { .modifiers = tegra20_modifiers, .has_win_a_without_filters = false, .has_win_c_without_vert_filter = false, + .plane_memory_bandwidth = tegra114_plane_memory_bandwidth, };static const struct tegra_dc_soc_info tegra124_dc_soc_info = {
@@ -2198,6 +2424,7 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = { .modifiers = tegra124_modifiers, .has_win_a_without_filters = false, .has_win_c_without_vert_filter = false, + .plane_memory_bandwidth = tegra124_plane_memory_bandwidth, };static const struct tegra_dc_soc_info tegra210_dc_soc_info = {
@@ -2217,6 +2444,7 @@ static const struct tegra_dc_soc_info tegra210_dc_soc_info = { .modifiers = tegra124_modifiers, .has_win_a_without_filters = false, .has_win_c_without_vert_filter = false, + .plane_memory_bandwidth = tegra124_plane_memory_bandwidth, };static const struct tegra_windowgroup_soc tegra186_dc_wgrps[] = {
@@ -2265,6 +2493,7 @@ static const struct tegra_dc_soc_info tegra186_dc_soc_info = { .has_nvdisplay = true, .wgrps = tegra186_dc_wgrps, .num_wgrps = ARRAY_SIZE(tegra186_dc_wgrps), + .plane_memory_bandwidth = tegra124_plane_memory_bandwidth, };static const struct tegra_windowgroup_soc tegra194_dc_wgrps[] = {
@@ -2313,6 +2542,7 @@ static const struct tegra_dc_soc_info tegra194_dc_soc_info = { .has_nvdisplay = true, .wgrps = tegra194_dc_wgrps, .num_wgrps = ARRAY_SIZE(tegra194_dc_wgrps), + .plane_memory_bandwidth = tegra124_plane_memory_bandwidth, };static const struct of_device_id tegra_dc_of_match[] = {
drivers/gpu/drm/tegra/dc.h +8 -0
@@ -11,6 +11,7 @@#define TEGRA_DC_H 1#include <linux/host1x.h> +#include <linux/pm_qos.h> #include <drm/drm_crtc.h>
@@ -26,6 +27,8 @@ struct tegra_dc_state {unsigned int div;u32 planes; + +unsigned long memory_bandwidth; };static inline struct tegra_dc_state *to_dc_state (struct drm_crtc_state *state)
@@ -74,6 +77,7 @@ struct tegra_dc_soc_info {const u64 *modifiers;bool has_win_a_without_filters;bool has_win_c_without_vert_filter; +unsigned long (*plane_memory_bandwidth)(struct drm_plane_state *state); };struct tegra_dc {
@@ -100,6 +104,8 @@ struct tegra_dc {const struct tegra_dc_soc_info *soc;struct iommu_group *group; + +struct pm_qos_request pm_qos_req; }; static inline struct tegra_dc *
@@ -160,6 +166,8 @@ int tegra_dc_state_setup_clock(struct tegra_dc *dc,struct drm_crtc_state *crtc_state, struct clk *clk, unsigned long pclk, unsigned int div); +void tegra_crtc_atomic_post_commit (struct drm_crtc *crtc, +struct drm_crtc_state *old_crtc_state);/* from rgb.c */ int tegra_dc_rgb_probe (struct tegra_dc *dc);
drivers/gpu/drm/tegra/drm.c +18 -0
@@ -19,6 +19,7 @@#include <asm/dma-iommu.h> #endif +#include "dc.h" #include "drm.h" #include "gem.h"
@@ -58,6 +59,21 @@ static const struct drm_mode_config_funcs tegra_drm_mode_config_funcs = { .atomic_commit = drm_atomic_helper_commit, }; +static void tegra_atomic_post_commit (struct drm_device *drm, +struct drm_atomic_state *old_state) +{ +struct drm_crtc_state *old_crtc_state, *new_crtc_state; +struct drm_crtc *crtc; +int i; + +for_each_oldnew_crtc_in_state (old_state, crtc, old_crtc_state, new_crtc_state, i) { +if (!new_crtc_state->active) +continue ; + +tegra_crtc_atomic_post_commit (crtc, old_crtc_state); + } +} +static void tegra_atomic_commit_tail (struct drm_atomic_state *old_state) {struct drm_device *drm = old_state->dev;
@@ -74,6 +90,8 @@ static void tegra_atomic_commit_tail(struct drm_atomic_state *old_state) }else {drm_atomic_helper_commit_tail_rpm (old_state); } + +tegra_atomic_post_commit (drm, old_state); } static const struct drm_mode_config_helper_funcs
drivers/gpu/drm/tegra/plane.c +1 -0
@@ -58,6 +58,7 @@ tegra_plane_atomic_duplicate_state(struct drm_plane *plane) copy->swap = state->swap; copy->bottom_up = state->bottom_up; copy->opaque = state->opaque; + copy->memory_bandwidth = state->memory_bandwidth;for (i =0 ; i <2 ; i++) copy->blending[i] = state->blending[i];
drivers/gpu/drm/tegra/plane.h +3 -1
@@ -51,10 +51,12 @@ struct tegra_plane_state {/* used for legacy blending support only */ struct tegra_plane_legacy_blending_state blending[2 ];bool opaque; + +unsigned long memory_bandwidth; };static inline struct tegra_plane_state * -to_tegra_plane_state (struct drm_plane_state *state) +to_tegra_plane_state (const struct drm_plane_state *state) {if (state) return container_of(state, struct tegra_plane_state, base);
Signature · 1 line
2.21.0