drm/i915: Simplify intel_crtc_copy_uapi_to_hw_state_nomodeset()

Rewrite intel_crtc_copy_uapi_to_hw_state_nomodeset() in a
slightly more straightforward manner.

Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211022103304.24164-6-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä 2021-10-22 13:33:00 +03:00
parent f2e19b5866
commit e0bf3e23e2
1 changed files with 7 additions and 10 deletions

View File

@ -5762,18 +5762,15 @@ static void
intel_crtc_copy_uapi_to_hw_state_nomodeset(struct intel_atomic_state *state,
struct intel_crtc_state *crtc_state)
{
const struct intel_crtc_state *from_crtc_state = crtc_state;
const struct intel_crtc_state *master_crtc_state;
struct intel_crtc *master_crtc;
if (crtc_state->bigjoiner_slave) {
from_crtc_state = intel_atomic_get_new_crtc_state(state,
crtc_state->bigjoiner_linked_crtc);
master_crtc = intel_master_crtc(crtc_state);
master_crtc_state = intel_atomic_get_new_crtc_state(state, master_crtc);
/* No need to copy state if the master state is unchanged */
if (!from_crtc_state)
return;
}
intel_crtc_copy_color_blobs(crtc_state, from_crtc_state);
/* No need to copy state if the master state is unchanged */
if (master_crtc_state)
intel_crtc_copy_color_blobs(crtc_state, master_crtc_state);
}
static void