diff options
author | Dave Airlie <airlied@redhat.com> | 2018-09-27 19:37:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-09-27 19:37:55 -0400 |
commit | db9825c95498280718c4687fcf712016f5b6f5f6 (patch) | |
tree | 01661a811bcd16a7b6f3ee9790e77da75fd178b0 /drivers/gpu/drm/i915/intel_fbdev.c | |
parent | 156e60bc71aa31a3b42b1d66a822c2999bd0994c (diff) | |
parent | 448626103dad54ec5d06722e955586b5d557625d (diff) |
Merge tag 'drm-intel-next-2018-09-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Driver Changes:
- Bugzilla 107600: Fix stuttering video playback on MythTV on old hardware (Chris)
- Avoid black screen when using CSC coefficient matrix (Raviraj)
- Hammer PDs on Baytrail to make sure they reload (Chris)
- Capture some objects if unable to capture all, on error (Chris)
- Add W/A for 16 GB DIMMs on SKL+ (Mahesh)
- Only enable IPC for symmetric memory configurations on KBL+ (Mahesh)
- Assume pipe A to have maximum stride limits (Ville)
- Always update update OA contexts via context image (Tvrtko)
- Icelake enabling patches (Madhav, Dhinakaran)
- Add Icelake DMC firmware (Anusha)
- Fixes for CI found corner cases (Chris)
- Limit the backpressure for request allocation (Chris)
- Park GPU on module load so usage starts from known state (Chris)
- Flush tasklet when checking for idle (Chris)
- Use coherent write into the context image on BSW+ (Chris)
- Fix possible integer overflow for framebuffers that get aligned past 4GiB (Ville)
- Downgrade fence timeout from warn to notice and add debug hint (Chris)
- Fixes to multi function encoder code (Ville)
- Fix sprite plane check logic (Dan, Ville)
- PAGE_SIZE vs. I915_GTT_PAGE_SIZE fixes (Ville)
- Decode memory bandwidth and parameters for BXT and SKL+ (Mahesh)
- Overwrite BIOS set IPC value from KMS (Mahesh)
- Multiple pipe handling code cleanups/restructurings/optimizations (Ville)
- Spare low 4G address for non-48bit objects (Chris)
- Free context_setparam of struct_mutex (Chris)
- Delay updating ring register state on resume (Chris)
- Avoid unnecessarily copying overlay IOCTL parameters (Chris)
- Update GuC power domain states even without submission (Michal)
- Restore GuC preempt-context across S3/S4 (Chris)
- Add kernel selftest for rapid context switching (Chris)
- Keep runtime power management ref for live selftests (Chris)
- GEM code cleanups (Matt)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927095933.GA11458@jlahtine-desk.ger.corp.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index fb2f9fce34cd..f99332972b7a 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c | |||
@@ -175,6 +175,9 @@ static int intelfb_create(struct drm_fb_helper *helper, | |||
175 | struct drm_i915_private *dev_priv = to_i915(dev); | 175 | struct drm_i915_private *dev_priv = to_i915(dev); |
176 | struct pci_dev *pdev = dev_priv->drm.pdev; | 176 | struct pci_dev *pdev = dev_priv->drm.pdev; |
177 | struct i915_ggtt *ggtt = &dev_priv->ggtt; | 177 | struct i915_ggtt *ggtt = &dev_priv->ggtt; |
178 | const struct i915_ggtt_view view = { | ||
179 | .type = I915_GGTT_VIEW_NORMAL, | ||
180 | }; | ||
178 | struct fb_info *info; | 181 | struct fb_info *info; |
179 | struct drm_framebuffer *fb; | 182 | struct drm_framebuffer *fb; |
180 | struct i915_vma *vma; | 183 | struct i915_vma *vma; |
@@ -214,8 +217,7 @@ static int intelfb_create(struct drm_fb_helper *helper, | |||
214 | * BIOS is suitable for own access. | 217 | * BIOS is suitable for own access. |
215 | */ | 218 | */ |
216 | vma = intel_pin_and_fence_fb_obj(&ifbdev->fb->base, | 219 | vma = intel_pin_and_fence_fb_obj(&ifbdev->fb->base, |
217 | DRM_MODE_ROTATE_0, | 220 | &view, false, &flags); |
218 | false, &flags); | ||
219 | if (IS_ERR(vma)) { | 221 | if (IS_ERR(vma)) { |
220 | ret = PTR_ERR(vma); | 222 | ret = PTR_ERR(vma); |
221 | goto out_unlock; | 223 | goto out_unlock; |