Skip to content

drm/vc4: txp: fix writeback dimension checks and normalize rotation #7292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
name2965 wants to merge 2 commits into
base: rpi-6.12.y
Choose a base branch
from
+22 −5
Open

drm/vc4: txp: fix writeback dimension checks and normalize rotation #7292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f56ffc
drm/vc4: txp: fix incorrect width and height check logic in vc4_txp_a…
name2965 Mar 29, 2026
81efcb8
drm/vc4: txp: add implementation of the missing connector reset custo…
name2965 Apr 9, 2026
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
1 change: 1 addition & 0 deletions drivers/gpu/drm/vc4/vc4_drv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,7 @@ extern struct platform_driver vc4_vec_driver;

/* vc4_txp.c */
extern struct platform_driver vc4_txp_driver;
void vc4_txp_connector_reset(struct drm_connector *connector);

/* vc4_irq.c */
void vc4_irq_enable(struct drm_device *dev);
Expand Down
26 changes: 21 additions & 5 deletions drivers/gpu/drm/vc4/vc4_txp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@ static int vc4_txp_connector_atomic_check(struct drm_connector *conn,

fb = conn_state->writeback_job->fb;
if ((conn_state->rotation == DRM_MODE_ROTATE_0 &&
fb->width != crtc_state->mode.hdisplay &&
fb->height != crtc_state->mode.vdisplay) ||
(fb->width != crtc_state->mode.hdisplay ||
fb->height != crtc_state->mode.vdisplay)) ||
(conn_state->rotation == (DRM_MODE_ROTATE_0 | DRM_MODE_TRANSPOSE) &&
fb->width != crtc_state->mode.vdisplay &&
fb->height != crtc_state->mode.hdisplay)) {
(fb->width != crtc_state->mode.vdisplay ||
fb->height != crtc_state->mode.hdisplay))) {
DRM_DEBUG_KMS("Invalid framebuffer size %ux%u vs mode %ux%u\n",
fb->width, fb->height,
crtc_state->mode.hdisplay, crtc_state->mode.vdisplay);
Expand Down Expand Up @@ -390,11 +390,27 @@ vc4_txp_connector_detect(struct drm_connector *connector, bool force)
return connector_status_connected;
}

void vc4_txp_connector_reset(struct drm_connector *connector)
{
uint64_t rotation = DRM_MODE_ROTATE_0;

drm_atomic_helper_connector_reset(connector);

if (connector->state) {
if (connector->rotation_property)
drm_object_property_get_default_value(&connector->base,
connector->rotation_property,
&rotation);

connector->state->rotation = rotation;
}
}

static const struct drm_connector_funcs vc4_txp_connector_funcs = {
.detect = vc4_txp_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
.reset = vc4_txp_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
Expand Down