Explorar o código

disp: msm: sde: remove unused variable topology from sde_encoder

Topology in sde_encoder is no longer used, so remove this
variable from sde_encoder.

Change-Id: Iba02ae690d81d39252d0df83882a72e35f2916ec
Signed-off-by: Lei Chen <[email protected]>
Lei Chen %!s(int64=4) %!d(string=hai) anos
pai
achega
be82344413
Modificáronse 2 ficheiros con 4 adicións e 6 borrados
  1. 4 5
      msm/sde/sde_encoder.c
  2. 0 1
      msm/sde/sde_encoder.h

+ 4 - 5
msm/sde/sde_encoder.c

@@ -2538,14 +2538,13 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc,
 		struct sde_encoder_phys *phys = sde_enc->phys_encs[i];
 
 		if (phys) {
-			if (!sde_enc->hw_pp[i * num_pp_per_intf] ||
-				sde_enc->topology.num_intf) {
-				SDE_ERROR_ENC(sde_enc, "invalid phys %d pp_per_intf %d num_intf %d",
-						i, num_pp_per_intf, sde_enc->topology.num_intf);
+			if (!sde_enc->hw_pp[i * num_pp_per_intf]) {
+				SDE_ERROR_ENC(sde_enc, "invalid phys %d pp_per_intf %d",
+						i, num_pp_per_intf);
 				return;
 			}
 			phys->hw_pp = sde_enc->hw_pp[i * num_pp_per_intf];
-			phys->connector = conn->state->connector;
+			phys->connector = conn;
 			if (phys->ops.mode_set)
 				phys->ops.mode_set(phys, mode, adj_mode);
 		}

+ 0 - 1
msm/sde/sde_encoder.h

@@ -228,7 +228,6 @@ struct sde_encoder_virt {
 	struct kthread_work input_event_work;
 	struct kthread_work esd_trigger_work;
 	struct input_handler *input_handler;
-	struct msm_display_topology topology;
 	bool vblank_enabled;
 	bool idle_pc_restore;
 	enum frame_trigger_mode_type frame_trigger_mode;