summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_fbdev.c
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_fbdev.c
parentbc8d7dffacb15bef89e21227c42e23d3ffc77b7b (diff)
downloadop-kernel-dev-5724dbd1678e2f573b13f0688277941fad66cb88.zip
op-kernel-dev-5724dbd1678e2f573b13f0688277941fad66cb88.tar.gz
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_fbdev.c')
-rw-r--r--drivers/gpu/drm/i915/intel_fbdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index ece7022..3001a867 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -531,7 +531,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
struct intel_framebuffer *fb = NULL;
struct drm_crtc *crtc;
struct intel_crtc *intel_crtc;
- struct intel_plane_config *plane_config = NULL;
+ struct intel_initial_plane_config *plane_config = NULL;
unsigned int max_size = 0;
if (!i915.fastboot)
OpenPOWER on IntegriCloud