summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-02 19:55:04 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-11 23:51:39 +0100
commit3e37394802c1f2b0000da0a096455d2a3900df48 (patch)
tree56ccf85e09e58d3e7fe97f57746deef1a7e096cf /drivers/gpu/drm/i915/i915_drv.h
parentc85aa8855a4b2e0477fe6dfd0835270f2277aa8c (diff)
downloadlinux-3e37394802c1f2b0000da0a096455d2a3900df48.tar.gz
linux-3e37394802c1f2b0000da0a096455d2a3900df48.tar.bz2
linux-3e37394802c1f2b0000da0a096455d2a3900df48.zip
drm/i915: move pwrctx/renderctx to the other ilk power state
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index abf87c6977e8..8c7c43f07873 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -581,6 +581,9 @@ struct intel_ilk_power_mgmt {
int c_m;
int r_t;
+
+ struct drm_i915_gem_object *pwrctx;
+ struct drm_i915_gem_object *renderctx;
};
typedef struct drm_i915_private {
@@ -618,9 +621,6 @@ typedef struct drm_i915_private {
drm_dma_handle_t *status_page_dmah;
uint32_t counter;
- struct drm_i915_gem_object *pwrctx;
- struct drm_i915_gem_object *renderctx;
-
struct resource mch_res;
atomic_t irq_received;