Skip to content

Commit adf1383

Browse files
committed
drm: apple: Do not set IOMFBParameter_adaptive_sync on poweron
This was actually unnecessary, and having dcp_on_set_parameter as a dcp_callback_t will introduce some complicated duplication when enabling VRR. Remove this callback and just set the display handle on poweron instead. Signed-off-by: James Calligeros <[email protected]>
1 parent 39c9079 commit adf1383

1 file changed

Lines changed: 6 additions & 24 deletions

File tree

drivers/gpu/drm/apple/iomfb_template.c

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -784,26 +784,11 @@ static void dcp_on_set_power_state(struct apple_dcp *dcp, void *out, void *cooki
784784
dcp_set_power_state(dcp, false, &req, dcp_on_final, cookie);
785785
}
786786

787-
static void dcp_on_set_parameter(struct apple_dcp *dcp, void *out, void *cookie)
788-
{
789-
struct dcp_set_parameter_dcp param = {
790-
.param = 14,
791-
.value = { 0 },
792-
#if DCP_FW_VER >= DCP_FW_VERSION(13, 2, 0)
793-
.count = 3,
794-
#else
795-
.count = 1,
796-
#endif
797-
};
798-
799-
dcp_set_parameter_dcp(dcp, false, &param, dcp_on_set_power_state, cookie);
800-
}
801-
802787
void DCP_FW_NAME(iomfb_poweron)(struct apple_dcp *dcp)
803788
{
804789
struct dcp_wait_cookie *cookie;
805790
int ret;
806-
u32 handle;
791+
u32 handle = 0;
807792
dev_info(dcp->dev, "dcp_poweron() starting\n");
808793

809794
cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
@@ -815,15 +800,12 @@ void DCP_FW_NAME(iomfb_poweron)(struct apple_dcp *dcp)
815800
/* increase refcount to ensure the receiver has a reference */
816801
kref_get(&cookie->refcount);
817802

818-
if (dcp->main_display) {
819-
handle = 0;
820-
dcp_set_display_device(dcp, false, &handle, dcp_on_set_power_state,
821-
cookie);
822-
} else {
803+
if (!dcp->main_display)
823804
handle = 2;
824-
dcp_set_display_device(dcp, false, &handle,
825-
dcp_on_set_parameter, cookie);
826-
}
805+
806+
dcp_set_display_device(dcp, false, &handle, dcp_on_set_power_state,
807+
cookie);
808+
827809
ret = wait_for_completion_timeout(&cookie->done, msecs_to_jiffies(10000));
828810

829811
if (ret == 0) {

0 commit comments

Comments
 (0)