Skip to content

Commit fcf3aac

Browse files
ideakdanvet
authored andcommitted
drm/i915: remove unused power_well/get_cdclk_freq api
After switching to using the component interface this API isn't needed any more. v2-3: unchanged v4: - move the removal of i915_powerwell.h to this patch (Takashi) Signed-off-by: Imre Deak <[email protected]> Reviewed-by: Takashi Iwai <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
1 parent d7055bd commit fcf3aac

File tree

2 files changed

+0
-93
lines changed

2 files changed

+0
-93
lines changed

drivers/gpu/drm/i915/intel_runtime_pm.c

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#include "i915_drv.h"
3333
#include "intel_drv.h"
34-
#include <drm/i915_powerwell.h>
3534

3635
/**
3736
* DOC: runtime pm
@@ -50,8 +49,6 @@
5049
* present for a given platform.
5150
*/
5251

53-
static struct i915_power_domains *hsw_pwr;
54-
5552
#define for_each_power_well(i, power_well, domain_mask, power_domains) \
5653
for (i = 0; \
5754
i < (power_domains)->power_well_count && \
@@ -1071,10 +1068,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
10711068
*/
10721069
if (IS_HASWELL(dev_priv->dev)) {
10731070
set_power_wells(power_domains, hsw_power_wells);
1074-
hsw_pwr = power_domains;
10751071
} else if (IS_BROADWELL(dev_priv->dev)) {
10761072
set_power_wells(power_domains, bdw_power_wells);
1077-
hsw_pwr = power_domains;
10781073
} else if (IS_CHERRYVIEW(dev_priv->dev)) {
10791074
set_power_wells(power_domains, chv_power_wells);
10801075
} else if (IS_VALLEYVIEW(dev_priv->dev)) {
@@ -1118,8 +1113,6 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)
11181113
* the power well is not enabled, so just enable it in case
11191114
* we're going to unload/reload. */
11201115
intel_display_set_init_power(dev_priv, true);
1121-
1122-
hsw_pwr = NULL;
11231116
}
11241117

11251118
static void intel_power_domains_resume(struct drm_i915_private *dev_priv)
@@ -1328,52 +1321,3 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)
13281321
pm_runtime_put_autosuspend(device);
13291322
}
13301323

1331-
/* Display audio driver power well request */
1332-
int i915_request_power_well(void)
1333-
{
1334-
struct drm_i915_private *dev_priv;
1335-
1336-
if (!hsw_pwr)
1337-
return -ENODEV;
1338-
1339-
dev_priv = container_of(hsw_pwr, struct drm_i915_private,
1340-
power_domains);
1341-
intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
1342-
return 0;
1343-
}
1344-
EXPORT_SYMBOL_GPL(i915_request_power_well);
1345-
1346-
/* Display audio driver power well release */
1347-
int i915_release_power_well(void)
1348-
{
1349-
struct drm_i915_private *dev_priv;
1350-
1351-
if (!hsw_pwr)
1352-
return -ENODEV;
1353-
1354-
dev_priv = container_of(hsw_pwr, struct drm_i915_private,
1355-
power_domains);
1356-
intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
1357-
return 0;
1358-
}
1359-
EXPORT_SYMBOL_GPL(i915_release_power_well);
1360-
1361-
/*
1362-
* Private interface for the audio driver to get CDCLK in kHz.
1363-
*
1364-
* Caller must request power well using i915_request_power_well() prior to
1365-
* making the call.
1366-
*/
1367-
int i915_get_cdclk_freq(void)
1368-
{
1369-
struct drm_i915_private *dev_priv;
1370-
1371-
if (!hsw_pwr)
1372-
return -ENODEV;
1373-
1374-
dev_priv = container_of(hsw_pwr, struct drm_i915_private,
1375-
power_domains);
1376-
1377-
return intel_ddi_get_cdclk_freq(dev_priv);
1378-
}
1379-
EXPORT_SYMBOL_GPL(i915_get_cdclk_freq);

include/drm/i915_powerwell.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)