diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-20 10:40:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-20 10:46:49 +1000 |
| commit | 294f96ae8aa53415272045649e3e7a1749cc0575 (patch) | |
| tree | 20fb15da04d4fbc87ea5419b889fec5322056a8b /drivers/gpu/drm/i915/intel_display.c | |
| parent | 090cbdd0735b3752a9dd2e4008e585acd661c67d (diff) | |
| parent | 979c11ef39cee79d6f556091a357890962be2580 (diff) | |
| download | linux-stable-294f96ae8aa53415272045649e3e7a1749cc0575.tar.gz linux-stable-294f96ae8aa53415272045649e3e7a1749cc0575.tar.bz2 linux-stable-294f96ae8aa53415272045649e3e7a1749cc0575.zip | |
Merge tag 'drm-misc-next-2018-07-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.19:
Core Changes:
- add support for DisplayPort CEC-Tunneling-over-AUX (Hans Verkuil)
- more doc updates (Daniel Vetter)
- fourcc: Add is_yuv field to drm_format_info (Ayan Kumar Halder)
- dma-buf: correctly place BUG_ON (Michel Dänzer)
Driver Changes:
- more vkms support(Rodrigo Siqueira)
- many fixes and small improments to all drivers
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180718200826.GA20165@juma
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8f3199b06d1f..e348b27e901f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3657,7 +3657,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, plane_color_ctl |= PLANE_COLOR_PLANE_GAMMA_DISABLE; plane_color_ctl |= glk_plane_color_ctl_alpha(fb->format->format); - if (intel_format_is_yuv(fb->format->format)) { + if (fb->format->is_yuv) { if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709) plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709; else @@ -15933,8 +15933,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector, struct intel_encoder *encoder) { connector->encoder = encoder; - drm_mode_connector_attach_encoder(&connector->base, - &encoder->base); + drm_connector_attach_encoder(&connector->base, &encoder->base); } /* |