|
@@ -928,7 +928,7 @@ static void pineview_update_wm(struct intel_crtc *unused_crtc)
|
|
|
* and the size of 8 whole lines. This adjustment is always performed
|
|
|
* in the actual pixel depth regardless of whether FBC is enabled or not."
|
|
|
*/
|
|
|
-static int g4x_tlb_miss_wa(int fifo_size, int width, int cpp)
|
|
|
+static unsigned int g4x_tlb_miss_wa(int fifo_size, int width, int cpp)
|
|
|
{
|
|
|
int tlb_miss = fifo_size * 64 - width * cpp * 8;
|
|
|
|
|
@@ -1105,8 +1105,8 @@ static uint16_t g4x_compute_wm(const struct intel_crtc_state *crtc_state,
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
const struct drm_display_mode *adjusted_mode =
|
|
|
&crtc_state->base.adjusted_mode;
|
|
|
- int clock, htotal, cpp, width, wm;
|
|
|
- int latency = dev_priv->wm.pri_latency[level] * 10;
|
|
|
+ unsigned int latency = dev_priv->wm.pri_latency[level] * 10;
|
|
|
+ unsigned int clock, htotal, cpp, width, wm;
|
|
|
|
|
|
if (latency == 0)
|
|
|
return USHRT_MAX;
|
|
@@ -1145,7 +1145,7 @@ static uint16_t g4x_compute_wm(const struct intel_crtc_state *crtc_state,
|
|
|
level == G4X_WM_LEVEL_NORMAL) {
|
|
|
wm = intel_wm_method1(clock, cpp, latency);
|
|
|
} else {
|
|
|
- int small, large;
|
|
|
+ unsigned int small, large;
|
|
|
|
|
|
small = intel_wm_method1(clock, cpp, latency);
|
|
|
large = intel_wm_method2(clock, htotal, width, cpp, latency);
|
|
@@ -1158,7 +1158,7 @@ static uint16_t g4x_compute_wm(const struct intel_crtc_state *crtc_state,
|
|
|
|
|
|
wm = DIV_ROUND_UP(wm, 64) + 2;
|
|
|
|
|
|
- return min_t(int, wm, USHRT_MAX);
|
|
|
+ return min_t(unsigned int, wm, USHRT_MAX);
|
|
|
}
|
|
|
|
|
|
static bool g4x_raw_plane_wm_set(struct intel_crtc_state *crtc_state,
|
|
@@ -1602,7 +1602,7 @@ static uint16_t vlv_compute_wm_level(const struct intel_crtc_state *crtc_state,
|
|
|
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
|
|
|
const struct drm_display_mode *adjusted_mode =
|
|
|
&crtc_state->base.adjusted_mode;
|
|
|
- int clock, htotal, cpp, width, wm;
|
|
|
+ unsigned int clock, htotal, cpp, width, wm;
|
|
|
|
|
|
if (dev_priv->wm.pri_latency[level] == 0)
|
|
|
return USHRT_MAX;
|
|
@@ -1628,7 +1628,7 @@ static uint16_t vlv_compute_wm_level(const struct intel_crtc_state *crtc_state,
|
|
|
dev_priv->wm.pri_latency[level] * 10);
|
|
|
}
|
|
|
|
|
|
- return min_t(int, wm, USHRT_MAX);
|
|
|
+ return min_t(unsigned int, wm, USHRT_MAX);
|
|
|
}
|
|
|
|
|
|
static bool vlv_need_sprite0_fifo_workaround(unsigned int active_planes)
|