media: camss: Fixups for large capture frames
Subsystems (4)
cover media: camss: Fixups for large capture frames
A few small issues discovered while (thus far unsuccessfully) trying to bring up a 64MP sensor. The chosen frame limitation of 8192 seems to be somewhat arbitrary as there don't appear to be any hardware limits on maximum frame size. Double the maximum allowable frame size to accommodate bigger sensors.
Next the larger data sizes end up needing bigger pixel clocks. This exposed a bug for 8250 devices where the VFE clocks are shared between two blocks, but the CSID block is being initialized second and overwriting the carefully selected clock rates from VFE. This was likely not a problem earlier because the lowest VFE clock rate that CSID was selecting was good enough for the family of sensors that were being used.
Jordan Crouse (2):
media: camss: Increase the maximum frame size
media: camss: Avoid overwriting vfe clock rates for 8250
.../media/platform/qcom/camss/camss-csid.c | 8 +++---- .../media/platform/qcom/camss/camss-csiphy.c | 4 ++-- .../media/platform/qcom/camss/camss-ispif.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++-- .../media/platform/qcom/camss/camss-video.c | 6 +++--- drivers/media/platform/qcom/camss/camss.c | 21 +++++++++++++------ 6 files changed, 28 insertions(+), 19 deletions(-)
Signature · 1 line
2.40.1
PATCH 1/2 media: camss: Increase the maximum frame size
Commit 35493d653a2d
("media: camss: add support for vidioc_enum_framesizes ioctl") added a maximum frame width and height but the values selected seemed to have been arbitrary. In reality the cam hardware doesn't seem to have a maximum size restriction so double up the maximum reported width and height to allow for larger frames.
Also increase the maximum size checks at each point in the pipeline so the increased sizes are allowed all the way down to the sensor.
---
drivers/media/platform/qcom/camss/camss-csid.c | 8 ++++---- drivers/media/platform/qcom/camss/camss-csiphy.c | 4 ++-- drivers/media/platform/qcom/camss/camss-ispif.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++-- drivers/media/platform/qcom/camss/camss-video.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-)
drivers/media/platform/qcom/camss/camss-csid.c +4 -4
@@ -752,8 +752,8 @@ static void csid_try_format(struct csid_device *csid,if (i >= csid->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;
@@ -781,8 +781,8 @@ static void csid_try_format(struct csid_device *csid,if (i >= csid->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; }
drivers/media/platform/qcom/camss/camss-csiphy.c +2 -2
@@ -368,8 +368,8 @@ static void csiphy_try_format(struct csiphy_device *csiphy,if (i >= csiphy->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;
drivers/media/platform/qcom/camss/camss-ispif.c +2 -2
@@ -912,8 +912,8 @@ static void ispif_try_format(struct ispif_line *line,if (i >= line->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;
drivers/media/platform/qcom/camss/camss-vfe.c +2 -2
@@ -1049,8 +1049,8 @@ static void vfe_try_format(struct vfe_line *line,if (i >= line->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;
drivers/media/platform/qcom/camss/camss-video.c +3 -3
@@ -19,10 +19,10 @@#include "camss.h" #define CAMSS_FRAME_MIN_WIDTH 1 -#define CAMSS_FRAME_MAX_WIDTH 8191 +#define CAMSS_FRAME_MAX_WIDTH 16833#define CAMSS_FRAME_MIN_HEIGHT 1 -#define CAMSS_FRAME_MAX_HEIGHT_RDI 8191 -#define CAMSS_FRAME_MAX_HEIGHT_PIX 4096 +#define CAMSS_FRAME_MAX_HEIGHT_RDI 16833 +#define CAMSS_FRAME_MAX_HEIGHT_PIX 8192/* ----------------------------------------------------------------------------- * Helper functions
Signature · 1 line
2.40.1
Bryan O'Donoghue
maintainerRe: [PATCH v1 1/2] media: camss: Increase the maximum frame size
Quoted 9 lines · Jordan Crouse
Commit
35493d653a2d
("media: camss: add support forvidioc_enum_framesizesioctl") added a maximum frame width and height but the values selected seemed to have been arbitrary. In reality the cam hardware doesn't seem to have a maximum size restriction so double up the maximum reported width and height to allow for larger frames.Also increase the maximum size checks at each point in the pipeline so the increased sizes are allowed all the way down to the sensor.
So, I think this should be a Fixes: also.
Quoted 16 lines
Signed-off-by Jordan Crouse <[email protected]>---
drivers/media/platform/qcom/camss/camss-csid.c | 8 ++++---- drivers/media/platform/qcom/camss/camss-csiphy.c | 4 ++-- drivers/media/platform/qcom/camss/camss-ispif.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++-- drivers/media/platform/qcom/camss/camss-video.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-)drivers/media/platform/qcom/camss/camss-csid.c +0
-0
drivers/media/platform/qcom/camss/camss-csid.c static void csid_try_format(struct csid_device *csid, · line 756
Quoted 7 lines
drivers/media/platform/qcom/camss/camss-csid.c +2
-2@@ -752,8 +752,8 @@ static void csid_try_format(struct csid_device *csid,if (i >= csid->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 );
Feels like we should have a define instead of hard coded values repeated constantly.
---
bod
Bryan O'Donoghue
maintainerRe: [PATCH v1 1/2] media: camss: Increase the maximum frame size
Quoted 5 lines · Bryan O'Donoghue
Quoted 3 lines
Also increase the maximum size checks at each point in the pipeline so the increased sizes are allowed all the way down to the sensor.
So, I think this should be a Fixes: also.
TL;DR we don't need a Fixes: for your v2.
Pardon me, not a Fixes: the sizeof(sensor) that can be supported is SoC specific - camera IP specific really - so 8192 is a blunt descriptor, raising to 16384 makes some kind of sense.
A long term fix for this would be for each camss descriptor to declare the maximum sizeof(sensor) it supports. For sm8250, sc8280xp that's 64 megapixels - for older SoCs its going to be smaller.
---
bod
Re: [PATCH v1 1/2] media: camss: Increase the maximum frame size
In reply to Jordan CrouseQuoted 9 lines · Jordan Crouse
Commit
35493d653a2d
("media: camss: add support forvidioc_enum_framesizesioctl") added a maximum frame width and height but the values selected seemed to have been arbitrary. In reality the cam hardware doesn't seem to have a maximum size restriction so double up the maximum reported width and height to allow for larger frames.Also increase the maximum size checks at each point in the pipeline so the increased sizes are allowed all the way down to the sensor.
Hi Jordan,
Looks like this hasn't landed yet, do you plan on resending this?
Just wanted to try a 8192x6144 format but csid limiting the size to 8191 is a bit in the way.
Regards
Luca
Quoted 100 lines
Signed-off-by Jordan Crouse <[email protected]>---
drivers/media/platform/qcom/camss/camss-csid.c | 8 ++++---- drivers/media/platform/qcom/camss/camss-csiphy.c | 4 ++-- drivers/media/platform/qcom/camss/camss-ispif.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++-- drivers/media/platform/qcom/camss/camss-video.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-)drivers/media/platform/qcom/camss/camss-csid.c +4
-4@@ -752,8 +752,8 @@ static void csid_try_format(struct csid_device *csid,if (i >= csid->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;@@ -781,8 +781,8 @@ static void csid_try_format(struct csid_device *csid,if (i >= csid->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; }drivers/media/platform/qcom/camss/camss-csiphy.c +2
-2@@ -368,8 +368,8 @@ static void csiphy_try_format(struct csiphy_device *csiphy,if (i >= csiphy->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;drivers/media/platform/qcom/camss/camss-ispif.c +2
-2@@ -912,8 +912,8 @@ static void ispif_try_format(struct ispif_line *line,if (i >= line->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;drivers/media/platform/qcom/camss/camss-vfe.c +2
-2@@ -1049,8 +1049,8 @@ static void vfe_try_format(struct vfe_line *line,if (i >= line->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;drivers/media/platform/qcom/camss/camss-video.c +3
-3@@ -19,10 +19,10 @@#include "camss.h" #define CAMSS_FRAME_MIN_WIDTH 1 -#define CAMSS_FRAME_MAX_WIDTH 8191 +#define CAMSS_FRAME_MAX_WIDTH 16833#define CAMSS_FRAME_MIN_HEIGHT 1 -#define CAMSS_FRAME_MAX_HEIGHT_RDI 8191 -#define CAMSS_FRAME_MAX_HEIGHT_PIX 4096 +#define CAMSS_FRAME_MAX_HEIGHT_RDI 16833 +#define CAMSS_FRAME_MAX_HEIGHT_PIX 8192/* ----------------------------------------------------------------------------- * Helper functions
Bryan O'Donoghue
maintainerRe: [PATCH v1 1/2] media: camss: Increase the maximum frame size
Quoted 119 lines · Luca Weiss
Quoted 9 lines · Jordan Crouse
Commit
35493d653a2d
("media: camss: add support forvidioc_enum_framesizesioctl") added a maximum frame width and height but the values selected seemed to have been arbitrary. In reality the cam hardware doesn't seem to have a maximum size restriction so double up the maximum reported width and height to allow for larger frames.Also increase the maximum size checks at each point in the pipeline so the increased sizes are allowed all the way down to the sensor.
Hi Jordan,
Looks like this hasn't landed yet, do you plan on resending this?
Just wanted to try a 8192x6144 format but csid limiting the size to 8191 is a bit in the way.
Regards
LucaQuoted 98 lines
Signed-off-by Jordan Crouse <[email protected]>---
drivers/media/platform/qcom/camss/camss-csid.c | 8 ++++---- drivers/media/platform/qcom/camss/camss-csiphy.c | 4 ++-- drivers/media/platform/qcom/camss/camss-ispif.c | 4 ++-- drivers/media/platform/qcom/camss/camss-vfe.c | 4 ++-- drivers/media/platform/qcom/camss/camss-video.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-)drivers/media/platform/qcom/camss/camss-csid.c +4
-4@@ -752,8 +752,8 @@ static void csid_try_format(struct csid_device *csid,if (i >= csid->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;@@ -781,8 +781,8 @@ static void csid_try_format(struct csid_device *csid,if (i >= csid->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; }drivers/media/platform/qcom/camss/camss-csiphy.c +2
-2@@ -368,8 +368,8 @@ static void csiphy_try_format(struct csiphy_device *csiphy,if (i >= csiphy->res->formats->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;drivers/media/platform/qcom/camss/camss-ispif.c +2
-2@@ -912,8 +912,8 @@ static void ispif_try_format(struct ispif_line *line,if (i >= line->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;drivers/media/platform/qcom/camss/camss-vfe.c +2
-2@@ -1049,8 +1049,8 @@ static void vfe_try_format(struct vfe_line *line,if (i >= line->nformats) fmt->code =MEDIA_BUS_FMT_UYVY8_1X16 ; - fmt->width =clamp_t (u32, fmt->width,1 ,8191 ); - fmt->height =clamp_t (u32, fmt->height,1 ,8191 ); + fmt->width =clamp_t (u32, fmt->width,1 ,16383 ); + fmt->height =clamp_t (u32, fmt->height,1 ,16383 ); fmt->field =V4L2_FIELD_NONE ; fmt->colorspace =V4L2_COLORSPACE_SRGB ;drivers/media/platform/qcom/camss/camss-video.c +3
-3@@ -19,10 +19,10 @@#include "camss.h" #define CAMSS_FRAME_MIN_WIDTH 1 -#define CAMSS_FRAME_MAX_WIDTH 8191 +#define CAMSS_FRAME_MAX_WIDTH 16833#define CAMSS_FRAME_MIN_HEIGHT 1 -#define CAMSS_FRAME_MAX_HEIGHT_RDI 8191 -#define CAMSS_FRAME_MAX_HEIGHT_PIX 4096 +#define CAMSS_FRAME_MAX_HEIGHT_RDI 16833 +#define CAMSS_FRAME_MAX_HEIGHT_PIX 8192
Quoted 3 lines
drivers/media/platform/qcom/camss/camss-video.c line 28
Quoted 2 lines
drivers/media/platform/qcom/camss/camss-video.c +0
-0/* ----------------------------------------------------------------------------- * Helper functions
Ping Jordan !
Will buy you beer for a v2 of this series.
---
bod
PATCH 2/2 media: camss: Avoid overwriting vfe clock rates for 8250
In reply to Jordan CrouseOn sm8250 targets both the csid and vfe subsystems share a number of clocks. Commit b4436a18eedb ("media: camss: add support for SM8250 camss") reorganized the initialization sequence so that VFE gets initialized first but a side effect of that was that the CSID subsystem came in after and overwrites the set frequencies on the shared clocks.
Empty the frequency tables for the shared clocks in the CSID resources so they won't overwrite the clock rates that the VFE has already set.
---
drivers/media/platform/qcom/camss/camss.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/media/platform/qcom/camss/camss.c +15 -6
@@ -915,6 +915,15 @@ static const struct camss_subdev_resources csiphy_res_8250[] = { } }; +/* +* Both CSID and VFE use some of the same vfe clocks and both +* should prepare/enable them but only the VFE subsystem should be in charge +* of setting the clock rates. +* +* Set the frequency tables for those clocks in the CSID resources to +* be empty so the csid subsystem doesn't overwrite the clock rates that the +* VFE already set. +*/ static const struct camss_subdev_resources csid_res_8250[] = {/* CSID0 */ {
@@ -922,8 +931,8 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe0_csid", "vfe0_cphy_rx", "vfe0", "vfe0_areg", "vfe0_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 350000000, 475000000, 576000000, 720000000 }, - { 100000000, 200000000, 300000000, 400000000 }, + { 0 }, + { 0 }, { 0 } }, .reg = { "csid0" }, .interrupt = { "csid0" },
@@ -939,8 +948,8 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe1_csid", "vfe1_cphy_rx", "vfe1", "vfe1_areg", "vfe1_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 350000000, 475000000, 576000000, 720000000 }, - { 100000000, 200000000, 300000000, 400000000 }, + { 0 }, + { 0 }, { 0 } }, .reg = { "csid1" }, .interrupt = { "csid1" },
@@ -956,7 +965,7 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 400000000, 480000000 }, + { 0 }, { 0 } }, .reg = { "csid2" }, .interrupt = { "csid2" },
@@ -973,7 +982,7 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 400000000, 480000000 }, + { 0 }, { 0 } }, .reg = { "csid3" }, .interrupt = { "csid3" },
Signature · 1 line
2.40.1
Bryan O'Donoghue
maintainerRe: [PATCH v1 2/2] media: camss: Avoid overwriting vfe clock rates for 8250
Quoted 67 lines · Jordan Crouse
On sm8250 targets both the csid and vfe subsystems share a number of clocks. Commit
b4436a18eedb("media: camss: add support for SM8250 camss") reorganized the initialization sequence so that VFE gets initialized first but a side effect of that was that the CSID subsystem came in after and overwrites the set frequencies on the shared clocks.Empty the frequency tables for the shared clocks in the CSID resources so they won't overwrite the clock rates that the VFE has already set.
Signed-off-by Jordan Crouse <[email protected]>---
drivers/media/platform/qcom/camss/camss.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)drivers/media/platform/qcom/camss/camss.c +14
-5@@ -915,6 +915,15 @@ static const struct camss_subdev_resources csiphy_res_8250[] = { } }; +/* +* Both CSID and VFE use some of the same vfe clocks and both +* should prepare/enable them but only the VFE subsystem should be in charge +* of setting the clock rates. +* +* Set the frequency tables for those clocks in the CSID resources to +* be empty so the csid subsystem doesn't overwrite the clock rates that the +* VFE already set. +*/ static const struct camss_subdev_resources csid_res_8250[] = {/* CSID0 */ {@@ -922,8 +931,8 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe0_csid", "vfe0_cphy_rx", "vfe0", "vfe0_areg", "vfe0_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 350000000, 475000000, 576000000, 720000000 }, - { 100000000, 200000000, 300000000, 400000000 }, + { 0 }, + { 0 }, { 0 } }, .reg = { "csid0" }, .interrupt = { "csid0" },@@ -939,8 +948,8 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe1_csid", "vfe1_cphy_rx", "vfe1", "vfe1_areg", "vfe1_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 350000000, 475000000, 576000000, 720000000 }, - { 100000000, 200000000, 300000000, 400000000 }, + { 0 }, + { 0 }, { 0 } }, .reg = { "csid1" }, .interrupt = { "csid1" },@@ -956,7 +965,7 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 400000000, 480000000 }, + { 0 }, { 0 } }, .reg = { "csid2" }, .interrupt = { "csid2" },
drivers/media/platform/qcom/camss/camss.c static const struct camss_subdev_resources csid_res_8250[] = { · line 988
Quoted 8 lines
drivers/media/platform/qcom/camss/camss.c +1
-1@@ -973,7 +982,7 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 400000000, 480000000 }, + { 0 }, { 0 } }, .reg = { "csid3" }, .interrupt = { "csid3" },
Hi Jordan.
Thanks for your patch. Just looking at the clocks you are zeroing here, I think _probably_ these zeroized clocks can be removed from the CSID set entirely.
Could you investigate that ?
Also please add
---
bod
Re: [PATCH v1 2/2] media: camss: Avoid overwriting vfe clock rates for 8250
Quoted 80 lines · Bryan O'Donoghue
Quoted 67 lines · Jordan Crouse
On sm8250 targets both the csid and vfe subsystems share a number of clocks. Commit
b4436a18eedb("media: camss: add support for SM8250 camss") reorganized the initialization sequence so that VFE gets initialized first but a side effect of that was that the CSID subsystem came in after and overwrites the set frequencies on the shared clocks.Empty the frequency tables for the shared clocks in the CSID resources so they won't overwrite the clock rates that the VFE has already set.
Signed-off-by Jordan Crouse <[email protected]>---
drivers/media/platform/qcom/camss/camss.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)drivers/media/platform/qcom/camss/camss.c +14
-5@@ -915,6 +915,15 @@ static const struct camss_subdev_resources csiphy_res_8250[] = { } }; +/* +* Both CSID and VFE use some of the same vfe clocks and both +* should prepare/enable them but only the VFE subsystem should be in charge +* of setting the clock rates. +* +* Set the frequency tables for those clocks in the CSID resources to +* be empty so the csid subsystem doesn't overwrite the clock rates that the +* VFE already set. +*/ static const struct camss_subdev_resources csid_res_8250[] = {/* CSID0 */ {@@ -922,8 +931,8 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe0_csid", "vfe0_cphy_rx", "vfe0", "vfe0_areg", "vfe0_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 350000000, 475000000, 576000000, 720000000 }, - { 100000000, 200000000, 300000000, 400000000 }, + { 0 }, + { 0 }, { 0 } }, .reg = { "csid0" }, .interrupt = { "csid0" },@@ -939,8 +948,8 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe1_csid", "vfe1_cphy_rx", "vfe1", "vfe1_areg", "vfe1_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 350000000, 475000000, 576000000, 720000000 }, - { 100000000, 200000000, 300000000, 400000000 }, + { 0 }, + { 0 }, { 0 } }, .reg = { "csid1" }, .interrupt = { "csid1" },@@ -956,7 +965,7 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 400000000, 480000000 }, + { 0 }, { 0 } }, .reg = { "csid2" }, .interrupt = { "csid2" },drivers/media/platform/qcom/camss/camss.c static const struct camss_subdev_resources csid_res_8250[] = { · line 988
Quoted 8 lines
drivers/media/platform/qcom/camss/camss.c +1
-1@@ -973,7 +982,7 @@ static const struct camss_subdev_resources csid_res_8250[] = { .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" }, .clock_rate = { { 400000000 }, { 400000000 }, - { 400000000, 480000000 }, + { 0 }, { 0 } }, .reg = { "csid3" }, .interrupt = { "csid3" },Hi Jordan.
Quoted 5 lines
Thanks for your patch. Just looking at the clocks you are zeroing here, I think _probably_ these zeroized clocks can be removed from the CSID set entirely.
Could you investigate that ?
I think that will work. It will cement the need for to VFE always run first but we can add documentation warnings about that. It looks like we can do this optimization for 845, sm8250 and sm2850xp.
Quoted 5 lines
Also please add
Fixes b4436a18eedb ("media: camss: add support for SM8250 camss") and
Will do.
Jordan