| From 3e21035218b09e6fd08b9ceff1048c7a580cb315 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Wed, 9 Oct 2013 19:18:02 +0300 |
| Subject: drm/i915: Kill fbc_wm_enabled from intel_wm_config |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| The fbc_wm_enabled member in intel_wm_config is useless for the time |
| being. The original idea for it was that we'd pre-compute it and so |
| that the WM merging process could know whether it needs to worry |
| about FBC watermarks at all. |
| |
| But we don't have a convenient way to pre-check for the possibility |
| of FBC being used. intel_update_fbc() should be split up for that. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 7eaa4d56107dac87946f3b45faf37bc831f8de83) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index 9f33e37f8a2d..abea03c1e480 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -2213,7 +2213,6 @@ struct intel_wm_config { |
| unsigned int num_pipes_active; |
| bool sprites_enabled; |
| bool sprites_scaled; |
| - bool fbc_wm_enabled; |
| }; |
| |
| /* |
| -- |
| 1.8.5.rc3 |
| |