From: Ville Syrjälä Date: Fri, 5 Jul 2013 08:57:16 +0000 (+0300) Subject: drm/i915: Rename hsw_wm_get_pixel_rate to ilk_pipe_pixel_rate X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3658729a72b19f5e1cb92bd972939a13db970168;p=deliverable%2Flinux.git drm/i915: Rename hsw_wm_get_pixel_rate to ilk_pipe_pixel_rate hsw_wm_get_pixel_rate() isn't specific to HSW. In fact it should be made to handle all gens, but for now it depends on the PCH panel fitter state, so give it an ilk_ prefix. Signed-off-by: Ville Syrjälä Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 9ef476b2eeeb..8505e74e3645 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2095,8 +2095,8 @@ static void ivybridge_update_wm(struct drm_device *dev) cursor_wm); } -static uint32_t hsw_wm_get_pixel_rate(struct drm_device *dev, - struct drm_crtc *crtc) +static uint32_t ilk_pipe_pixel_rate(struct drm_device *dev, + struct drm_crtc *crtc) { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); uint32_t pixel_rate, pfit_size; @@ -2388,7 +2388,7 @@ static void hsw_compute_wm_parameters(struct drm_device *dev, pipes_active++; p->pipe_htotal = intel_crtc->config.adjusted_mode.htotal; - p->pixel_rate = hsw_wm_get_pixel_rate(dev, crtc); + p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc); p->pri_bytes_per_pixel = crtc->fb->bits_per_pixel / 8; p->cur_bytes_per_pixel = 4; p->pri_horiz_pixels =