summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2015-01-20 12:51:52 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-01-27 09:51:04 +0100
commit5724dbd1678e2f573b13f0688277941fad66cb88 (patch)
tree4135398c6d43fa484478ed05af82920cd8fea7e7 /drivers/gpu/drm/i915/intel_drv.h
parentbc8d7dffacb15bef89e21227c42e23d3ffc77b7b (diff)
downloadlinux-5724dbd1678e2f573b13f0688277941fad66cb88.tar.gz
linux-5724dbd1678e2f573b13f0688277941fad66cb88.tar.bz2
linux-5724dbd1678e2f573b13f0688277941fad66cb88.zip
drm/i915: Rename plane_config to initial_plane_config
This vfunc and related structure are only used for fast boot, so let's rename them to not take them as general purpose ones. v2: Fix conflicts caused by the introduction of struct intel_crtc_state Reviewed-By: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (v1) Suggested-by: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 7f7407af8c19..e957d4d938e7 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -257,7 +257,7 @@ struct intel_plane_state {
bool hides_primary;
};
-struct intel_plane_config {
+struct intel_initial_plane_config {
unsigned int tiling;
int size;
u32 base;
@@ -468,7 +468,7 @@ struct intel_crtc {
uint32_t cursor_size;
uint32_t cursor_base;
- struct intel_plane_config plane_config;
+ struct intel_initial_plane_config plane_config;
struct intel_crtc_state *config;
struct intel_crtc_state *new_config;
bool new_enabled;