| From cb11cdbd87e83fed0cfe774604b11873dde3d3fe Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Mon, 24 Jun 2013 22:59:50 +0100 |
| Subject: drm/i915: Fix a couple of "should it be static?" sparse warnings |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| A genuine 'static' omission and 2 other warnings triggered by not |
| including the header where those functions where defined. |
| |
| Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit f4db9321a77258587d70cccdd4ff556df48eba2e) |
| (cherry picked from drm-intel-next-queued) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index 941af917388b..217e5dd1b8ff 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -30,6 +30,7 @@ |
| #include "intel_drv.h" |
| #include "../../../platform/x86/intel_ips.h" |
| #include <linux/module.h> |
| +#include <drm/i915_powerwell.h> |
| |
| #define FORCEWAKE_ACK_TIMEOUT_MS 2 |
| |
| @@ -2465,8 +2466,8 @@ static void hsw_compute_wm_results(struct drm_device *dev, |
| |
| /* Find the result with the highest level enabled. Check for enable_fbc_wm in |
| * case both are at the same level. Prefer r1 in case they're the same. */ |
| -struct hsw_wm_values *hsw_find_best_result(struct hsw_wm_values *r1, |
| - struct hsw_wm_values *r2) |
| +static struct hsw_wm_values *hsw_find_best_result(struct hsw_wm_values *r1, |
| + struct hsw_wm_values *r2) |
| { |
| int i, val_r1 = 0, val_r2 = 0; |
| |
| -- |
| 1.8.5.rc3 |
| |
