dri-devel April 2015

dri-devel@lists.freedesktop.org

175 participants
1044 discussions

Patch - FreeBSD & NetBSD support
by Sevan Janiyan 12 Apr '15

12 Apr '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I'm upstreaming a merge of two patches taken from the FreeBSD ports tree & NetBSD's pkgsrc tree so the credit/blame is not mine. :) The FreeBSD part resolves building libdrm on a host which may not have a KMS module loaded hence a sysctl will not be present. The other part adds NetBSD support. Regards Sevan Janiyan -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJVKK39AAoJENE/+DdOy3tCc0YP/2rME7gJJSNT7kpCVCctr8pt 8yjowGkeYYfiVEDFDhB1ZQ+LL7KEmECAWJjBYCB1P1T3Mzl8LBYbaIBcAQ3rLjsE vbcuFWmW/xq+WaqzyK1cqxcOXXYnrpXyPG8IkAj1k66TWGJF1QSG9qtEQ/W5W7IC bVFJtLVCSn3GrY9Kyp1oP0qQW8IHuh+74uDIdXEG1ZMKQtytv0C2AVGBKJIyd37z KP2v38K0hlmZdLcaBubwI6YBE5/02yTm83SvecApuJO0KyhMKG1qrJRQMXepKV2O TVuWDlwRWmSjClAOaAmL8RhUpFF1zFqlDiUlsczXGDRqxDErtvRte8TP9ktV2IcN A61iPZTEDXbPeJxuEX6P4wJSGhqrgd/L7WEXX1FUXKWInohzrKGya2cVi+L8uMjm c65JAmzA9jyMUebluJlrfGNInN0hZ0lRvwyFEW5PvLKJT//N3ybqHqQXFLvoAjI5 PZrnz9gzPWS6gQiMb3fUr8pFsE7Dxxlqc0RqlNQ6yzpKX6CePPmO5MVb+ktY72ad cmdCe1J2EXUDIC9/A2y61/3XuS3jrjFSoZzpw4JOYf2TL3jq1NOnUS8XzXDaySJM ouMV+6ERlcN5DriMvZpx81ZBJWwgP3yyy7nj4CTpivMOU4i1iTbVrLEDv60sMLdY C/dpQFub+sJzWY2y4s2/ =PAg4 -----END PGP SIGNATURE-----

2 1

Re: [PATCH] drm/atomic: Add for_each_{connector, crtc, plane}_in_state helper macros
by Daniel Vetter 11 Apr '15

11 Apr '15

On Fri, Apr 10, 2015 at 02:58:39PM +0300, Ander Conselvan de Oliveira wrote: > This saves some typing whenever a iteration over all the connector, > crtc or plane states in the atomic state is written, which happens > quite often. > > Cc: dri-devel(a)lists.freedesktop.org > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira(a)intel.com> Applied to drm-misc, thanks. -Daniel > --- > drivers/gpu/drm/drm_atomic.c | 62 +++------ > drivers/gpu/drm/drm_atomic_helper.c | 253 +++++++++++------------------------- > include/drm/drm_atomic.h | 24 ++++ > 3 files changed, 117 insertions(+), 222 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 57efdbe..68236bd 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -909,14 +909,13 @@ int > drm_atomic_connectors_for_crtc(struct drm_atomic_state *state, > struct drm_crtc *crtc) > { > - int i, num_connected_connectors = 0; > - > - for (i = 0; i < state->num_connector; i++) { > - struct drm_connector_state *conn_state; > + struct drm_connector *connector; > + struct drm_connector_state *conn_state; > > - conn_state = state->connector_states[i]; > + int i, num_connected_connectors = 0; > > - if (conn_state && conn_state->crtc == crtc) > + for_each_connector_in_state(state, connector, conn_state, i) { > + if (conn_state->crtc == crtc) > num_connected_connectors++; > } > > @@ -968,19 +967,16 @@ int drm_atomic_check_only(struct drm_atomic_state *state) > { > struct drm_device *dev = state->dev; > struct drm_mode_config *config = &dev->mode_config; > - int nplanes = config->num_total_plane; > - int ncrtcs = config->num_crtc; > + struct drm_plane *plane; > + struct drm_plane_state *plane_state; > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > int i, ret = 0; > > DRM_DEBUG_ATOMIC("checking %p\n", state); > > - for (i = 0; i < nplanes; i++) { > - struct drm_plane *plane = state->planes[i]; > - > - if (!plane) > - continue; > - > - ret = drm_atomic_plane_check(plane, state->plane_states[i]); > + for_each_plane_in_state(state, plane, plane_state, i) { > + ret = drm_atomic_plane_check(plane, plane_state); > if (ret) { > DRM_DEBUG_ATOMIC("[PLANE:%d] atomic core check failed\n", > plane->base.id); > @@ -988,13 +984,8 @@ int drm_atomic_check_only(struct drm_atomic_state *state) > } > } > > - for (i = 0; i < ncrtcs; i++) { > - struct drm_crtc *crtc = state->crtcs[i]; > - > - if (!crtc) > - continue; > - > - ret = drm_atomic_crtc_check(crtc, state->crtc_states[i]); > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > + ret = drm_atomic_crtc_check(crtc, crtc_state); > if (ret) { > DRM_DEBUG_ATOMIC("[CRTC:%d] atomic core check failed\n", > crtc->base.id); > @@ -1006,13 +997,7 @@ int drm_atomic_check_only(struct drm_atomic_state *state) > ret = config->funcs->atomic_check(state->dev, state); > > if (!state->allow_modeset) { > - for (i = 0; i < ncrtcs; i++) { > - struct drm_crtc *crtc = state->crtcs[i]; > - struct drm_crtc_state *crtc_state = state->crtc_states[i]; > - > - if (!crtc) > - continue; > - > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > if (crtc_state->mode_changed || > crtc_state->active_changed) { > DRM_DEBUG_ATOMIC("[CRTC:%d] requires full modeset\n", > @@ -1210,6 +1195,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, > struct drm_atomic_state *state; > struct drm_modeset_acquire_ctx ctx; > struct drm_plane *plane; > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > unsigned plane_mask = 0; > int ret = 0; > unsigned int i, j; > @@ -1313,15 +1300,9 @@ retry: > } > > if (arg->flags & DRM_MODE_PAGE_FLIP_EVENT) { > - int ncrtcs = dev->mode_config.num_crtc; > - > - for (i = 0; i < ncrtcs; i++) { > - struct drm_crtc_state *crtc_state = state->crtc_states[i]; > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > struct drm_pending_vblank_event *e; > > - if (!crtc_state) > - continue; > - > e = create_vblank_event(dev, file_priv, arg->user_data); > if (!e) { > ret = -ENOMEM; > @@ -1373,14 +1354,7 @@ fail: > goto backoff; > > if (arg->flags & DRM_MODE_PAGE_FLIP_EVENT) { > - int ncrtcs = dev->mode_config.num_crtc; > - > - for (i = 0; i < ncrtcs; i++) { > - struct drm_crtc_state *crtc_state = state->crtc_states[i]; > - > - if (!crtc_state) > - continue; > - > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > destroy_vblank_event(dev, file_priv, crtc_state->event); > crtc_state->event = NULL; > } > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index e67d4d6..a2fb0d4 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -248,30 +248,24 @@ update_connector_routing(struct drm_atomic_state *state, int conn_idx) > static int > mode_fixup(struct drm_atomic_state *state) > { > - int ncrtcs = state->dev->mode_config.num_crtc; > + struct drm_crtc *crtc; > struct drm_crtc_state *crtc_state; > + struct drm_connector *connector; > struct drm_connector_state *conn_state; > int i; > bool ret; > > - for (i = 0; i < ncrtcs; i++) { > - crtc_state = state->crtc_states[i]; > - > - if (!crtc_state || !crtc_state->mode_changed) > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > + if (!crtc_state->mode_changed) > continue; > > drm_mode_copy(&crtc_state->adjusted_mode, &crtc_state->mode); > } > > - for (i = 0; i < state->num_connector; i++) { > + for_each_connector_in_state(state, connector, conn_state, i) { > const struct drm_encoder_helper_funcs *funcs; > struct drm_encoder *encoder; > > - conn_state = state->connector_states[i]; > - > - if (!conn_state) > - continue; > - > WARN_ON(!!conn_state->best_encoder != !!conn_state->crtc); > > if (!conn_state->crtc || !conn_state->best_encoder) > @@ -316,14 +310,10 @@ mode_fixup(struct drm_atomic_state *state) > } > } > > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > const struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc; > > - crtc_state = state->crtc_states[i]; > - crtc = state->crtcs[i]; > - > - if (!crtc_state || !crtc_state->mode_changed) > + if (!crtc_state->mode_changed) > continue; > > funcs = crtc->helper_private; > @@ -371,18 +361,13 @@ int > drm_atomic_helper_check_modeset(struct drm_device *dev, > struct drm_atomic_state *state) > { > - int ncrtcs = dev->mode_config.num_crtc; > struct drm_crtc *crtc; > struct drm_crtc_state *crtc_state; > + struct drm_connector *connector; > + struct drm_connector_state *connector_state; > int i, ret; > > - for (i = 0; i < ncrtcs; i++) { > - crtc = state->crtcs[i]; > - crtc_state = state->crtc_states[i]; > - > - if (!crtc) > - continue; > - > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > if (!drm_mode_equal(&crtc->state->mode, &crtc_state->mode)) { > DRM_DEBUG_ATOMIC("[CRTC:%d] mode changed\n", > crtc->base.id); > @@ -396,7 +381,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, > } > } > > - for (i = 0; i < state->num_connector; i++) { > + for_each_connector_in_state(state, connector, connector_state, i) { > /* > * This only sets crtc->mode_changed for routing changes, > * drivers must set crtc->mode_changed themselves when connector > @@ -413,15 +398,9 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, > * configuration. This must be done before calling mode_fixup in case a > * crtc only changed its mode but has the same set of connectors. > */ > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > int num_connectors; > > - crtc = state->crtcs[i]; > - crtc_state = state->crtc_states[i]; > - > - if (!crtc) > - continue; > - > /* > * We must set ->active_changed after walking connectors for > * otherwise an update that only changes active would result in > @@ -476,17 +455,14 @@ int > drm_atomic_helper_check_planes(struct drm_device *dev, > struct drm_atomic_state *state) > { > - int nplanes = dev->mode_config.num_total_plane; > - int ncrtcs = dev->mode_config.num_crtc; > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > + struct drm_plane *plane; > + struct drm_plane_state *plane_state; > int i, ret = 0; > > - for (i = 0; i < nplanes; i++) { > + for_each_plane_in_state(state, plane, plane_state, i) { > const struct drm_plane_helper_funcs *funcs; > - struct drm_plane *plane = state->planes[i]; > - struct drm_plane_state *plane_state = state->plane_states[i]; > - > - if (!plane) > - continue; > > funcs = plane->helper_private; > > @@ -503,12 +479,8 @@ drm_atomic_helper_check_planes(struct drm_device *dev, > } > } > > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > const struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc = state->crtcs[i]; > - > - if (!crtc) > - continue; > > funcs = crtc->helper_private; > > @@ -567,22 +539,20 @@ EXPORT_SYMBOL(drm_atomic_helper_check); > static void > disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > { > - int ncrtcs = old_state->dev->mode_config.num_crtc; > + struct drm_connector *connector; > + struct drm_connector_state *old_conn_state; > + struct drm_crtc *crtc; > + struct drm_crtc_state *old_crtc_state; > int i; > > - for (i = 0; i < old_state->num_connector; i++) { > + for_each_connector_in_state(old_state, connector, old_conn_state, i) { > const struct drm_encoder_helper_funcs *funcs; > - struct drm_connector_state *old_conn_state; > - struct drm_connector *connector; > struct drm_encoder *encoder; > struct drm_crtc_state *old_crtc_state; > > - old_conn_state = old_state->connector_states[i]; > - connector = old_state->connectors[i]; > - > /* Shut down everything that's in the changeset and currently > * still on. So need to check the old, saved state. */ > - if (!old_conn_state || !old_conn_state->crtc) > + if (!old_conn_state->crtc) > continue; > > old_crtc_state = old_state->crtc_states[drm_crtc_index(old_conn_state->crtc)]; > @@ -623,16 +593,11 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > encoder->bridge->funcs->post_disable(encoder->bridge); > } > > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > const struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc; > - struct drm_crtc_state *old_crtc_state; > - > - crtc = old_state->crtcs[i]; > - old_crtc_state = old_state->crtc_states[i]; > > /* Shut down everything that needs a full modeset. */ > - if (!crtc || !needs_modeset(crtc->state)) > + if (!needs_modeset(crtc->state)) > continue; > > if (!old_crtc_state->active) > @@ -657,16 +622,15 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) > static void > set_routing_links(struct drm_device *dev, struct drm_atomic_state *old_state) > { > - int ncrtcs = old_state->dev->mode_config.num_crtc; > + struct drm_connector *connector; > + struct drm_connector_state *old_conn_state; > + struct drm_crtc *crtc; > + struct drm_crtc_state *old_crtc_state; > int i; > > /* clear out existing links */ > - for (i = 0; i < old_state->num_connector; i++) { > - struct drm_connector *connector; > - > - connector = old_state->connectors[i]; > - > - if (!connector || !connector->encoder) > + for_each_connector_in_state(old_state, connector, old_conn_state, i) { > + if (!connector->encoder) > continue; > > WARN_ON(!connector->encoder->crtc); > @@ -676,12 +640,8 @@ set_routing_links(struct drm_device *dev, struct drm_atomic_state *old_state) > } > > /* set new links */ > - for (i = 0; i < old_state->num_connector; i++) { > - struct drm_connector *connector; > - > - connector = old_state->connectors[i]; > - > - if (!connector || !connector->state->crtc) > + for_each_connector_in_state(old_state, connector, old_conn_state, i) { > + if (!connector->state->crtc) > continue; > > if (WARN_ON(!connector->state->best_encoder)) > @@ -692,14 +652,7 @@ set_routing_links(struct drm_device *dev, struct drm_atomic_state *old_state) > } > > /* set legacy state in the crtc structure */ > - for (i = 0; i < ncrtcs; i++) { > - struct drm_crtc *crtc; > - > - crtc = old_state->crtcs[i]; > - > - if (!crtc) > - continue; > - > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > crtc->mode = crtc->state->mode; > crtc->enabled = crtc->state->enable; > crtc->x = crtc->primary->state->src_x >> 16; > @@ -710,16 +663,16 @@ set_routing_links(struct drm_device *dev, struct drm_atomic_state *old_state) > static void > crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > { > - int ncrtcs = old_state->dev->mode_config.num_crtc; > + struct drm_crtc *crtc; > + struct drm_crtc_state *old_crtc_state; > + struct drm_connector *connector; > + struct drm_connector_state *old_conn_state; > int i; > > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > const struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc; > - > - crtc = old_state->crtcs[i]; > > - if (!crtc || !crtc->state->mode_changed) > + if (!crtc->state->mode_changed) > continue; > > funcs = crtc->helper_private; > @@ -732,16 +685,13 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) > } > } > > - for (i = 0; i < old_state->num_connector; i++) { > + for_each_connector_in_state(old_state, connector, old_conn_state, i) { > const struct drm_encoder_helper_funcs *funcs; > - struct drm_connector *connector; > struct drm_crtc_state *new_crtc_state; > struct drm_encoder *encoder; > struct drm_display_mode *mode, *adjusted_mode; > > - connector = old_state->connectors[i]; > - > - if (!connector || !connector->state->best_encoder) > + if (!connector->state->best_encoder) > continue; > > encoder = connector->state->best_encoder; > @@ -809,17 +759,17 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_disables); > void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > struct drm_atomic_state *old_state) > { > - int ncrtcs = old_state->dev->mode_config.num_crtc; > + struct drm_crtc *crtc; > + struct drm_crtc_state *old_crtc_state; > + struct drm_connector *connector; > + struct drm_connector_state *old_conn_state; > int i; > > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > const struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc; > - > - crtc = old_state->crtcs[i]; > > /* Need to filter out CRTCs where only planes change. */ > - if (!crtc || !needs_modeset(crtc->state)) > + if (!needs_modeset(crtc->state)) > continue; > > if (!crtc->state->active) > @@ -838,14 +788,11 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > } > } > > - for (i = 0; i < old_state->num_connector; i++) { > + for_each_connector_in_state(old_state, connector, old_conn_state, i) { > const struct drm_encoder_helper_funcs *funcs; > - struct drm_connector *connector; > struct drm_encoder *encoder; > > - connector = old_state->connectors[i]; > - > - if (!connector || !connector->state->best_encoder) > + if (!connector->state->best_encoder) > continue; > > if (!connector->state->crtc->state->active || > @@ -879,13 +826,12 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_enables); > static void wait_for_fences(struct drm_device *dev, > struct drm_atomic_state *state) > { > - int nplanes = dev->mode_config.num_total_plane; > + struct drm_plane *plane; > + struct drm_plane_state *plane_state; > int i; > > - for (i = 0; i < nplanes; i++) { > - struct drm_plane *plane = state->planes[i]; > - > - if (!plane || !plane->state->fence) > + for_each_plane_in_state(state, plane, plane_state, i) { > + if (!plane->state->fence) > continue; > > WARN_ON(!plane->state->fb); > @@ -902,16 +848,9 @@ static bool framebuffer_changed(struct drm_device *dev, > { > struct drm_plane *plane; > struct drm_plane_state *old_plane_state; > - int nplanes = old_state->dev->mode_config.num_total_plane; > int i; > > - for (i = 0; i < nplanes; i++) { > - plane = old_state->planes[i]; > - old_plane_state = old_state->plane_states[i]; > - > - if (!plane) > - continue; > - > + for_each_plane_in_state(old_state, plane, old_plane_state, i) { > if (plane->state->crtc != crtc && > old_plane_state->crtc != crtc) > continue; > @@ -940,16 +879,9 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, > { > struct drm_crtc *crtc; > struct drm_crtc_state *old_crtc_state; > - int ncrtcs = old_state->dev->mode_config.num_crtc; > int i, ret; > > - for (i = 0; i < ncrtcs; i++) { > - crtc = old_state->crtcs[i]; > - old_crtc_state = old_state->crtc_states[i]; > - > - if (!crtc) > - continue; > - > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > /* No one cares about the old state, so abuse it for tracking > * and store whether we hold a vblank reference (and should do a > * vblank wait) in the ->enable boolean. */ > @@ -974,11 +906,8 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, > old_crtc_state->last_vblank_count = drm_vblank_count(dev, i); > } > > - for (i = 0; i < ncrtcs; i++) { > - crtc = old_state->crtcs[i]; > - old_crtc_state = old_state->crtc_states[i]; > - > - if (!crtc || !old_crtc_state->enable) > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > + if (!old_crtc_state->enable) > continue; > > ret = wait_event_timeout(dev->vblank[i].queue, > @@ -1176,16 +1105,14 @@ EXPORT_SYMBOL(drm_atomic_helper_prepare_planes); > void drm_atomic_helper_commit_planes(struct drm_device *dev, > struct drm_atomic_state *old_state) > { > - int nplanes = dev->mode_config.num_total_plane; > - int ncrtcs = dev->mode_config.num_crtc; > + struct drm_crtc *crtc; > + struct drm_crtc_state *old_crtc_state; > + struct drm_plane *plane; > + struct drm_plane_state *old_plane_state; > int i; > > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > const struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc = old_state->crtcs[i]; > - > - if (!crtc) > - continue; > > funcs = crtc->helper_private; > > @@ -1195,13 +1122,8 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, > funcs->atomic_begin(crtc); > } > > - for (i = 0; i < nplanes; i++) { > + for_each_plane_in_state(old_state, plane, old_plane_state, i) { > const struct drm_plane_helper_funcs *funcs; > - struct drm_plane *plane = old_state->planes[i]; > - struct drm_plane_state *old_plane_state; > - > - if (!plane) > - continue; > > funcs = plane->helper_private; > > @@ -1220,12 +1142,8 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, > funcs->atomic_update(plane, old_plane_state); > } > > - for (i = 0; i < ncrtcs; i++) { > + for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) { > const struct drm_crtc_helper_funcs *funcs; > - struct drm_crtc *crtc = old_state->crtcs[i]; > - > - if (!crtc) > - continue; > > funcs = crtc->helper_private; > > @@ -1252,18 +1170,14 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_planes); > void drm_atomic_helper_cleanup_planes(struct drm_device *dev, > struct drm_atomic_state *old_state) > { > - int nplanes = dev->mode_config.num_total_plane; > + struct drm_plane *plane; > + struct drm_plane_state *plane_state; > int i; > > - for (i = 0; i < nplanes; i++) { > + for_each_plane_in_state(old_state, plane, plane_state, i) { > const struct drm_plane_helper_funcs *funcs; > - struct drm_plane *plane = old_state->planes[i]; > - struct drm_plane_state *plane_state = old_state->plane_states[i]; > struct drm_framebuffer *old_fb; > > - if (!plane) > - continue; > - > funcs = plane->helper_private; > > old_fb = plane_state->fb; > @@ -1512,8 +1426,10 @@ static int update_output_state(struct drm_atomic_state *state, > struct drm_mode_set *set) > { > struct drm_device *dev = set->crtc->dev; > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > + struct drm_connector *connector; > struct drm_connector_state *conn_state; > - int ncrtcs = state->dev->mode_config.num_crtc; > int ret, i, j; > > ret = drm_modeset_lock(&dev->mode_config.connection_mutex, > @@ -1529,27 +1445,14 @@ static int update_output_state(struct drm_atomic_state *state, > return PTR_ERR(conn_state); > } > > - for (i = 0; i < ncrtcs; i++) { > - struct drm_crtc *crtc = state->crtcs[i]; > - > - if (!crtc) > - continue; > - > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > ret = drm_atomic_add_affected_connectors(state, crtc); > if (ret) > return ret; > } > > /* Then recompute connector->crtc links and crtc enabling state. */ > - for (i = 0; i < state->num_connector; i++) { > - struct drm_connector *connector; > - > - connector = state->connectors[i]; > - conn_state = state->connector_states[i]; > - > - if (!connector) > - continue; > - > + for_each_connector_in_state(state, connector, conn_state, i) { > if (conn_state->crtc == set->crtc) { > ret = drm_atomic_set_crtc_for_connector(conn_state, > NULL); > @@ -1568,13 +1471,7 @@ static int update_output_state(struct drm_atomic_state *state, > } > } > > - for (i = 0; i < ncrtcs; i++) { > - struct drm_crtc *crtc = state->crtcs[i]; > - struct drm_crtc_state *crtc_state = state->crtc_states[i]; > - > - if (!crtc) > - continue; > - > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > /* Don't update ->enable for the CRTC in the set_config request, > * since a mismatch would indicate a bug in the upper layers. > * The actual modeset code later on will catch any > diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h > index 51168a8..c1571034 100644 > --- a/include/drm/drm_atomic.h > +++ b/include/drm/drm_atomic.h > @@ -75,4 +75,28 @@ int __must_check drm_atomic_check_only(struct drm_atomic_state *state); > int __must_check drm_atomic_commit(struct drm_atomic_state *state); > int __must_check drm_atomic_async_commit(struct drm_atomic_state *state); > > +#define for_each_connector_in_state(state, connector, connector_state, __i) \ > + for ((__i) = 0; \ > + (connector) = (state)->connectors[__i], \ > + (connector_state) = (state)->connector_states[__i], \ > + (__i) < (state)->num_connector; \ > + (__i)++) \ > + if (connector) > + > +#define for_each_crtc_in_state(state, crtc, crtc_state, __i) \ > + for ((__i) = 0; \ > + (crtc) = (state)->crtcs[__i], \ > + (crtc_state) = (state)->crtc_states[__i], \ > + (__i) < (state)->dev->mode_config.num_crtc; \ > + (__i)++) \ > + if (crtc_state) > + > +#define for_each_plane_in_state(state, plane, plane_state, __i) \ > + for ((__i) = 0; \ > + (plane) = (state)->planes[__i], \ > + (plane_state) = (state)->plane_states[__i], \ > + (__i) < (state)->dev->mode_config.num_total_plane; \ > + (__i)++) \ > + if (plane_state) > + > #endif /* DRM_ATOMIC_H_ */ > -- > 2.1.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

1 0

[Bug 89968] 10.5 garbled screen with Enlightenment E19.
by bugzilla-daemon＠freedesktop.org 11 Apr '15

11 Apr '15

https://bugs.freedesktop.org/show_bug.cgi?id=89968 Bug ID: 89968 Summary: 10.5 garbled screen with Enlightenment E19. Product: Mesa Version: 10.5 Hardware: Other OS: All Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r600 Assignee: dri-devel(a)lists.freedesktop.org Reporter: barz621(a)gmail.com QA Contact: dri-devel(a)lists.freedesktop.org As the title suggests. Happens on 10.5.1 and 10.5.2. If i revert back to 10.4.6 it works fine. Barts 6850 r600g on arch linux. Won't be able to bisect this. And didn't find anything interesting in the logs when it first occured. -- You are receiving this mail because: You are the assignee for the bug.

1 1

[Bug 72819] [855GM] Incorrect drop shadow color on windows and strange white rectangle when showing/hiding GLX-dock...
by bugzilla-daemon＠freedesktop.org 11 Apr '15

11 Apr '15

https://bugs.freedesktop.org/show_bug.cgi?id=72819 Ville Syrjala <ville.syrjala(a)linux.intel.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |NOTOURBUG --- Comment #2 from Ville Syrjala <ville.syrjala(a)linux.intel.com> --- The white flash is not a Mesa issue so I'm closing this bug. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 72819] [855GM] Incorrect drop shadow color on windows and strange white rectangle when showing/hiding GLX-dock...
by bugzilla-daemon＠freedesktop.org 11 Apr '15

11 Apr '15

https://bugs.freedesktop.org/show_bug.cgi?id=72819 --- Comment #1 from Ville Syrjala <ville.syrjala(a)linux.intel.com> --- Created attachment 115015 --> https://bugs.freedesktop.org/attachment.cgi?id=115015&action=edit [PATCH] cairo-dock: Fix white flash when NPOT textures aren't available The white flash looks to be a bug in cairo-dock. This patch fixes it for me, although it's possible some other rendering error will remain since the texture coordinates might no longer be entirely correct since the actual image no longer fills the entire texture. I'm too lazy to register to launchpad so that I could report the bug to cairo-dock. But feel free to forward this patch to cairo-dock developers. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[GIT PULL] Synopsis DesignWare HDMI driver development updates
by Russell King 11 Apr '15

11 Apr '15

David, Please incorporate the latest Synopsis DesignWare HDMI driver development updates, which can be found at: git://ftp.arm.linux.org.uk/~rmk/linux-arm.git drm-dwhdmi-devel with SHA1 1dbee1a3c38a8792c235048df1d709fc5ca3a185. Apologies for this being late... these are the patches which I queued last week after review on the mailing list, and have been tested by myself and agreed to be pushed for the 4.1 merge window between Yakir Yang and myself. If you're not taking stuff anymore, that's fine, I'll queue for the 4.2 window instead. This set of patches adjust the setup of the HDMI CTS/N values for audio support to be compliant with the work-around given in the iMX6 errata documentation as part of the preparation for integrating audio support for this driver, and also update the HDMI phy configuration for Rockchip devices to improve the HDMI eye pattern. This will update the following files: drivers/gpu/drm/bridge/dw_hdmi.c | 54 ++++++++++++++++------------- drivers/gpu/drm/imx/dw_hdmi-imx.c | 24 ++++++------- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 ++++---- include/drm/bridge/dw_hdmi.h | 5 +-- 4 files changed, 51 insertions(+), 46 deletions(-) through these changes: Russell King (3): drm: bridge/dw_hdmi: combine hdmi_set_clock_regenerator_n() and hdmi_regenerate_cts() drm: bridge/dw_hdmi: protect n/cts setting with a mutex drm: bridge/dw_hdmi: adjust n/cts setting order Yakir Yang (3): drm: bridge/dw_hdmi: fixed codec style drm: bridge/dw_hdmi: separate VLEVCTRL settting into platform driver drm: rockchip/dw_hdmi-rockchip: improve for HDMI electrical test Many thanks.

1 0

libva decoding performance regression with kernel 4.0-rc
by Olivier Crête 10 Apr '15

10 Apr '15

Hello, Using an Atom E3845 board, we had a pretty bad performance regression when upgrading to 4.0-rc6 from 3.19. With the help of git bisect, I traced it back to commit 78a42377. Reverting this commit and subsequent related commits (b9ffd80, 71745376, etc) fixes the performance regression for me. Without those patches, I can play 8-9 1080p MPEG2 streams, after them, it's down to 5-6. I tested using a libdrm checkout from Feb 16, and the latest git master of libva, libva-intel-driver and gst-plugins-vaapi. The "identity drop-probability=1" is to prevent anything from being displayed, so it's purely decoding performance. Pure decode, single stream not displayed: time gst-launch-1.0 filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! identity drop-probability=1 ! vaapisink With kernel 3.18.0-rc7-01052-g493018d real 0m11.429s user 0m6.516s sys 0m1.640s With kernel 3.18.0-rc7-01053-g78a4237 real 0m12.694s user 0m6.744s sys 0m2.680s 8 simultaneous streams displayed: time gst-launch-1.0 filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 \ filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 \ filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 \ filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 \ filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 \ filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 \ filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 \ filesrc location=18Mbps_CBR_MPEG2_Main-High_1920x1080p_16x9_29-97fps.m2t ! tsdemux ! mpegvideoparse ! vaapidecode ! vaapisink sync=0 With kernel 3.18.0-rc7-01052-g493018d real 2m45.317s user 1m21.296s sys 0m51.080s With kernel 3.18.0-rc7-01053-g78a4237 real 3m1.275s user 1m24.336s sys 1m38.360s -- Olivier Crête olivier.crete(a)collabora.com

2 2

[Bug 89699] Regression in 10.5.1 causes flickering/artifacting in a particular video game
by bugzilla-daemon＠freedesktop.org 10 Apr '15

10 Apr '15

https://bugs.freedesktop.org/show_bug.cgi?id=89699 --- Comment #10 from andre35822(a)yahoo.com --- Certain Mesa devs are able to get this game for free, as well as other Valve games. Hopefully this may help solve the bug as someone working in Mesa can use the game on their machines? http://lists.freedesktop.org/archives/dri-devel/2015-April/081045.html -- You are receiving this mail because: You are the assignee for the bug.

1 0

[PATCH] drm/exynos: use drm_plane_force_disable
by Joonyoung Shim 10 Apr '15

10 Apr '15

Don't call directly disable callback of plane helper, we need to disconnect the plane from the fb and crtc after disable callback. Signed-off-by: Joonyoung Shim <jy0922.shim(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 +---- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index 519c569..50c830e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -48,7 +48,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); struct drm_plane *plane; - int ret; if (!exynos_crtc->enabled) return; @@ -69,9 +68,7 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) if (plane->crtc != crtc) continue; - ret = plane->funcs->disable_plane(plane); - if (ret) - DRM_ERROR("Failed to disable plane %d\n", ret); + drm_plane_force_disable(plane); } } diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c index 0648ba4..3ca266d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c @@ -90,7 +90,7 @@ static void exynos_drm_encoder_disable(struct drm_encoder *encoder) /* all planes connected to this encoder should be also disabled. */ drm_for_each_legacy_plane(plane, &dev->mode_config.plane_list) { if (plane->crtc && (plane->crtc == encoder->crtc)) - plane->funcs->disable_plane(plane); + drm_plane_force_disable(plane); } } -- 1.9.1

3 3

[PATCH 09/11] drm/i915: Fix for DP CTS test 4.2.2.5 - I2C DEFER handling
by Todd Previte 10 Apr '15

10 Apr '15

For test 4.2.2.5 to pass per the Link CTS Core 1.2 rev1.1 spec, the source device must attempt at least 7 times to read the EDID when it receives an I2C defer. The normal DRM code makes only 7 retries, regardless of whether or not the response is a native defer or an I2C defer. Test 4.2.2.5 fails since there are native defers interspersed with the I2C defers which results in less than 7 EDID read attempts. The solution is to decrement the retry counter when an I2C DEFER is returned such that another read attempt will be made. This situation should normally only occur in compliance testing, however, as a worse case real-world scenario, it would result in 13 attempts ( 6 native defers, 7 I2C defers) for a single transaction to complete. The net result is a slightly slower response to an EDID read that shouldn't significantly impact overall performance. V2: - Added a check on the number of I2C Defers to limit the number of times that the retries variable will be decremented. This is to address review feedback regarding possible infinite loops from misbehaving sink devices. V3: - Fixed the limit value to 7 instead of 8 to get the correct retry count. - Combined the increment of the defer count into the if-statement Signed-off-by: Todd Previte <tprevite(a)gmail.com> Cc: dri-devel(a)lists.freedesktop.org --- drivers/gpu/drm/drm_dp_helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 79968e3..9ecfd27 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -468,7 +468,12 @@ static int drm_dp_i2c_do_msg(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) case DP_AUX_I2C_REPLY_DEFER: DRM_DEBUG_KMS("I2C defer\n"); - aux->i2c_defer_count++; + /* DP Compliance Test 4.2.2.5 Requirement: + * Must have at least 7 retries for I2C defers on the + * transaction to pass this test + */ + if (++aux->i2c_defer_count < 7) + retry = 0; usleep_range(400, 500); continue; -- 1.9.1

1 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2015