diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2016-09-22 17:00:27 -0400 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2016-10-10 09:06:36 -0400 |
commit | 674f823b455cdb94d5773406c1caac170f87e1c4 (patch) | |
tree | 4e01748ad7a5ab9e11990ffa637a39853ec22a49 /drivers/gpu/drm/i915/intel_display.c | |
parent | 9700f8b28f9ba97f5d1b443658d94f09a9d1b6fb (diff) |
drm/i915: SAGV is not SKL-only, so rename a few things
The plan is to introduce intel_has_sagv() and then use it to discover
which platforms actually support it.
I thought about keeping the functions with their current skl names,
but found two problems: (i) skl_has_sagv() would become a very
confusing name, and (ii) intel_atomic_commit_tail() doesn't seem to be
calling any functions whose name start with a platform name, so the
"intel_" naming scheme seems make more sense than the "firstplatorm_"
naming scheme here.
Cc: stable@vger.kernel.org
Reviewed-by: Lyude <cpaul@redhat.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474578035-424-2-git-send-email-paulo.r.zanoni@intel.com
(cherry picked from commit 16dcdc4edbcf5cb130004737f2548401776170f1)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6c9881b9ab47..b74e1a890f86 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -14367,8 +14367,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) | |||
14367 | * SKL workaround: bspec recommends we disable the SAGV when we | 14367 | * SKL workaround: bspec recommends we disable the SAGV when we |
14368 | * have more then one pipe enabled | 14368 | * have more then one pipe enabled |
14369 | */ | 14369 | */ |
14370 | if (IS_SKYLAKE(dev_priv) && !skl_can_enable_sagv(state)) | 14370 | if (IS_SKYLAKE(dev_priv) && !intel_can_enable_sagv(state)) |
14371 | skl_disable_sagv(dev_priv); | 14371 | intel_disable_sagv(dev_priv); |
14372 | 14372 | ||
14373 | intel_modeset_verify_disabled(dev); | 14373 | intel_modeset_verify_disabled(dev); |
14374 | } | 14374 | } |
@@ -14426,8 +14426,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) | |||
14426 | } | 14426 | } |
14427 | 14427 | ||
14428 | if (IS_SKYLAKE(dev_priv) && intel_state->modeset && | 14428 | if (IS_SKYLAKE(dev_priv) && intel_state->modeset && |
14429 | skl_can_enable_sagv(state)) | 14429 | intel_can_enable_sagv(state)) |
14430 | skl_enable_sagv(dev_priv); | 14430 | intel_enable_sagv(dev_priv); |
14431 | 14431 | ||
14432 | drm_atomic_helper_commit_hw_done(state); | 14432 | drm_atomic_helper_commit_hw_done(state); |
14433 | 14433 | ||