diff options
| author |   Dave Airlie <airlied@redhat.com> | 2018-09-07 11:06:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-09-07 11:07:03 +1000 |
| commit | 67c6ed7cf9ebe53815f15bfdeb49ad91801c2235 (patch) | |
| tree | ad797b109a044835ea8567b2660d18feabd3251e /drivers/gpu/drm/i915/gvt/fb_decoder.h | |
| parent | Linux 4.19-rc2 (diff) | |
| parent | drm/i915/dp_mst: Fix enabling pipe clock for all streams (diff) | |
| download | linux-dev-67c6ed7cf9ebe53815f15bfdeb49ad91801c2235.tar.xz linux-dev-67c6ed7cf9ebe53815f15bfdeb49ad91801c2235.zip | |
Merge tag 'drm-intel-fixes-2018-09-05' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
The critical fix here on display side is the DP MST regression one.
But this pull also include fixes for DP SST, small VDSC register fix
and GVT's bucked with "BXT fixes, two guest warning fixes, dmabuf
format mod fix and one for recent multiple VM timeout failure."
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180905183000.GA2151@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/fb_decoder.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.h b/drivers/gpu/drm/i915/gvt/fb_decoder.h index cb055f3c81a2..60c155085029 100644 --- a/drivers/gpu/drm/i915/gvt/fb_decoder.h +++ b/drivers/gpu/drm/i915/gvt/fb_decoder.h @@ -101,7 +101,7 @@ struct intel_gvt; /* color space conversion and gamma correction are not included */ struct intel_vgpu_primary_plane_format { u8 enabled; /* plane is enabled */ - u8 tiled; /* X-tiled */ + u32 tiled; /* tiling mode: linear, X-tiled, Y tiled, etc */ u8 bpp; /* bits per pixel */ u32 hw_format; /* format field in the PRI_CTL register */ u32 drm_format; /* format in DRM definition */ |