Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7649b54 authored by Matt Roper's avatar Matt Roper
Browse files

drm/i915: Rename s/skl_compute_pipe_wm/skl_build_pipe_wm/ 



When we added atomic watermarks, we added a new display vfunc
'compute_pipe_wm' that is used to compute any pipe-specific watermark
information that we can at atomic check time.  This was a somewhat poor
naming choice since we already had a 'skl_compute_pipe_wm' function that
doesn't quite fit this model --- the existing SKL function is something
that gets used at atomic commit time, after the DDB allocation has been
determined.  Let's rename the existing SKL function to avoid confusion.

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463061971-19638-3-git-send-email-matthew.d.roper@intel.com
parent e8f1f02e

drivers/gpu/drm/i915/intel_pm.c

+4 −4
Original line number Diff line number Diff line
@@ -3327,7 +3327,7 @@ static void skl_compute_transition_wm(struct intel_crtc_state *cstate, 
	}

}



static void skl_compute_pipe_wm(struct intel_crtc_state *cstate,

static void skl_build_pipe_wm(struct intel_crtc_state *cstate,

			      struct skl_ddb_allocation *ddb,

			      struct skl_pipe_wm *pipe_wm)

{
@@ -3596,7 +3596,7 @@ static bool skl_update_pipe_wm(struct drm_crtc *crtc, 
	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);



	skl_allocate_pipe_ddb(cstate, ddb);

	skl_compute_pipe_wm(cstate, ddb, pipe_wm);

	skl_build_pipe_wm(cstate, ddb, pipe_wm);



	if (!memcmp(&intel_crtc->wm.active.skl, pipe_wm, sizeof(*pipe_wm)))

		return false;