From: "José Roberto de Souza" <jose.souza@intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "José Roberto de Souza" <jose.souza@intel.com> Subject: [PATCH 2/4] drm/mst: Some style improvements in drm_dp_mst_topology_mgr_set_mst() Date: Thu, 16 Jan 2020 17:58:35 -0800 [thread overview] Message-ID: <20200117015837.402239-2-jose.souza@intel.com> (raw) In-Reply-To: <20200117015837.402239-1-jose.souza@intel.com> Removing this lose code block and removing unnecessary bracket. Cc: Lyude Paul <lyude@redhat.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 38bf111e5f9b..e3a22362aaf2 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3491,6 +3491,8 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms mgr->mst_state = mst_state; /* set the device into MST mode */ if (mst_state) { + struct drm_dp_payload reset_pay; + WARN_ON(mgr->mst_primary); /* get dpcd info */ @@ -3521,16 +3523,12 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC); - if (ret < 0) { + if (ret < 0) goto out_unlock; - } - { - struct drm_dp_payload reset_pay; - reset_pay.start_slot = 0; - reset_pay.num_slots = 0x3f; - drm_dp_dpcd_write_payload(mgr, 0, &reset_pay); - } + reset_pay.start_slot = 0; + reset_pay.num_slots = 0x3f; + drm_dp_dpcd_write_payload(mgr, 0, &reset_pay); queue_work(system_long_wq, &mgr->work); -- 2.25.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: "José Roberto de Souza" <jose.souza@intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 2/4] drm/mst: Some style improvements in drm_dp_mst_topology_mgr_set_mst() Date: Thu, 16 Jan 2020 17:58:35 -0800 [thread overview] Message-ID: <20200117015837.402239-2-jose.souza@intel.com> (raw) In-Reply-To: <20200117015837.402239-1-jose.souza@intel.com> Removing this lose code block and removing unnecessary bracket. Cc: Lyude Paul <lyude@redhat.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 38bf111e5f9b..e3a22362aaf2 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3491,6 +3491,8 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms mgr->mst_state = mst_state; /* set the device into MST mode */ if (mst_state) { + struct drm_dp_payload reset_pay; + WARN_ON(mgr->mst_primary); /* get dpcd info */ @@ -3521,16 +3523,12 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC); - if (ret < 0) { + if (ret < 0) goto out_unlock; - } - { - struct drm_dp_payload reset_pay; - reset_pay.start_slot = 0; - reset_pay.num_slots = 0x3f; - drm_dp_dpcd_write_payload(mgr, 0, &reset_pay); - } + reset_pay.start_slot = 0; + reset_pay.num_slots = 0x3f; + drm_dp_dpcd_write_payload(mgr, 0, &reset_pay); queue_work(system_long_wq, &mgr->work); -- 2.25.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-01-17 1:58 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-17 1:58 [PATCH 1/4] drm/mst: Don't do atomic checks over disabled managers José Roberto de Souza 2020-01-17 1:58 ` [Intel-gfx] " José Roberto de Souza 2020-01-17 1:58 ` José Roberto de Souza [this message] 2020-01-17 1:58 ` [Intel-gfx] [PATCH 2/4] drm/mst: Some style improvements in drm_dp_mst_topology_mgr_set_mst() José Roberto de Souza 2020-01-17 20:22 ` Lyude Paul 2020-01-17 20:22 ` [Intel-gfx] " Lyude Paul 2020-01-17 21:20 ` Lyude Paul 2020-01-17 21:20 ` [Intel-gfx] " Lyude Paul 2020-01-17 1:58 ` [PATCH 3/4] drm/i915/display: Remove useless call intel_dp_mst_encoder_cleanup() José Roberto de Souza 2020-01-17 1:58 ` [Intel-gfx] " José Roberto de Souza 2020-01-30 17:16 ` Ville Syrjälä 2020-01-30 17:16 ` Ville Syrjälä 2020-01-31 0:14 ` Souza, Jose 2020-01-31 0:14 ` Souza, Jose 2020-02-11 10:53 ` Lisovskiy, Stanislav 2020-02-11 10:53 ` [Intel-gfx] " Lisovskiy, Stanislav 2020-01-17 1:58 ` [PATCH 4/4] drm/i915/display: Set TRANS_DDI_MODE_SELECT to default value when disabling TRANS_DDI José Roberto de Souza 2020-01-17 1:58 ` [Intel-gfx] " José Roberto de Souza 2020-01-30 17:25 ` Ville Syrjälä 2020-01-30 17:25 ` [Intel-gfx] " Ville Syrjälä 2020-01-30 20:07 ` Souza, Jose 2020-01-30 20:07 ` [Intel-gfx] " Souza, Jose 2020-01-31 11:20 ` Ville Syrjälä 2020-01-31 11:20 ` [Intel-gfx] " Ville Syrjälä 2020-05-13 8:28 ` Sharma, Swati2 2020-05-13 8:28 ` Sharma, Swati2 2020-05-13 12:09 ` Ville Syrjälä 2020-05-13 12:09 ` Ville Syrjälä 2020-05-13 12:14 ` Ville Syrjälä 2020-05-13 12:14 ` Ville Syrjälä 2020-02-11 11:23 ` Lisovskiy, Stanislav 2020-02-11 11:23 ` [Intel-gfx] " Lisovskiy, Stanislav 2020-01-17 3:08 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/4] drm/mst: Don't do atomic checks over disabled managers Patchwork 2020-01-17 3:08 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork 2020-01-17 13:51 ` [PATCH 1/4] " Mikita Lipski 2020-01-17 13:51 ` [Intel-gfx] " Mikita Lipski 2020-01-17 20:21 ` Lyude Paul 2020-01-17 20:21 ` [Intel-gfx] " Lyude Paul 2020-01-17 21:24 ` Alex Deucher 2020-01-17 21:24 ` [Intel-gfx] " Alex Deucher 2020-01-20 10:42 ` [Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/4] " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200117015837.402239-2-jose.souza@intel.com \ --to=jose.souza@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.