flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-09 08:56:11 +00:00
Code Issues Releases Wiki Activity

lib/kms: Drop igt_pipe->need_set_{crtc, cursor}

Browse Source 
The "need" flags on igt_pipe simply mirror the fb_changed field of the
primary/cursor planes.  Drop them and just use fb_changed instead.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Matt Roper 2014-06-30 16:44:22 -07:00 committed by Damien Lespiau
parent 67e29a30d5
commit 3cc60bab46
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/igt_kms.c
View File

@ -837,11 +837,14 @@ static int igt_output_commit(igt_output_t *output)
{ {
igt_display_t *display = output->display; igt_display_t *display = output->display;
igt_pipe_t *pipe; igt_pipe_t *pipe;
igt_plane_t *primary;
igt_plane_t *cursor;
int i; int i;
pipe = igt_output_get_driving_pipe(output); pipe = igt_output_get_driving_pipe(output);
if (pipe->need_set_crtc) { primary = igt_pipe_get_plane(pipe, IGT_PLANE_PRIMARY);
igt_plane_t *primary = &pipe->planes[0]; cursor = igt_pipe_get_plane(pipe, IGT_PLANE_CURSOR);
if (primary->fb_changed) {
drmModeModeInfo *mode; drmModeModeInfo *mode;
uint32_t fb_id, crtc_id; uint32_t fb_id, crtc_id;
int ret; int ret;
@ -887,16 +890,13 @@ static int igt_output_commit(igt_output_t *output)
igt_assert(ret == 0); igt_assert(ret == 0);
pipe->need_set_crtc = false;
primary->fb_changed = false; primary->fb_changed = false;
} }
if (pipe->need_set_cursor) { if (cursor->fb_changed) {
igt_plane_t *cursor;
uint32_t gem_handle, crtc_id; uint32_t gem_handle, crtc_id;
int ret; int ret;
cursor = igt_pipe_get_plane(pipe, IGT_PLANE_CURSOR);
crtc_id = output->config.crtc->crtc_id; crtc_id = output->config.crtc->crtc_id;
gem_handle = igt_plane_get_fb_gem_handle(cursor); gem_handle = igt_plane_get_fb_gem_handle(cursor);
@ -924,7 +924,6 @@ static int igt_output_commit(igt_output_t *output)
igt_assert(ret == 0); igt_assert(ret == 0);
pipe->need_set_cursor = false;
cursor->fb_changed = false; cursor->fb_changed = false;
} }
@ -1009,11 +1008,6 @@ void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb)
plane->fb = fb; plane->fb = fb;
if (plane->is_primary)
pipe->need_set_crtc = true;
else if (plane->is_cursor)
pipe->need_set_cursor = true;
plane->fb_changed = true; plane->fb_changed = true;
} }

2
lib/igt_kms.h
View File

@ -120,8 +120,6 @@ typedef struct {
struct igt_pipe { struct igt_pipe {
igt_display_t *display; igt_display_t *display;
enum pipe pipe; enum pipe pipe;
unsigned int need_set_crtc : 1;
unsigned int need_set_cursor : 1;
unsigned int need_wait_for_vblank : 1; unsigned int need_wait_for_vblank : 1;
#define IGT_MAX_PLANES 4 #define IGT_MAX_PLANES 4
int n_planes; int n_planes;