From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t 2/7] kms_rotation_crc: Framebuffer used for initial modeset does not need to be painted
Date: Wed, 22 Apr 2015 16:46:43 +0100 [thread overview]
Message-ID: <1429717608-359-3-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1429717608-359-1-git-send-email-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
It is just there to light up the display using the full modeset. Also renamed it
from fb_full to fb_modeset to be more descriptive.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Sonika Jindal <sonika.jindal@intel.com>
---
tests/kms_rotation_crc.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 22bc554..ab13f70 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -35,7 +35,7 @@ typedef struct {
igt_display_t display;
struct igt_fb fb;
struct igt_fb fb_cursor;
- struct igt_fb fb_full;
+ struct igt_fb fb_modeset;
igt_crc_t ref_crc;
igt_pipe_crc_t *pipe_crc;
igt_rotation_t rotation;
@@ -117,11 +117,10 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
{
drmModeModeInfo *mode;
igt_display_t *display = &data->display;
- int fb_id, fb_cursor_id, fb_full_id;
+ int fb_id, fb_cursor_id, fb_modeset_id;
int w, h;
uint64_t tiling = LOCAL_DRM_FORMAT_MOD_NONE;
enum igt_commit_style commit = COMMIT_LEGACY;
- int old_rotation;
igt_plane_t *primary;
igt_output_set_pipe(output, pipe);
@@ -135,12 +134,12 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
w = mode->hdisplay;
h = mode->vdisplay;
- fb_full_id = igt_create_fb(data->gfx_fd,
- w, h,
- DRM_FORMAT_XRGB8888,
- tiling,
- &data->fb_full);
- igt_assert(fb_full_id);
+ fb_modeset_id = igt_create_fb(data->gfx_fd,
+ w, h,
+ DRM_FORMAT_XRGB8888,
+ tiling,
+ &data->fb_modeset);
+ igt_assert(fb_modeset_id);
/*
* With igt_display_commit2 and COMMIT_UNIVERSAL, we call just the
@@ -149,13 +148,9 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
* we create an fb covering the crtc and call commit
*/
- old_rotation = data->rotation;
- data->rotation = IGT_ROTATION_0;
primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
- paint_squares(data, &data->fb_full, mode, IGT_ROTATION_0, primary);
- igt_plane_set_fb(primary, &data->fb_full);
+ igt_plane_set_fb(primary, &data->fb_modeset);
igt_display_commit(display);
- data->rotation = old_rotation;
/*
* For 90/270, we will use create smaller fb so that the rotated
@@ -221,7 +216,7 @@ static void cleanup_crtc(data_t *data, igt_output_t *output, igt_plane_t *plane)
igt_remove_fb(data->gfx_fd, &data->fb);
igt_remove_fb(data->gfx_fd, &data->fb_cursor);
- igt_remove_fb(data->gfx_fd, &data->fb_full);
+ igt_remove_fb(data->gfx_fd, &data->fb_modeset);
/* XXX: see the note in prepare_crtc() */
if (!plane->is_primary) {
--
2.3.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-04-22 15:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-22 15:46 [PATCH i-g-t 0/7] kms_rotation_crc cleanups Tvrtko Ursulin
2015-04-22 15:46 ` [PATCH i-g-t 1/7] kms_rotation_crc: Local framebuffers do not need to be global Tvrtko Ursulin
2015-04-22 15:46 ` Tvrtko Ursulin [this message]
2015-04-22 15:46 ` [PATCH i-g-t 3/7] kms_rotation_crc: Remove unused variable in negative test Tvrtko Ursulin
2015-04-22 15:46 ` [PATCH i-g-t 4/7] kms_rotation_crc: Negative test does not need to render anything Tvrtko Ursulin
2015-04-22 15:46 ` [PATCH i-g-t 5/7] kms_rotation_crc: Consolidate plane and cursor code paths Tvrtko Ursulin
2015-04-22 15:46 ` [PATCH i-g-t 6/7] kms_rotation_crc: No need to square the buffer in paint Tvrtko Ursulin
2015-04-22 15:46 ` [PATCH i-g-t 7/7] kms_rotation_crc: Use main test for negative cases Tvrtko Ursulin
2015-04-23 9:41 ` Jindal, Sonika
2015-04-27 17:30 ` Thomas Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429717608-359-3-git-send-email-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox