| Message ID | 1400640904-16847-3-git-send-email-airlied@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> Dave Airlie <mailto:airlied@gmail.com> > Tuesday, May 20, 2014 7:54 PM > From: Dave Airlie <airlied@redhat.com> > > This adds an encoder type for DP MST encoders. > > Signed-off-by: Dave Airlie <airlied@redhat.com> > --- > drivers/gpu/drm/drm_crtc.c | 1 + > include/uapi/drm/drm_mode.h | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index a3fe324..f1753e6 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -227,6 +227,7 @@ static const struct drm_prop_enum_list > drm_encoder_enum_list[] = > { DRM_MODE_ENCODER_TVDAC, "TV" }, > { DRM_MODE_ENCODER_VIRTUAL, "Virtual" }, > { DRM_MODE_ENCODER_DSI, "DSI" }, > + { DRM_MODE_ENCODER_DPMST, "DP MST" }, > }; > > static const struct drm_prop_enum_list drm_subpixel_enum_list[] = > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h > index f104c26..719add4 100644 > --- a/include/uapi/drm/drm_mode.h > +++ b/include/uapi/drm/drm_mode.h > @@ -181,6 +181,7 @@ struct drm_mode_get_plane_res { > #define DRM_MODE_ENCODER_TVDAC 4 > #define DRM_MODE_ENCODER_VIRTUAL 5 > #define DRM_MODE_ENCODER_DSI 6 > +#define DRM_MODE_ENCODER_DPMST 7 > > struct drm_mode_get_encoder { > __u32 encoder_id; Reviewed-by: Todd Previte <tprevite@gmail.com> > Dave Airlie <mailto:airlied@gmail.com> > Tuesday, May 20, 2014 7:54 PM > Hey, > > So this set is pretty close to what I think we should be merging > initially, > > Since the last set, it makes fbcon and suspend/resume work a lot better, > > I've also fixed a couple of bugs in -intel that make things work a lot > better. > > I've bashed on this a bit using kms-flip from intel-gpu-tools, hacked > to add 3 monitor support. > > It still generates a fair few i915 state checker backtraces, and some > of them are fairly hard to work out, it might be we should just tone > down the state checker for encoders/connectors with no actual hw backing > them. > > Dave. > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index a3fe324..f1753e6 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -227,6 +227,7 @@ static const struct drm_prop_enum_list drm_encoder_enum_list[] = { DRM_MODE_ENCODER_TVDAC, "TV" }, { DRM_MODE_ENCODER_VIRTUAL, "Virtual" }, { DRM_MODE_ENCODER_DSI, "DSI" }, + { DRM_MODE_ENCODER_DPMST, "DP MST" }, }; static const struct drm_prop_enum_list drm_subpixel_enum_list[] = diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index f104c26..719add4 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -181,6 +181,7 @@ struct drm_mode_get_plane_res { #define DRM_MODE_ENCODER_TVDAC 4 #define DRM_MODE_ENCODER_VIRTUAL 5 #define DRM_MODE_ENCODER_DSI 6 +#define DRM_MODE_ENCODER_DPMST 7 struct drm_mode_get_encoder { __u32 encoder_id;