Linux-stable-mirror April 2023

linux-stable-mirror@lists.linaro.org

384 participants
1532 discussions

[PATCH] drm/nouveau/disp: Support more modes by checking with lower bpc

by Karol Herbst

This allows us to advertise more modes especially on HDR displays. Fixes using 4K@60 modes on my TV and main display both using a HDMI to DP adapter. Also fixes similiar issues for users running into this. Cc: stable(a)vger.kernel.org # 5.10+ Signed-off-by: Karol Herbst <kherbst(a)redhat.com> --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 32 +++++++++++++++++++++++++ drivers/gpu/drm/nouveau/nouveau_dp.c | 8 ++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index ed9d374147b8d..f28e47c161dd9 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -363,6 +363,35 @@ nv50_outp_atomic_check_view(struct drm_encoder *encoder, return 0; } +static void +nv50_outp_atomic_fix_depth(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state) +{ + struct nv50_head_atom *asyh = nv50_head_atom(crtc_state); + struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); + struct drm_display_mode *mode = &asyh->state.adjusted_mode; + unsigned int max_rate, mode_rate; + + switch (nv_encoder->dcb->type) { + case DCB_OUTPUT_DP: + max_rate = nv_encoder->dp.link_nr * nv_encoder->dp.link_bw; + + /* we don't support more than 10 anyway */ + asyh->or.bpc = max_t(u8, asyh->or.bpc, 10); + + /* reduce the bpc until it works out */ + while (asyh->or.bpc > 6) { + mode_rate = DIV_ROUND_UP(mode->clock * asyh->or.bpc * 3, 8); + if (mode_rate <= max_rate) + break; + + asyh->or.bpc -= 2; + } + break; + default: + break; + } +} + static int nv50_outp_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, @@ -381,6 +410,9 @@ nv50_outp_atomic_check(struct drm_encoder *encoder, if (crtc_state->mode_changed || crtc_state->connectors_changed) asyh->or.bpc = connector->display_info.bpc; + /* We might have to reduce the bpc */ + nv50_outp_atomic_fix_depth(encoder, crtc_state); + return 0; } diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c index e00876f92aeea..d49b4875fc3c9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c @@ -263,8 +263,6 @@ nouveau_dp_irq(struct work_struct *work) } /* TODO: - * - Use the minimum possible BPC here, once we add support for the max bpc - * property. * - Validate against the DP caps advertised by the GPU (we don't check these * yet) */ @@ -276,7 +274,11 @@ nv50_dp_mode_valid(struct drm_connector *connector, { const unsigned int min_clock = 25000; unsigned int max_rate, mode_rate, ds_max_dotclock, clock = mode->clock; - const u8 bpp = connector->display_info.bpc * 3; + /* Check with the minmum bpc always, so we can advertise better modes. + * In particlar not doing this causes modes to be dropped on HDR + * displays as we might check with a bpc of 16 even. + */ + const u8 bpp = 6 * 3; if (mode->flags & DRM_MODE_FLAG_INTERLACE && !outp->caps.dp_interlace) return MODE_NO_INTERLACE; -- 2.39.2

2 years

stable-rc/queue/4.19 baseline: 105 runs, 2 regressions (v4.19.279-62-gd009556a422b)

by kernelci.org bot

stable-rc/queue/4.19 baseline: 105 runs, 2 regressions (v4.19.279-62-gd009556a422b) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions --------------+------+--------------+----------+--------------------+------------ at91sam9g20ek | arm | lab-broonie | gcc-10 | multi_v5_defconfig | 1 cubietruck | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F4.19/kernel/v4.19.27… Test: baseline Tree: stable-rc Branch: queue/4.19 Describe: v4.19.279-62-gd009556a422b URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: d009556a422b6858920c1bba8854ef52d7cacdb0 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions --------------+------+--------------+----------+--------------------+------------ at91sam9g20ek | arm | lab-broonie | gcc-10 | multi_v5_defconfig | 1 Details: https://kernelci.org/test/plan/id/6427403846b773494562f779 Results: 42 PASS, 9 FAIL, 1 SKIP Full config: multi_v5_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.279-62-gd009556a42… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.279-62-gd009556a42… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/6427403846b773494562f7ab failing since 4 days (last pass: v4.19.279-25-g8270940878fa3, first fail: v4.19.279-25-gc95d797f10041) 2023-03-31T20:18:22.798859 + set +x 2023-03-31T20:18:22.804085 <8><LAVA_SIGNAL_ENDRUN 0_dmesg 259876_1.5.2.4.1> 2023-03-31T20:18:22.916960 / # # 2023-03-31T20:18:23.019776 export SHELL=/bin/sh 2023-03-31T20:18:23.020531 # 2023-03-31T20:18:23.122455 / # export SHELL=/bin/sh. /lava-259876/environment 2023-03-31T20:18:23.123208 2023-03-31T20:18:23.225177 / # . /lava-259876/environment/lava-259876/bin/lava-test-runner /lava-259876/1 2023-03-31T20:18:23.226483 2023-03-31T20:18:23.232829 / # /lava-259876/bin/lava-test-runner /lava-259876/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions --------------+------+--------------+----------+--------------------+------------ cubietruck | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/642740e0ec3d622ebf62f790 Results: 5 PASS, 1 FAIL, 1 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.279-62-gd009556a42… HTML log: https://storage.kernelci.org//stable-rc/queue-4.19/v4.19.279-62-gd009556a42… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642740e0ec3d622ebf62f795 failing since 73 days (last pass: v4.19.269-9-gce7b59ec9d48, first fail: v4.19.269-521-g305d312d039a) 2023-03-31T20:21:34.548564 <8>[ 7.394970] <LAVA_SIGNAL_ENDRUN 0_dmesg 3459941_1.5.2.4.1> 2023-03-31T20:21:34.659535 / # # 2023-03-31T20:21:34.762928 export SHELL=/bin/sh 2023-03-31T20:21:34.763895 # 2023-03-31T20:21:34.865959 / # export SHELL=/bin/sh. /lava-3459941/environment 2023-03-31T20:21:34.866951 2023-03-31T20:21:34.969198 / # . /lava-3459941/environment/lava-3459941/bin/lava-test-runner /lava-3459941/1 2023-03-31T20:21:34.970757 2023-03-31T20:21:34.975532 / # /lava-3459941/bin/lava-test-runner /lava-3459941/1 2023-03-31T20:21:35.059174 + export 'TESTRUN_ID=1_bootrr' ... (11 line(s) more)

2 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2023