[WIP/RFC 23/31] fbdev: sh_mobile_lcdc: Return display connection state in display_on

@@ -125,12 +125,14 @@ static void sh_mipi_shutdown(struct platform_device *pdev)
 	sh_mipi_dsi_enable(mipi, false);
 }
 
-static void mipi_display_on(struct sh_mobile_lcdc_entity *entity)
+static bool mipi_display_on(struct sh_mobile_lcdc_entity *entity)
 {
 	struct sh_mipi *mipi = to_sh_mipi(entity);
 
 	pm_runtime_get_sync(mipi->dev);
 	sh_mipi_dsi_enable(mipi, true);
+
+	return true;
 }
 
 static void mipi_display_off(struct sh_mobile_lcdc_entity *entity)

@@ -1000,13 +1000,13 @@ static irqreturn_t sh_hdmi_hotplug(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static void sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
+static bool sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
 {
 	struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity);
 	struct sh_mobile_lcdc_chan *ch = entity->lcdc;
-	struct fb_info *info = ch->info;
 
-	dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi, info->state);
+	dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi,
+		hdmi->hp_state);
 
 	/*
 	 * hp_state can be set to

@@ -1021,10 +1021,11 @@ static void sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
 		dev_dbg(hdmi->dev, "HDMI running\n");
 		break;
 	case HDMI_HOTPLUG_DISCONNECTED:
-		info->state = FBINFO_STATE_SUSPENDED;
 	default:
 		hdmi->var = ch->display_var;
 	}
+
+	return hdmi->hp_state != HDMI_HOTPLUG_DISCONNECTED;
 }
 
 static void sh_hdmi_display_off(struct sh_mobile_lcdc_entity *entity)

@@ -335,9 +335,13 @@ static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info)
 static void sh_mobile_lcdc_display_on(struct sh_mobile_lcdc_chan *ch)
 {
 	struct sh_mobile_lcdc_panel_cfg *panel = &ch->cfg.panel_cfg;
+	bool connected;
 
-	if (ch->tx_dev)
-		ch->tx_dev->ops->display_on(ch->tx_dev);
+	if (ch->tx_dev) {
+		connected = ch->tx_dev->ops->display_on(ch->tx_dev);
+		if (!connected)
+			ch->info->state = FBINFO_STATE_SUSPENDED;
+	}
 
 	/* HDMI must be enabled before LCDC configuration */
 	if (panel->display_on)

@@ -23,7 +23,7 @@ struct sh_mobile_lcdc_chan;
 
 struct sh_mobile_lcdc_entity_ops {
 	/* Display */
-	void (*display_on)(struct sh_mobile_lcdc_entity *entity);
+	bool (*display_on)(struct sh_mobile_lcdc_entity *entity);
 	void (*display_off)(struct sh_mobile_lcdc_entity *entity);
 };