Commit ae9400ca authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Shrink per-platform watermark configuration

Use types of more appropriate size in struct
intel_watermark_params to save 512 bytes of .rodata.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 579627ea
...@@ -799,11 +799,11 @@ struct intel_plane { ...@@ -799,11 +799,11 @@ struct intel_plane {
}; };
struct intel_watermark_params { struct intel_watermark_params {
unsigned long fifo_size; u16 fifo_size;
unsigned long max_wm; u16 max_wm;
unsigned long default_wm; u8 default_wm;
unsigned long guard_size; u8 guard_size;
unsigned long cacheline_size; u8 cacheline_size;
}; };
struct cxsr_latency { struct cxsr_latency {
......
...@@ -775,13 +775,13 @@ static bool g4x_check_srwm(struct drm_device *dev, ...@@ -775,13 +775,13 @@ static bool g4x_check_srwm(struct drm_device *dev,
display_wm, cursor_wm); display_wm, cursor_wm);
if (display_wm > display->max_wm) { if (display_wm > display->max_wm) {
DRM_DEBUG_KMS("display watermark is too large(%d/%ld), disabling\n", DRM_DEBUG_KMS("display watermark is too large(%d/%u), disabling\n",
display_wm, display->max_wm); display_wm, display->max_wm);
return false; return false;
} }
if (cursor_wm > cursor->max_wm) { if (cursor_wm > cursor->max_wm) {
DRM_DEBUG_KMS("cursor watermark is too large(%d/%ld), disabling\n", DRM_DEBUG_KMS("cursor watermark is too large(%d/%u), disabling\n",
cursor_wm, cursor->max_wm); cursor_wm, cursor->max_wm);
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment