diff options
| author | Jesse Barnes | 2014-02-07 21:10:38 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-02-12 18:52:55 +0100 |
| commit | 8bcd45534ddf68ab71aeed709dacd9cf65dc0f75 (patch) | |
| tree | a70584ebcef73813dba47693530af6b87098fe4f /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Downgrade *ERROR* message for invalid user input (diff) | |
| download | kernel-qcow2-linux-8bcd45534ddf68ab71aeed709dacd9cf65dc0f75.tar.gz kernel-qcow2-linux-8bcd45534ddf68ab71aeed709dacd9cf65dc0f75.tar.xz kernel-qcow2-linux-8bcd45534ddf68ab71aeed709dacd9cf65dc0f75.zip | |
drm/i915: alloc intel_fb in the intel_fbdev struct
Allocate this struct instead, so we can re-use another allocated
elsewhere if needed.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[danvet: WARN_ON if there's no backing storage attached to an fb,
that's a bug.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 807e815503d0..ac0f6b5cfdfa 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7769,11 +7769,11 @@ mode_fits_in_fbdev(struct drm_device *dev, if (dev_priv->fbdev == NULL) return NULL; - obj = dev_priv->fbdev->ifb.obj; + obj = dev_priv->fbdev->fb->obj; if (obj == NULL) return NULL; - fb = &dev_priv->fbdev->ifb.base; + fb = &dev_priv->fbdev->fb->base; if (fb->pitches[0] < intel_framebuffer_pitch_for_width(mode->hdisplay, fb->bits_per_pixel)) return NULL; |