Skip to content

Commit ed710d3

Browse files
committed
drm: apple: Always set iomfb_surfaces on probe
We never want this to fail or be dependent on the optional PHY, so just always set it. Signed-off-by: James Calligeros <jcalligeros99@gmail.com>
1 parent 00ee4d0 commit ed710d3

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

  • drivers/gpu/drm/apple

drivers/gpu/drm/apple/dcp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,10 @@ static int dcp_platform_probe(struct platform_device *pdev)
11781178
dev_err(dev, "Failed to get dp-phy: %ld\n", PTR_ERR(dcp->phy));
11791179
return PTR_ERR(dcp->phy);
11801180
}
1181+
1182+
if (of_property_read_u32(dev->of_node, "apple,iomfb-surfaces", &dcp->iomfb_surfaces))
1183+
dcp->iomfb_surfaces = 0b1;
1184+
11811185
if (dcp->phy) {
11821186
int ret;
11831187
/*
@@ -1221,10 +1225,6 @@ static int dcp_platform_probe(struct platform_device *pdev)
12211225
if (IS_ERR(dcp->dp2hdmi_pwren))
12221226
return PTR_ERR(dcp->dp2hdmi_pwren);
12231227

1224-
ret = of_property_read_u32(dev->of_node, "apple,iomfb-surfaces", &dcp->iomfb_surfaces);
1225-
if (ret)
1226-
dcp->iomfb_surfaces = 0b1;
1227-
12281228
ret = of_property_read_u32(dev->of_node, "mux-index", &mux_index);
12291229
if (!ret) {
12301230
dcp->xbar = devm_mux_control_get(dev, "dp-xbar");

0 commit comments

Comments
 (0)