diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2018-06-07 10:24:50 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2018-06-07 10:24:50 +0800 |
| commit | 0766e2efc6968179ceec9828caf740ec0ac58a15 (patch) | |
| tree | 91608878dc001b045000d1afc9c98cbb456821fd /drivers/gpu/drm/i915/gvt/fb_decoder.c | |
| parent | 9a512e23f173a3598709b74d6ccf9a6616403967 (diff) | |
| parent | 14c3f8425080a1ff97df7b81f7c339bf42c427a3 (diff) | |
| download | linux-0766e2efc6968179ceec9828caf740ec0ac58a15.tar.gz linux-0766e2efc6968179ceec9828caf740ec0ac58a15.tar.bz2 linux-0766e2efc6968179ceec9828caf740ec0ac58a15.zip | |
Merge tag 'drm-intel-next-2018-06-06' into gvt-next
Backmerge for recent request->hw_context change and
new vGPU huge page capability definition.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/fb_decoder.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/fb_decoder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.c b/drivers/gpu/drm/i915/gvt/fb_decoder.c index 5e7468bd1b36..20b502c44eae 100644 --- a/drivers/gpu/drm/i915/gvt/fb_decoder.c +++ b/drivers/gpu/drm/i915/gvt/fb_decoder.c @@ -301,16 +301,16 @@ static int cursor_mode_to_drm(int mode) int cursor_pixel_formats_index = 4; switch (mode) { - case CURSOR_MODE_128_ARGB_AX: + case MCURSOR_MODE_128_ARGB_AX: cursor_pixel_formats_index = 0; break; - case CURSOR_MODE_256_ARGB_AX: + case MCURSOR_MODE_256_ARGB_AX: cursor_pixel_formats_index = 1; break; - case CURSOR_MODE_64_ARGB_AX: + case MCURSOR_MODE_64_ARGB_AX: cursor_pixel_formats_index = 2; break; - case CURSOR_MODE_64_32B_AX: + case MCURSOR_MODE_64_32B_AX: cursor_pixel_formats_index = 3; break; @@ -343,8 +343,8 @@ int intel_vgpu_decode_cursor_plane(struct intel_vgpu *vgpu, return -ENODEV; val = vgpu_vreg_t(vgpu, CURCNTR(pipe)); - mode = val & CURSOR_MODE; - plane->enabled = (mode != CURSOR_MODE_DISABLE); + mode = val & MCURSOR_MODE; + plane->enabled = (mode != MCURSOR_MODE_DISABLE); if (!plane->enabled) return -ENODEV; |