diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-03-13 14:07:32 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-03-13 14:08:05 -0400 |
| commit | f435fe83d56b8b804c4204246bccba7749f605f9 (patch) | |
| tree | 6850e3d00acf798c2bf39b761486cb9f6277c323 /drivers/gpu/drm/i915/intel_atomic.c | |
| parent | a0689e347e46571b1215655ac918d129cf54455c (diff) | |
| parent | a94bed60cb73962f344ead14b2ee7613280432c6 (diff) | |
| download | linux-stable-f435fe83d56b8b804c4204246bccba7749f605f9.tar.gz linux-stable-f435fe83d56b8b804c4204246bccba7749f605f9.tar.bz2 linux-stable-f435fe83d56b8b804c4204246bccba7749f605f9.zip | |
Merge tag 'topic/hdr-formats-2019-03-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-misc-next
Add support for floating point half-width formats.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/00b96cd5-91c7-5677-9620-b138c7a92303@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index da419e157332..b844e8840c6f 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -235,10 +235,11 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta if (plane_state && plane_state->base.fb && plane_state->base.fb->format->is_yuv && plane_state->base.fb->format->num_planes > 1) { + struct intel_plane *plane = to_intel_plane(plane_state->base.plane); if (IS_GEN(dev_priv, 9) && !IS_GEMINILAKE(dev_priv)) { mode = SKL_PS_SCALER_MODE_NV12; - } else if (icl_is_hdr_plane(to_intel_plane(plane_state->base.plane))) { + } else if (icl_is_hdr_plane(dev_priv, plane->id)) { /* * On gen11+'s HDR planes we only use the scaler for * scaling. They have a dedicated chroma upsampler, so |