Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions drivers/gpu/drm/drm_mipi_dbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ static void mipi_dbi_set_window_address(struct mipi_dbi_dev *dbidev,
}

static void mipi_dbi_fb_dirty(struct iosys_map *src, struct drm_framebuffer *fb,
struct drm_rect *rect, struct drm_format_conv_state *fmtcnv_state)
struct drm_rect *rect, unsigned int src_x, unsigned int src_y,
struct drm_format_conv_state *fmtcnv_state)
{
struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(fb->dev);
unsigned int height = rect->y2 - rect->y1;
Expand All @@ -298,8 +299,13 @@ static void mipi_dbi_fb_dirty(struct iosys_map *src, struct drm_framebuffer *fb,
tr = src->vaddr; /* TODO: Use mapping abstraction properly */
}

mipi_dbi_set_window_address(dbidev, rect->x1, rect->x2 - 1, rect->y1,
rect->y2 - 1);
/*
* @rect is in framebuffer coordinates and has been clipped to the plane
* src rectangle by the damage iterator. The panel is addressed relative
* to the src origin, so subtract it here.
*/
mipi_dbi_set_window_address(dbidev, rect->x1 - src_x, rect->x2 - 1 - src_x,
rect->y1 - src_y, rect->y2 - 1 - src_y);

if (fb->format->format == DRM_FORMAT_XRGB8888)
dst_format = drm_format_info(dbidev->pixel_format);
Expand Down Expand Up @@ -390,6 +396,8 @@ void drm_mipi_dbi_plane_helper_atomic_update(struct drm_plane *plane,
if (drm_dev_enter(plane->dev, &idx)) {
if (drm_atomic_helper_damage_merged(old_plane_state, plane_state, &rect))
mipi_dbi_fb_dirty(&shadow_plane_state->data[0], fb, &rect,
plane_state->src_x >> 16,
plane_state->src_y >> 16,
&shadow_plane_state->fmtcnv_state);
drm_dev_exit(idx);
}
Expand Down
8 changes: 6 additions & 2 deletions drivers/gpu/drm/tiny/hx8357d.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,13 @@ static int hx8357d_probe(struct spi_device *spi)
return ret;

drm->mode_config.min_width = dbidev->mode.hdisplay;
drm->mode_config.max_width = dbidev->mode.hdisplay;
/*
* Allow a framebuffer larger than the panel so a sub-region can be
* selected via the plane src rectangle (crop / pan with no scaling).
*/
drm->mode_config.max_width = 4096;
drm->mode_config.min_height = dbidev->mode.vdisplay;
drm->mode_config.max_height = dbidev->mode.vdisplay;
drm->mode_config.max_height = 4096;
drm->mode_config.funcs = &hx8357d_mode_config_funcs;
drm->mode_config.preferred_depth = 16;
drm->mode_config.helper_private = &hx8357d_mode_config_helper_funcs;
Expand Down
8 changes: 6 additions & 2 deletions drivers/gpu/drm/tiny/ili9341.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,13 @@ static int ili9341_probe(struct spi_device *spi)
return ret;

drm->mode_config.min_width = dbidev->mode.hdisplay;
drm->mode_config.max_width = dbidev->mode.hdisplay;
/*
* Allow a framebuffer larger than the panel so a sub-region can be
* selected via the plane src rectangle (crop / pan with no scaling).
*/
drm->mode_config.max_width = 4096;
drm->mode_config.min_height = dbidev->mode.vdisplay;
drm->mode_config.max_height = dbidev->mode.vdisplay;
drm->mode_config.max_height = 4096;
drm->mode_config.funcs = &ili9341_mode_config_funcs;
drm->mode_config.preferred_depth = 16;
drm->mode_config.helper_private = &ili9341_mode_config_helper_funcs;
Expand Down
Loading