Skip to content

Commit 6511bd6

Browse files
jannaumarcan
authored andcommitted
drm: apple: iomfb: Always parse DisplayAttributes
Fixes missing physical display dimensions for HDMI display on Macbook Pros. Signed-off-by: Janne Grunau <[email protected]>
1 parent 8997bef commit 6511bd6

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

drivers/gpu/drm/apple/iomfb_template.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -570,17 +570,12 @@ static bool dcpep_process_chunks(struct apple_dcp *dcp,
570570
if (dcp->nr_modes == 0)
571571
dev_warn(dcp->dev, "TimingElements without valid modes!\n");
572572
} else if (!strcmp(req->key, "DisplayAttributes")) {
573-
/* DisplayAttributes are empty for integrated displays, use
574-
* display dimensions read from the devicetree
575-
*/
576-
if (dcp->main_display) {
577-
ret = parse_display_attributes(&ctx, &dcp->width_mm,
578-
&dcp->height_mm);
573+
ret = parse_display_attributes(&ctx, &dcp->width_mm,
574+
&dcp->height_mm);
579575

580-
if (ret) {
581-
dev_warn(dcp->dev, "failed to parse display attribs\n");
582-
return false;
583-
}
576+
if (ret) {
577+
dev_warn(dcp->dev, "failed to parse display attribs\n");
578+
return false;
584579
}
585580

586581
dcp_set_dimensions(dcp);

0 commit comments

Comments
 (0)