Browse Source

drm/tilcdc: panel: Set crtc panel info at init phase

Set crtc panel info at init phase. Setting it at prepare callback does
it multiple times for no good reason and it is also too late when atomic
modeset is used.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Jyri Sarha 9 years ago
parent
commit
ee6de21b69
1 changed files with 3 additions and 2 deletions
  1. 3 2
      drivers/gpu/drm/tilcdc/tilcdc_panel.c

+ 3 - 2
drivers/gpu/drm/tilcdc/tilcdc_panel.c

@@ -64,9 +64,7 @@ static void panel_encoder_dpms(struct drm_encoder *encoder, int mode)
 
 
 static void panel_encoder_prepare(struct drm_encoder *encoder)
 static void panel_encoder_prepare(struct drm_encoder *encoder)
 {
 {
-	struct panel_encoder *panel_encoder = to_panel_encoder(encoder);
 	panel_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
 	panel_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
-	tilcdc_crtc_set_panel_info(encoder->crtc, panel_encoder->mod->info);
 }
 }
 
 
 static void panel_encoder_commit(struct drm_encoder *encoder)
 static void panel_encoder_commit(struct drm_encoder *encoder)
@@ -268,6 +266,9 @@ static int panel_modeset_init(struct tilcdc_module *mod, struct drm_device *dev)
 	priv->encoders[priv->num_encoders++] = encoder;
 	priv->encoders[priv->num_encoders++] = encoder;
 	priv->connectors[priv->num_connectors++] = connector;
 	priv->connectors[priv->num_connectors++] = connector;
 
 
+	tilcdc_crtc_set_panel_info(priv->crtc,
+				   to_panel_encoder(encoder)->mod->info);
+
 	return 0;
 	return 0;
 }
 }