drm/apple: Move panel options to its own sub-struct

Fixes overwriting the panel's physical dimensions on poweroff/sleep.

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

drivers/gpu/drm/apple/dcp-internal.h

@@ -80,6 +80,16 @@ struct dcp_brightness {
 	bool update;
 };
 
+/** laptop/AiO integrated panel parameters from DT */
+struct dcp_panel {
+	/// panel width in millimeter
+	int width_mm;
+	/// panel height in millimeter
+	int height_mm;
+	/// panel has a mini-LED backllight
+	bool has_mini_led;
+};
+
 /* TODO: move IOMFB members to its own struct */
 struct apple_dcp {
 	struct device *dev;
@@ -146,9 +156,6 @@ struct apple_dcp {
 	/* clear all surfaces on init */
 	bool surfaces_cleared;
 
-	/* panel has a mini-LED backllight */
-	bool has_mini_led;
-	
 	/* Modes valid for the connected display */
 	struct dcp_display_mode *modes;
 	unsigned int nr_modes;
@@ -173,6 +180,9 @@ struct apple_dcp {
 	/* Workqueue for updating the initial initial brightness */
 	struct work_struct bl_register_wq;
 	struct mutex bl_register_mutex;
+
+	/* integrated panel if present */
+	struct dcp_panel panel;
 };
 
 int dcp_backlight_register(struct apple_dcp *dcp);

drivers/gpu/drm/apple/dcp.c

@@ -57,14 +57,21 @@ void dcp_drm_crtc_vblank(struct apple_crtc *crtc)
 void dcp_set_dimensions(struct apple_dcp *dcp)
 {
 	int i;
+	int width_mm = dcp->width_mm;
+	int height_mm = dcp->height_mm;
+
+	if (width_mm == 0 || height_mm == 0) {
+		width_mm = dcp->panel.width_mm;
+		height_mm = dcp->panel.height_mm;
+	}
 
 	/* Set the connector info */
 	if (dcp->connector) {
 		struct drm_connector *connector = &dcp->connector->base;
 
 		mutex_lock(&connector->dev->mode_config.mutex);
-		connector->display_info.width_mm = dcp->width_mm;
-		connector->display_info.height_mm = dcp->height_mm;
+		connector->display_info.width_mm = width_mm;
+		connector->display_info.height_mm = height_mm;
 		mutex_unlock(&connector->dev->mode_config.mutex);
 	}
 
@@ -74,8 +81,8 @@ void dcp_set_dimensions(struct apple_dcp *dcp)
 	 * DisplayAttributes, and TimingElements may be sent first
 	 */
 	for (i = 0; i < dcp->nr_modes; ++i) {
-		dcp->modes[i].mode.width_mm = dcp->width_mm;
-		dcp->modes[i].mode.height_mm = dcp->height_mm;
+		dcp->modes[i].mode.width_mm = width_mm;
+		dcp->modes[i].mode.height_mm = height_mm;
 	}
 }
 
@@ -434,7 +441,7 @@ static int dcp_comp_bind(struct device *dev, struct device *main, void *data)
 	dcp->brightness.scale = 65536;
 	panel_np = of_get_compatible_child(dev->of_node, "apple,panel-mini-led");
 	if (panel_np)
-		dcp->has_mini_led = true;
+		dcp->panel.has_mini_led = true;
 	else
 		panel_np = of_get_compatible_child(dev->of_node, "apple,panel");
 
@@ -448,10 +455,10 @@ static int dcp_comp_bind(struct device *dev, struct device *main, void *data)
 				dev_err(dev, "Missing property 'apple,max-brightness'\n");
 		}
 
-		of_property_read_u32(panel_np, "width-mm", &dcp->width_mm);
+		of_property_read_u32(panel_np, "width-mm", &dcp->panel.width_mm);
 		/* use adjusted height as long as the notch is hidden */
 		of_property_read_u32(panel_np, height_prop[!dcp->notch_height],
-				     &dcp->height_mm);
+				     &dcp->panel.height_mm);
 
 		of_node_put(panel_np);
 		dcp->connector_type = DRM_MODE_CONNECTOR_eDP;

drivers/gpu/drm/apple/iomfb.c

@@ -460,7 +460,7 @@ dcpep_cb_get_uint_prop(struct apple_dcp *dcp, struct dcp_get_uint_prop_req *req)
 	    .value = 0
 	};
 
-	if (dcp->has_mini_led &&
+	if (dcp->panel.has_mini_led &&
 	    memcmp(req->obj, "SUMP", sizeof(req->obj)) == 0) { /* "PMUS */
 	    if (strncmp(req->key, "Temperature", sizeof(req->key)) == 0) {
 		/*