Skip to content

Fix Night Light staying enabled in the morning #463

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
chadmed wants to merge 2 commits into
base: asahi-wip
Choose a base branch
from
Open

Fix Night Light staying enabled in the morning #463

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
7ff02d9
drm: apple: Force colour management changes on CRTC enable
chadmed Mar 2, 2026
6d4a117
drm: apple: Explicitly set the identity matrix when no CTM blob exists
chadmed Mar 2, 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
5 changes: 4 additions & 1 deletion drivers/gpu/drm/apple/apple_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,11 @@ static void apple_crtc_atomic_enable(struct drm_crtc *crtc,
dcp_poweron(apple_crtc->dcp);
}

if (crtc_state->active)
if (crtc_state->active) {
/* Force the CTM to be set on first swap */
crtc_state->color_mgmt_changed = true;
dcp_crtc_atomic_modeset(crtc, state);
}
}

static void apple_crtc_atomic_disable(struct drm_crtc *crtc,
Expand Down
41 changes: 30 additions & 11 deletions drivers/gpu/drm/apple/iomfb_template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,20 +1406,39 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru
dcp->brightness.update = false;
}

if (crtc_state->color_mgmt_changed && crtc_state->ctm) {
if (crtc_state->color_mgmt_changed) {
struct iomfb_set_matrix_req mat;
struct drm_color_ctm *ctm = (struct drm_color_ctm *)crtc_state->ctm->data;

mat.unk_u32 = 9;
mat.r[0] = ctm->matrix[0];
mat.r[1] = ctm->matrix[1];
mat.r[2] = ctm->matrix[2];
mat.g[0] = ctm->matrix[3];
mat.g[1] = ctm->matrix[4];
mat.g[2] = ctm->matrix[5];
mat.b[0] = ctm->matrix[6];
mat.b[1] = ctm->matrix[7];
mat.b[2] = ctm->matrix[8];

if (crtc_state->ctm) {
struct drm_color_ctm *ctm = (struct drm_color_ctm *)crtc_state->ctm->data;

mat.r[0] = ctm->matrix[0];
mat.r[1] = ctm->matrix[1];
mat.r[2] = ctm->matrix[2];
mat.g[0] = ctm->matrix[3];
mat.g[1] = ctm->matrix[4];
mat.g[2] = ctm->matrix[5];
mat.b[0] = ctm->matrix[6];
mat.b[1] = ctm->matrix[7];
mat.b[2] = ctm->matrix[8];
} else {
/*
* Some clients will clear/free the CTM blob rather than
* reset or ramp it back to the identity. Deal with these
* here.
*/
mat.r[0] = 1;
mat.r[1] = 0;
mat.r[2] = 0;
mat.g[0] = 0;
mat.g[1] = 1;
mat.g[2] = 0;
mat.b[0] = 0;
mat.b[1] = 0;
mat.b[2] = 1;
}

iomfb_set_matrix(dcp, false, &mat, do_swap, NULL);
} else
Expand Down