UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Don't pass pipe_wm around so much 

{skl,icl}_build_plane_wm() don't need to be passed the pipe_wm, so
don't. And skl_build_pipe_wm() can easily dig it out itself.

Cc: Neel Desai <neel.desai@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190312205844.6339-9-ville.syrjala@linux.intel.com
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
This commit is contained in:
Ville Syrjälä 2019-03-12 22:58:43 +02:00
parent 5e6037c88a
commit 96cb7cde1a
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/i915/intel_pm.c
View File

@ -5025,8 +5025,7 @@ static int skl_build_plane_wm_uv(struct intel_crtc_state *crtc_state,
return 0; return 0;
} }
static int skl_build_plane_wm(struct skl_pipe_wm *pipe_wm, static int skl_build_plane_wm(struct intel_crtc_state *crtc_state,
struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state) const struct intel_plane_state *plane_state)
{ {
struct intel_plane *plane = to_intel_plane(plane_state->base.plane); struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
@ -5052,8 +5051,7 @@ static int skl_build_plane_wm(struct skl_pipe_wm *pipe_wm,
return 0; return 0;
} }
static int icl_build_plane_wm(struct skl_pipe_wm *pipe_wm, static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,
struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state) const struct intel_plane_state *plane_state)
{ {
enum plane_id plane_id = to_intel_plane(plane_state->base.plane)->id; enum plane_id plane_id = to_intel_plane(plane_state->base.plane)->id;
@ -5090,10 +5088,10 @@ static int icl_build_plane_wm(struct skl_pipe_wm *pipe_wm,
return 0; return 0;
} }
static int skl_build_pipe_wm(struct intel_crtc_state *cstate, static int skl_build_pipe_wm(struct intel_crtc_state *cstate)
struct skl_pipe_wm *pipe_wm)
{ {
struct drm_i915_private *dev_priv = to_i915(cstate->base.crtc->dev); struct drm_i915_private *dev_priv = to_i915(cstate->base.crtc->dev);
struct skl_pipe_wm *pipe_wm = &cstate->wm.skl.optimal;
struct drm_crtc_state *crtc_state = &cstate->base; struct drm_crtc_state *crtc_state = &cstate->base;
struct drm_plane *plane; struct drm_plane *plane;
const struct drm_plane_state *pstate; const struct drm_plane_state *pstate;
@ -5110,11 +5108,9 @@ static int skl_build_pipe_wm(struct intel_crtc_state *cstate,
to_intel_plane_state(pstate); to_intel_plane_state(pstate);
if (INTEL_GEN(dev_priv) >= 11) if (INTEL_GEN(dev_priv) >= 11)
ret = icl_build_plane_wm(pipe_wm, ret = icl_build_plane_wm(cstate, intel_pstate);
cstate, intel_pstate);
else else
ret = skl_build_plane_wm(pipe_wm, ret = skl_build_plane_wm(cstate, intel_pstate);
cstate, intel_pstate);
if (ret) if (ret)
return ret; return ret;
} }
@ -5277,7 +5273,7 @@ static int skl_update_pipe_wm(struct intel_crtc_state *cstate,
struct intel_crtc *crtc = to_intel_crtc(cstate->base.crtc); struct intel_crtc *crtc = to_intel_crtc(cstate->base.crtc);
int ret; int ret;
ret = skl_build_pipe_wm(cstate, pipe_wm); ret = skl_build_pipe_wm(cstate);
if (ret) if (ret)
return ret; return ret;