Fix min dbuf, 90/270 wm calcs
Subsystems (4)
cover Fix min dbuf, 90/270 wm calcs
This patch series allocates minimum dbuf blocks required for tile-y, tile-yf buffers correctly as per bspec. Also in WM calculations, for 90/270, swaps source width and height.
Chandra Konduru (2):
drm/i915: Allocate min dbuf blocks per bspec drm/i915: In DBUF/WM calcs for 90/270, swap w & h
drivers/gpu/drm/i915/intel_pm.c | 71 +++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 6 deletions(-)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/1 drm/i915: Add support for SKL background color
This patch adds support for Skylake display pipe background color.
--- Documentation/DocBook/drm.tmpl | 10 ++++- drivers/gpu/drm/i915/i915_reg.h | 10 +++++ drivers/gpu/drm/i915/intel_display.c | 73 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 + include/drm/drm_crtc.h | 3 ++ 5 files changed, 97 insertions(+), 1 deletion(-)
Documentation/DocBook/drm.tmpl +9 -1
@@ -2663,7 +2663,7 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> - <td rowspan="21" valign="top" >i915</td> + <td rowspan="22" valign="top" >i915</td> <td rowspan="2" valign="top" >Generic</td> <td valign="top" >"Broadcast RGB"</td> <td valign="top" >ENUM</td>
@@ -2687,6 +2687,14 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >TBD</td> </tr> <tr> + <td rowspan="1" valign="top" >CRTC</td> + <td valign="top" >“background_color”</td> + <td valign="top" >Range</td> + <td valign="top" >Min=0, Max=0xFFFFFF</td> + <td valign="top" >CRTC</td> + <td valign="top" >Background color in 16bpc BGR (B-MSB, R-LSB)</td> + </tr> + <tr> <td rowspan="17" valign="top" >SDVO-TV</td> <td valign="top" >“mode”</td> <td valign="top" >ENUM</td>
drivers/gpu/drm/i915/i915_reg.h +10 -0
@@ -6579,6 +6579,16 @@ enum kdiv {#define PIPE_CSC_POSTOFF_ME (pipe) _PIPE(pipe, _PIPE_A_CSC_POSTOFF_ME, _PIPE_B_CSC_POSTOFF_ME)#define PIPE_CSC_POSTOFF_LO (pipe) _PIPE(pipe, _PIPE_A_CSC_POSTOFF_LO, _PIPE_B_CSC_POSTOFF_LO) +/* Skylake pipe bottom color */ +#define _PIPE_BOTTOM_COLOR_A 0x70034 +#define _PIPE_BOTTOM_COLOR_B 0x71034 +#define _PIPE_BOTTOM_COLOR_C 0x72034 +#define PIPE_BOTTOM_GAMMA_ENABLE (1 << 31) +#define PIPE_BOTTOM_CSC_ENABLE (1 << 30) +#define PIPE_BOTTOM_COLOR_MASK 0x3FFFFFFF +#define PIPE_BOTTOM_COLOR (pipe) _PIPE3(pipe, _PIPE_BOTTOM_COLOR_A, \ + _PIPE_BOTTOM_COLOR_B, _PIPE_BOTTOM_COLOR_C) +/* VLV MIPI registers */ #define _MIPIA_PORT_CTRL (VLV_DISPLAY_BASE + 0x61190)
drivers/gpu/drm/i915/intel_display.c +73 -0
127 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -445,6 +445,8 @@ struct intel_crtc {int scanline_offset;struct intel_mmio_flip mmio_flip; + +uint32_t background_color; };struct intel_plane_wm_parameters {
include/drm/drm_crtc.h +3 -0
@@ -827,6 +827,9 @@ struct drm_mode_config {struct drm_property *plane_type_property;struct drm_property *rotation_property; +/* crtc properties */ +struct drm_property *background_color_property; +/* DVI-I properties */ struct drm_property *dvi_i_subconnector_property;struct drm_property *dvi_i_select_subconnector_property;
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: Allocate min dbuf blocks per bspec
In reply to Chandra KonduruProperly allocate min blocks per hw requirements.
--- drivers/gpu/drm/i915/intel_pm.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +37 -2
@@ -2679,6 +2679,41 @@ skl_get_total_relative_data_rate(struct intel_crtc *intel_crtc,return total_data_rate; } +static uint16_t +skl_dbuf_min_alloc (const struct intel_plane_wm_parameters *p,int y_plane) +{ +uint16_t min_alloc; + +/* For packed formats, no y-plane, return 0 */ +if (y_plane && !p->y_bytes_per_pixel) +return 0 ; + + +if (p->tiling ==I915_FORMAT_MOD_Y_TILED || + p->tiling == I915_FORMAT_MOD_Yf_TILED) { +uint32_t min_scanlines =8 ; +uint8_t bytes_per_pixel = + y_plane ? p->y_bytes_per_pixel : p->bytes_per_pixel; + +switch (bytes_per_pixel) { +case 1 : + min_scanlines =32 ; +break ; +case 2 : + min_scanlines =16 ; +break ; +case 8 : +WARN (1 ,"Unsupported pixel depth for rotation" ); + } + min_alloc =DIV_ROUND_UP ((4 * p->horiz_pixels/(y_plane ?1 :2 ) * + bytes_per_pixel),512 ) * min_scanlines/4 +3 ; + }else { + min_alloc =8 ; + } + +return min_alloc; +} + static void skl_allocate_pipe_ddb(struct drm_crtc *crtc, const struct intel_wm_config *config,
@@ -2719,9 +2754,9 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc,if (!p->enabled)continue ; - minimum[plane] =8 ; + minimum[plane] =skl_dbuf_min_alloc (p,0 );/* uv-plane/packed */ alloc_size -= minimum[plane]; - y_minimum[plane] = p->y_bytes_per_pixel ?8 :0 ; + y_minimum[plane] =skl_dbuf_min_alloc (p,1 );/* y-plane */ alloc_size -= y_minimum[plane]; }
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: In DBUF/WM calcs for 90/270, swap w & h
In reply to Chandra KonduruThis patch swaps src width and height for dbuf/wm calculations when rotation is 90/270 as per hw requirements.
--- drivers/gpu/drm/i915/intel_pm.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +28 -4
@@ -2913,6 +2913,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,enum pipe pipe = intel_crtc->pipe;struct drm_plane *plane;struct drm_framebuffer *fb; +struct intel_plane_state *plane_state; +int src_w, src_h;int i =1 ;/* Index for sprite planes start */ p->active = intel_crtc->active;
@@ -2921,6 +2923,7 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, p->pixel_rate =skl_pipe_pixel_rate (intel_crtc->config); fb = crtc->primary->state->fb; + plane_state =to_intel_plane_state (crtc->primary->state);/* For planar: Bpp is for uv plane, y_Bpp is for y plane */ if (fb) { p->plane[0 ].enabled = true;
@@ -2935,8 +2938,22 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, p->plane[0 ].y_bytes_per_pixel =0 ; p->plane[0 ].tiling =DRM_FORMAT_MOD_NONE ; } - p->plane[0 ].horiz_pixels = intel_crtc->config->pipe_src_w; - p->plane[0 ].vert_pixels = intel_crtc->config->pipe_src_h; + +if (drm_rect_width (&plane_state->src)) { + src_w =drm_rect_width (&plane_state->src) >>16 ; + src_h =drm_rect_height (&plane_state->src) >>16 ; + }else { + src_w = intel_crtc->config->pipe_src_w; + src_h = intel_crtc->config->pipe_src_h; + } + +if (intel_rotation_90_or_270 (crtc->primary->state->rotation)) { + p->plane[0 ].horiz_pixels = src_h; + p->plane[0 ].vert_pixels = src_w; + }else { + p->plane[0 ].horiz_pixels = src_w; + p->plane[0 ].vert_pixels = src_h; + } p->plane[0 ].rotation = crtc->primary->state->rotation; fb = crtc->cursor->state->fb;
@@ -3468,8 +3485,15 @@ skl_update_sprite_wm(struct drm_plane *plane, struct drm_crtc *crtc, intel_plane->wm.enabled = enabled; intel_plane->wm.scaled = scaled; - intel_plane->wm.horiz_pixels = sprite_width; - intel_plane->wm.vert_pixels = sprite_height; + +if (intel_rotation_90_or_270 (plane->state->rotation)) { + intel_plane->wm.horiz_pixels = sprite_height; + intel_plane->wm.vert_pixels = sprite_width; + }else { + intel_plane->wm.horiz_pixels = sprite_width; + intel_plane->wm.vert_pixels = sprite_height; + } + intel_plane->wm.tiling =DRM_FORMAT_MOD_NONE ;/* For planar: Bpp is for UV plane, y_Bpp is for Y plane */
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: In DBUF/WM calcs for 90/270, swap w & h
Task id: 6564 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 303/303 303/303 SNB 312/312 312/312 IVB 343/343 343/343 BYT 284/284 284/284 HSW 380/380 380/380
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx