diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-11-19 10:55:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-19 10:55:00 -0800 |
| commit | f2be6d710d25be7d8d13f49f713d69dea9c71d57 (patch) | |
| tree | 1b3dde663a53e7f4f7a8cc17674405dc9d29554a /drivers/gpu/drm/i915/intel_drv.h | |
| parent | mlxsw: spectrum: Expose discard counters via ethtool (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-f2be6d710d25be7d8d13f49f713d69dea9c71d57.tar.xz linux-dev-f2be6d710d25be7d8d13f49f713d69dea9c71d57.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index f8dc84b2d2d3..8b298e5f012d 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1646,7 +1646,7 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode, void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state); -u16 skl_scaler_calc_phase(int sub, bool chroma_center); +u16 skl_scaler_calc_phase(int sub, int scale, bool chroma_center); int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state); int skl_max_scale(const struct intel_crtc_state *crtc_state, u32 pixel_format); |