--- /dev/null
+From 2a9df204be0bbb896e087f00b9ee3fc559d5a608 Mon Sep 17 00:00:00 2001
+From: Robert Foss <robert.foss@linaro.org>
+Date: Tue, 13 Dec 2022 16:03:04 +0100
+Subject: drm/bridge: lt9611: Fix PLL being unable to lock
+
+From: Robert Foss <robert.foss@linaro.org>
+
+commit 2a9df204be0bbb896e087f00b9ee3fc559d5a608 upstream.
+
+This fixes PLL being unable to lock, and is derived from an equivalent
+downstream commit.
+
+Available LT9611 documentation does not list this register, neither does
+LT9611UXC (which is a different chip).
+
+This commit has been confirmed to fix HDMI output on DragonBoard 845c.
+
+Suggested-by: Amit Pundir <amit.pundir@linaro.org>
+Reviewed-by: Amit Pundir <amit.pundir@linaro.org>
+Signed-off-by: Robert Foss <robert.foss@linaro.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20221213150304.4189760-1-robert.foss@linaro.org
+Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/bridge/lontium-lt9611.c
++++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
+@@ -256,6 +256,7 @@ static int lt9611_pll_setup(struct lt961
+ { 0x8126, 0x55 },
+ { 0x8127, 0x66 },
+ { 0x8128, 0x88 },
++ { 0x812a, 0x20 },
+ };
+
+ regmap_multi_reg_write(lt9611->regmap, reg_cfg, ARRAY_SIZE(reg_cfg));
--- /dev/null
+From cuigaosheng1@huawei.com Tue Apr 11 16:17:00 2023
+From: Gaosheng Cui <cuigaosheng1@huawei.com>
+Date: Tue, 4 Apr 2023 09:25:02 +0800
+Subject: Revert "media: ti: cal: fix possible memory leak in cal_ctx_create()"
+To: <stable@vger.kernel.org>, <cuigaosheng1@huawei.com>
+Cc: <bparrot@ti.com>, <mchehab@kernel.org>, <sashal@kernel.org>, <laurent.pinchart@ideasonboard.com>, <gregkh@linuxfoundation.org>, <patches@lists.linux.dev>
+Message-ID: <20230404012502.3061129-1-cuigaosheng1@huawei.com>
+
+From: Gaosheng Cui <cuigaosheng1@huawei.com>
+
+This reverts commit c7a218cbf67fffcd99b76ae3b5e9c2e8bef17c8c.
+
+The memory of ctx is allocated by devm_kzalloc in cal_ctx_create,
+it should not be freed by kfree when cal_ctx_v4l2_init() fails,
+otherwise kfree() will cause double free, so revert this patch.
+
+The memory of ctx is allocated by kzalloc since commit
+9e67f24e4d9 ("media: ti-vpe: cal: fix ctx uninitialization"),
+so the fixes tag of patch c7a218cbf67fis not entirely accurate,
+mainline should merge this patch, but it should not be merged
+into 5.10, so we just revert this patch for this branch.
+
+Fixes: c7a218cbf67f ("media: ti: cal: fix possible memory leak in cal_ctx_create()")
+Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/platform/ti-vpe/cal.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/drivers/media/platform/ti-vpe/cal.c
++++ b/drivers/media/platform/ti-vpe/cal.c
+@@ -624,10 +624,8 @@ static struct cal_ctx *cal_ctx_create(st
+ ctx->cport = inst;
+
+ ret = cal_ctx_v4l2_init(ctx);
+- if (ret) {
+- kfree(ctx);
++ if (ret)
+ return NULL;
+- }
+
+ return ctx;
+ }
--- /dev/null
+From fc4a3a1bf9ad799181e4d4ec9c2598c0405bc27d Mon Sep 17 00:00:00 2001
+From: Tommi Rantala <tommi.t.rantala@nokia.com>
+Date: Mon, 2 Nov 2020 09:39:18 +0200
+Subject: selftests: intel_pstate: ftime() is deprecated
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Tommi Rantala <tommi.t.rantala@nokia.com>
+
+commit fc4a3a1bf9ad799181e4d4ec9c2598c0405bc27d upstream.
+
+Use clock_gettime() instead of deprecated ftime().
+
+ aperf.c: In function ‘main’:
+ aperf.c:58:2: warning: ‘ftime’ is deprecated [-Wdeprecated-declarations]
+ 58 | ftime(&before);
+ | ^~~~~
+ In file included from aperf.c:9:
+ /usr/include/sys/timeb.h:39:12: note: declared here
+ 39 | extern int ftime (struct timeb *__timebuf)
+ | ^~~~~
+
+Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
+Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
+Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
+Reported-by: kernel test robot <lkp@intel.com>
+Link: https://lore.kernel.org/oe-kbuild-all/202304060514.ELO1BqLI-lkp@intel.com/
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/intel_pstate/aperf.c | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+--- a/tools/testing/selftests/intel_pstate/aperf.c
++++ b/tools/testing/selftests/intel_pstate/aperf.c
+@@ -10,8 +10,12 @@
+ #include <sched.h>
+ #include <errno.h>
+ #include <string.h>
++#include <time.h>
+ #include "../kselftest.h"
+
++#define MSEC_PER_SEC 1000L
++#define NSEC_PER_MSEC 1000000L
++
+ void usage(char *name) {
+ printf ("Usage: %s cpunum\n", name);
+ }
+@@ -22,7 +26,7 @@ int main(int argc, char **argv) {
+ long long tsc, old_tsc, new_tsc;
+ long long aperf, old_aperf, new_aperf;
+ long long mperf, old_mperf, new_mperf;
+- struct timeb before, after;
++ struct timespec before, after;
+ long long int start, finish, total;
+ cpu_set_t cpuset;
+
+@@ -55,7 +59,10 @@ int main(int argc, char **argv) {
+ return 1;
+ }
+
+- ftime(&before);
++ if (clock_gettime(CLOCK_MONOTONIC, &before) < 0) {
++ perror("clock_gettime");
++ return 1;
++ }
+ pread(fd, &old_tsc, sizeof(old_tsc), 0x10);
+ pread(fd, &old_aperf, sizeof(old_mperf), 0xe7);
+ pread(fd, &old_mperf, sizeof(old_aperf), 0xe8);
+@@ -64,7 +71,10 @@ int main(int argc, char **argv) {
+ sqrt(i);
+ }
+
+- ftime(&after);
++ if (clock_gettime(CLOCK_MONOTONIC, &after) < 0) {
++ perror("clock_gettime");
++ return 1;
++ }
+ pread(fd, &new_tsc, sizeof(new_tsc), 0x10);
+ pread(fd, &new_aperf, sizeof(new_mperf), 0xe7);
+ pread(fd, &new_mperf, sizeof(new_aperf), 0xe8);
+@@ -73,11 +83,11 @@ int main(int argc, char **argv) {
+ aperf = new_aperf-old_aperf;
+ mperf = new_mperf-old_mperf;
+
+- start = before.time*1000 + before.millitm;
+- finish = after.time*1000 + after.millitm;
++ start = before.tv_sec*MSEC_PER_SEC + before.tv_nsec/NSEC_PER_MSEC;
++ finish = after.tv_sec*MSEC_PER_SEC + after.tv_nsec/NSEC_PER_MSEC;
+ total = finish - start;
+
+- printf("runTime: %4.2f\n", 1.0*total/1000);
++ printf("runTime: %4.2f\n", 1.0*total/MSEC_PER_SEC);
+ printf("freq: %7.0f\n", tsc / (1.0*aperf / (1.0 * mperf)) / total);
+ return 0;
+ }
projects / thirdparty / kernel / stable-queue.git / commitdiff
