diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-06-19 15:25:09 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-06-19 15:26:22 +0300 |
| commit | 9918014df55d0393f99a31e3c398a4b38c90bb80 (patch) | |
| tree | 8b9174fbf11440c127231e5c352f87694b3d72ec | |
| parent | 2dce9ab2a4a716aa135f89f816813b229e6199c2 (diff) | |
tests/kms_rmfb: Fix cursor fb size
Don't use the display mode size to determine the cursor fb size. That
will lead to a framebuffer with a stride that the cursor plane won't
support. Just use the max cursor size as the fb size instead.
This started to trip up after i915 started to actually use the cursor fb
stride in commit 1e1bb8710e60 ("drm/i915: Use fb->pitches[0] in cursor code")
Cc: Marta Löfstedt <marta.lofstedt@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97975
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
| -rw-r--r-- | tests/kms_rmfb.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c index 5753d74c..9f1f564e 100644 --- a/tests/kms_rmfb.c +++ b/tests/kms_rmfb.c @@ -66,16 +66,11 @@ test_rmfb(struct rmfb_data *data, igt_output_t *output, enum pipe pipe, bool reo igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb); - igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, - DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &argb_fb); - do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width)); - if (cursor_width > mode->hdisplay) - cursor_width = mode->hdisplay; - do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height)); - if (cursor_height > mode->vdisplay) - cursor_height = mode->vdisplay; + + igt_create_fb(data->drm_fd, cursor_width, cursor_height, + DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &argb_fb); /* * Make sure these buffers are suited for display use |