diff options
| author | Nicholas Kazlauskas | 2019-04-16 16:30:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-31 07:26:57 +0200 |
| commit | 147137f86b5b72aea3af4edb2e66f10c0baa841e (patch) | |
| tree | d6e82b8b4b96758485bf67f7587bf0f73f3b8219 /drivers/gpu/drm/amd | |
| parent | tty: serial: cpm_uart - fix init when SMC is relocated (diff) | |
| download | kernel-qcow2-linux-147137f86b5b72aea3af4edb2e66f10c0baa841e.tar.gz kernel-qcow2-linux-147137f86b5b72aea3af4edb2e66f10c0baa841e.tar.xz kernel-qcow2-linux-147137f86b5b72aea3af4edb2e66f10c0baa841e.zip | |
drm/amd/display: Fill prescale_params->scale for RGB565
[ Upstream commit 1352c779cb74d427f4150cbe779a2f7886f70cae ]
[Why]
An assertion is thrown when using SURFACE_PIXEL_FORMAT_GRPH_RGB565
formats on DCE since the prescale_params->scale wasn't being filled.
Found by a dmesg-fail when running the
igt@kms_plane@pixel-format-pipe-a-planes test on Baffin.
[How]
Fill in the scale parameter.
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 53ccacf99eca..c3ad2bbec1a5 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -242,6 +242,9 @@ static void build_prescale_params(struct ipp_prescale_params *prescale_params, prescale_params->mode = IPP_PRESCALE_MODE_FIXED_UNSIGNED; switch (plane_state->format) { + case SURFACE_PIXEL_FORMAT_GRPH_RGB565: + prescale_params->scale = 0x2082; + break; case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888: case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888: prescale_params->scale = 0x2020; |