On 5/10/2023 11:28 PM, Dmitry Baryshkov wrote:
On 11/05/2023 00:03, Jessica Zhang wrote:
On 5/9/2023 11:33 PM, Marijn Suijten wrote:
On 2023-05-09 15:06:50, Jessica Zhang wrote:
Introduce MSM-specific DSC helper methods, as some calculations are
common between DP and DSC.
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Signed-off-by: Jessica Zhang <quic_jesszhan@xxxxxxxxxxx>
---
drivers/gpu/drm/msm/Makefile | 1 +
drivers/gpu/drm/msm/msm_dsc_helper.c | 26 ++++++++++++++
drivers/gpu/drm/msm/msm_dsc_helper.h | 69
++++++++++++++++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/drivers/gpu/drm/msm/Makefile
b/drivers/gpu/drm/msm/Makefile
index 7274c41228ed..b814fc80e2d5 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -94,6 +94,7 @@ msm-y += \
msm_atomic_tracepoints.o \
msm_debugfs.o \
msm_drv.o \
+ msm_dsc_helper.o \
msm_fb.o \
msm_fence.o \
msm_gem.o \
diff --git a/drivers/gpu/drm/msm/msm_dsc_helper.c
b/drivers/gpu/drm/msm/msm_dsc_helper.c
new file mode 100644
index 000000000000..29feb3e3b5a4
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_dsc_helper.c
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights
reserved
+ */
+
+#include <linux/kernel.h>
+#include <drm/drm_fixed.h>
+
+#include "msm_dsc_helper.h"
+
+s64 msm_dsc_get_bytes_per_soft_slice(struct drm_dsc_config *dsc)
+{
+ return drm_fixp_from_fraction(dsc->slice_width *
msm_dsc_get_bpp_int(dsc), 8);
How about using dsc->slice_chunk_size?
Hi Marijn,
Thanks for pointing this out. However, I would prefer to keep this
fixed point version of the slice_chunk_size math as the downstream DP
math also uses fixed point [1].
This is pretty weak argument. Especially since this particular piece of
code does lots of wrong or inefficient things.
I guess Jessica's concern was we will have to revalidate some bpc/bpp
and slice combinations again for DP. So its a question of keeping this
helper for now and dropping it if unnecessary later or dropping it now
itself. If the consensus is going to be to drop this, we will just
re-test the monitors we have and do it.
If we are able to confirm that integer math also works for DP, we will
make the change to use slice_chunk_size within the DP DSC series.
This is why we usually do not accept API-only series. It is next to
imposible to judge if the API is good enough without the actual users.
I also want to note that this math has stayed the same throughout all
7 revisions. In the interest of making review more efficient, I think
it would be helpful to point out important details like this early on
in the process. That way we can address major concerns early on and
keep the number of revisions per series low.
This is not always possible. We grasp the details of the patchset as we
review and dive into the patchset under the review and other close
enough patches/commits. So it is infrequent but still valid when at some
point a reviewer (or the author) would come up with the comments
demanding significant changes to the patch.
I dont think Jessica is really complaining about multiple reviewers. Its
a question of when those reviews are coming. Not reviewing revisions 1-7
and starting the reviews at revision 8 (that essentially becomes
revision 1 now) , is going to make this go on forever.
So its a bit frustrating from the developers point of view to just
ignore revisions 1-7 and start at rev 8.
[1]
https://github.com/ianmacd/gts6lwifi/blob/master/drivers/gpu/drm/msm/dp/dp_panel.c#L335
+}
+
+u32 msm_dsc_get_bytes_per_intf(struct drm_dsc_config *dsc, int
intf_width)
+{
+ u32 bytes_per_soft_slice;
+ s64 bytes_per_soft_slice_fp;
+ int slice_per_intf = msm_dsc_get_slice_per_intf(dsc, intf_width);
+
+ bytes_per_soft_slice_fp = msm_dsc_get_bytes_per_soft_slice(dsc);
+ bytes_per_soft_slice = drm_fixp2int_ceil(bytes_per_soft_slice_fp);
+
+ return bytes_per_soft_slice * slice_per_intf;
+}
diff --git a/drivers/gpu/drm/msm/msm_dsc_helper.h
b/drivers/gpu/drm/msm/msm_dsc_helper.h
new file mode 100644
index 000000000000..38f3651d0b79
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_dsc_helper.h
@@ -0,0 +1,69 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights
reserved
+ */
+
+#ifndef MSM_DSC_HELPER_H_
+#define MSM_DSC_HELPER_H_
+
+#include <linux/bug.h>
+#include <linux/math.h>
+#include <drm/display/drm_dsc_helper.h>
+
+/*
+ * Helper methods for MSM specific DSC calculations that are common
between timing engine,
+ * DSI, and DP.
+ */
+
+/**
+ * msm_dsc_get_bpp_int - get bits per pixel integer value
For all function docs, don't forget the trailing parenthesis after the
function name: msm_dsc_get_bpp_int()
https://www.kernel.org/doc/html/next/doc-guide/kernel-doc.html#function-documentation
Acked.
+ * @dsc: Pointer to drm dsc config struct
+ * Returns: BPP integer value
+ */
+static inline int msm_dsc_get_bpp_int(struct drm_dsc_config *dsc)
+{
+ WARN_ON_ONCE(dsc->bits_per_pixel & 0xf);
+ return dsc->bits_per_pixel >> 4;
+}
+
+/**
+ * msm_dsc_get_slice_per_intf - get number of slices per interface
+ * @dsc: Pointer to drm dsc config struct
+ * @intf_width: interface width
+ * Returns: Integer representing the slice per interface
+ */
+static inline int msm_dsc_get_slice_per_intf(struct drm_dsc_config
*dsc, int intf_width)
+{
+ return DIV_ROUND_UP(intf_width, dsc->slice_width);
Looks good.
+}
+
+/**
+ * msm_dsc_get_bytes_per_line - Calculate bytes per line
+ * @dsc: Pointer to drm dsc config struct
+ * Returns: Integer value representing pclk per interface
+ *
+ * Note: This value will then be passed along to DSI and DP for
some more
+ * calculations. This is because DSI and DP divide the
pclk_per_intf value
+ * by different values depending on if widebus is enabled.
+ */
+static inline int msm_dsc_get_bytes_per_line(struct drm_dsc_config
*dsc)
+{
+ return DIV_ROUND_UP(dsc->slice_width * dsc->slice_count *
msm_dsc_get_bpp_int(dsc), 8);
dsc->slice_chunk_size * dsc->slice_count?
Acked.
+}
+
+/**
+ * msm_dsc_get_bytes_per_soft_slice - get size of each soft slice
for dsc
Explain to the reader what a "soft" slice is?
A soft slice is a slice defined in software as opposed to "hard
slices" that are defined by hardware.
Since the slice-related variables in drm_dsc_config hold information
related to soft slices and there is no separate variable for hard
slices, I'll change this name to *_get_bytes_per_slice instead.
Thanks,
Jessica Zhang
- Marijn
+ * @dsc: Pointer to drm dsc config struct
+ * Returns: s31.32 fixed point value representing bytes per soft slice
+ */
+s64 msm_dsc_get_bytes_per_soft_slice(struct drm_dsc_config *dsc);
+
+/**
+ * msm_dsc_get_bytes_per_intf - get total bytes per interface
+ * @dsc: Pointer to drm dsc config struct
+ * @intf_width: interface width
+ * Returns: u32 value representing bytes per interface
+ */
+u32 msm_dsc_get_bytes_per_intf(struct drm_dsc_config *dsc, int
intf_width);
+
+#endif /* MSM_DSC_HELPER_H_ */
--
2.40.1
