* [PATCH] omapfb: dss: Fix max fclk divider for omap36xx
@ 2020-07-09 12:12 Adam Ford
[not found] ` <CAHCN7x+crwfE4pfufad_WEUhiJQXccSZHot+YNDZzZKvqhrmWA@mail.gmail.com>
0 siblings, 1 reply; 14+ messages in thread
From: Adam Ford @ 2020-07-09 12:12 UTC (permalink / raw)
To: stable; +Cc: tomi.valkeinen, aford, Adam Ford
There appears to be a timing issue where using a divider of 32 breaks
the DSS for OMAP36xx despite the TRM stating 32 is a valid
number. Through experimentation, it appears that 31 works.
This same fix was issued for kernels 4.5+. However, between
kernels 4.4 and 4.5, the directory structure was changed when the
dss directory was moved inside the omapfb directory. That broke the
patch on kernels older than 4.5, because it didn't permit the patch
to apply cleanly for 4.4 and older.
A similar patch was applied to the 3.16 kernel already, but not to 4.4.
Commit 4b911101a5cd ("drm/omap: fix max fclk divider for omap36xx") is
on the 3.16 stable branch with notes from Ben about the path change.
Since this was applied for 3.16 already, this patch is for kernels
3.17 through 4.4 only.
Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev")
Cc: <stable@vger.kernel.org> #3.17 - 4.4
CC: <tomi.valkeinen@ti.com>
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c
index 9200a8668b49..a57c3a5f4bf8 100644
--- a/drivers/video/fbdev/omap2/dss/dss.c
+++ b/drivers/video/fbdev/omap2/dss/dss.c
@@ -843,7 +843,7 @@ static const struct dss_features omap34xx_dss_feats = {
};
static const struct dss_features omap3630_dss_feats = {
- .fck_div_max = 32,
+ .fck_div_max = 31,
.dss_fck_multiplier = 1,
.parent_clk_name = "dpll4_ck",
.dpi_select_source = &dss_dpi_select_source_omap2_omap3,
--
2.25.1
^ permalink raw reply related [flat|nested] 14+ messages in thread[parent not found: <CAHCN7x+crwfE4pfufad_WEUhiJQXccSZHot+YNDZzZKvqhrmWA@mail.gmail.com>]
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx [not found] ` <CAHCN7x+crwfE4pfufad_WEUhiJQXccSZHot+YNDZzZKvqhrmWA@mail.gmail.com> @ 2020-08-04 13:19 ` Tomi Valkeinen 2020-08-05 14:33 ` Greg KH 0 siblings, 1 reply; 14+ messages in thread From: Tomi Valkeinen @ 2020-08-04 13:19 UTC (permalink / raw) To: Adam Ford, stable; +Cc: Adam Ford-BE On 04/08/2020 16:13, Adam Ford wrote: > > > On Thu, Jul 9, 2020 at 7:12 AM Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> wrote: > > There appears to be a timing issue where using a divider of 32 breaks > the DSS for OMAP36xx despite the TRM stating 32 is a valid > number. Through experimentation, it appears that 31 works. > > This same fix was issued for kernels 4.5+. However, between > kernels 4.4 and 4.5, the directory structure was changed when the > dss directory was moved inside the omapfb directory. That broke the > patch on kernels older than 4.5, because it didn't permit the patch > to apply cleanly for 4.4 and older. > > A similar patch was applied to the 3.16 kernel already, but not to 4.4. > Commit 4b911101a5cd ("drm/omap: fix max fclk divider for omap36xx") is > on the 3.16 stable branch with notes from Ben about the path change. > > Since this was applied for 3.16 already, this patch is for kernels > 3.17 through 4.4 only. > > Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev") > > Cc: <stable@vger.kernel.org <mailto:stable@vger.kernel.org>> #3.17 - 4.4 > CC: <tomi.valkeinen@ti.com <mailto:tomi.valkeinen@ti.com>> > Signed-off-by: Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> > > > Tomi, > > Can you comment on this? The 4.4 is still waiting for this fix. The other branches are fixed. Looks good to me. Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-08-04 13:19 ` Tomi Valkeinen @ 2020-08-05 14:33 ` Greg KH 2020-08-06 9:46 ` Tomi Valkeinen 0 siblings, 1 reply; 14+ messages in thread From: Greg KH @ 2020-08-05 14:33 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: Adam Ford, stable, Adam Ford-BE On Tue, Aug 04, 2020 at 04:19:54PM +0300, Tomi Valkeinen wrote: > On 04/08/2020 16:13, Adam Ford wrote: > > > > > > On Thu, Jul 9, 2020 at 7:12 AM Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> wrote: > > > > There appears to be a timing issue where using a divider of 32 breaks > > the DSS for OMAP36xx despite the TRM stating 32 is a valid > > number. Through experimentation, it appears that 31 works. > > > > This same fix was issued for kernels 4.5+. However, between > > kernels 4.4 and 4.5, the directory structure was changed when the > > dss directory was moved inside the omapfb directory. That broke the > > patch on kernels older than 4.5, because it didn't permit the patch > > to apply cleanly for 4.4 and older. > > > > A similar patch was applied to the 3.16 kernel already, but not to 4.4. > > Commit 4b911101a5cd ("drm/omap: fix max fclk divider for omap36xx") is > > on the 3.16 stable branch with notes from Ben about the path change. > > > > Since this was applied for 3.16 already, this patch is for kernels > > 3.17 through 4.4 only. > > > > Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev") > > > > Cc: <stable@vger.kernel.org <mailto:stable@vger.kernel.org>> #3.17 - 4.4 > > CC: <tomi.valkeinen@ti.com <mailto:tomi.valkeinen@ti.com>> > > Signed-off-by: Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> > > > > > > Tomi, > > > > Can you comment on this? The 4.4 is still waiting for this fix. The other branches are fixed. > > Looks good to me. > > Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> I don't seem to have the original of this anymore, can someone please resend it? thanks, greg k-h ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-08-05 14:33 ` Greg KH @ 2020-08-06 9:46 ` Tomi Valkeinen 2020-08-13 16:41 ` Adam Ford 0 siblings, 1 reply; 14+ messages in thread From: Tomi Valkeinen @ 2020-08-06 9:46 UTC (permalink / raw) To: Greg KH; +Cc: Adam Ford, stable, Adam Ford-BE [-- Attachment #1: Type: text/plain, Size: 1949 bytes --] Hi Greg, On 05/08/2020 17:33, Greg KH wrote: > On Tue, Aug 04, 2020 at 04:19:54PM +0300, Tomi Valkeinen wrote: >> On 04/08/2020 16:13, Adam Ford wrote: >>> >>> >>> On Thu, Jul 9, 2020 at 7:12 AM Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> wrote: >>> >>> There appears to be a timing issue where using a divider of 32 breaks >>> the DSS for OMAP36xx despite the TRM stating 32 is a valid >>> number. Through experimentation, it appears that 31 works. >>> >>> This same fix was issued for kernels 4.5+. However, between >>> kernels 4.4 and 4.5, the directory structure was changed when the >>> dss directory was moved inside the omapfb directory. That broke the >>> patch on kernels older than 4.5, because it didn't permit the patch >>> to apply cleanly for 4.4 and older. >>> >>> A similar patch was applied to the 3.16 kernel already, but not to 4.4. >>> Commit 4b911101a5cd ("drm/omap: fix max fclk divider for omap36xx") is >>> on the 3.16 stable branch with notes from Ben about the path change. >>> >>> Since this was applied for 3.16 already, this patch is for kernels >>> 3.17 through 4.4 only. >>> >>> Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev") >>> >>> Cc: <stable@vger.kernel.org <mailto:stable@vger.kernel.org>> #3.17 - 4.4 >>> CC: <tomi.valkeinen@ti.com <mailto:tomi.valkeinen@ti.com>> >>> Signed-off-by: Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> >>> >>> >>> Tomi, >>> >>> Can you comment on this? The 4.4 is still waiting for this fix. The other branches are fixed. >> >> Looks good to me. >> >> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > I don't seem to have the original of this anymore, can someone please > resend it? I have attached the original. Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki [-- Attachment #2: fix-max-div.mbox --] [-- Type: application/mbox, Size: 7877 bytes --] ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-08-06 9:46 ` Tomi Valkeinen @ 2020-08-13 16:41 ` Adam Ford 2020-08-24 8:16 ` Greg KH 0 siblings, 1 reply; 14+ messages in thread From: Adam Ford @ 2020-08-13 16:41 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: Greg KH, stable, Adam Ford-BE On Thu, Aug 6, 2020 at 4:46 AM Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > > Hi Greg, > > On 05/08/2020 17:33, Greg KH wrote: > > On Tue, Aug 04, 2020 at 04:19:54PM +0300, Tomi Valkeinen wrote: > >> On 04/08/2020 16:13, Adam Ford wrote: > >>> > >>> > >>> On Thu, Jul 9, 2020 at 7:12 AM Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> wrote: > >>> > >>> There appears to be a timing issue where using a divider of 32 breaks > >>> the DSS for OMAP36xx despite the TRM stating 32 is a valid > >>> number. Through experimentation, it appears that 31 works. > >>> > >>> This same fix was issued for kernels 4.5+. However, between > >>> kernels 4.4 and 4.5, the directory structure was changed when the > >>> dss directory was moved inside the omapfb directory. That broke the > >>> patch on kernels older than 4.5, because it didn't permit the patch > >>> to apply cleanly for 4.4 and older. > >>> > >>> A similar patch was applied to the 3.16 kernel already, but not to 4.4. > >>> Commit 4b911101a5cd ("drm/omap: fix max fclk divider for omap36xx") is > >>> on the 3.16 stable branch with notes from Ben about the path change. > >>> > >>> Since this was applied for 3.16 already, this patch is for kernels > >>> 3.17 through 4.4 only. > >>> > >>> Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev") > >>> > >>> Cc: <stable@vger.kernel.org <mailto:stable@vger.kernel.org>> #3.17 - 4.4 > >>> CC: <tomi.valkeinen@ti.com <mailto:tomi.valkeinen@ti.com>> > >>> Signed-off-by: Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> > >>> > >>> > >>> Tomi, > >>> > >>> Can you comment on this? The 4.4 is still waiting for this fix. The other branches are fixed. > >> > >> Looks good to me. > >> > >> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > > > I don't seem to have the original of this anymore, can someone please > > resend it? > > I have attached the original. Greg, Do you have what you need? I see all the other kernels have been had the corresponding patches pushed, but 4.4 needed something different due to some path / naming changes. adam > > Tomi > > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-08-13 16:41 ` Adam Ford @ 2020-08-24 8:16 ` Greg KH 0 siblings, 0 replies; 14+ messages in thread From: Greg KH @ 2020-08-24 8:16 UTC (permalink / raw) To: Adam Ford; +Cc: Tomi Valkeinen, stable, Adam Ford-BE On Thu, Aug 13, 2020 at 11:41:57AM -0500, Adam Ford wrote: > On Thu, Aug 6, 2020 at 4:46 AM Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > > > > Hi Greg, > > > > On 05/08/2020 17:33, Greg KH wrote: > > > On Tue, Aug 04, 2020 at 04:19:54PM +0300, Tomi Valkeinen wrote: > > >> On 04/08/2020 16:13, Adam Ford wrote: > > >>> > > >>> > > >>> On Thu, Jul 9, 2020 at 7:12 AM Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> wrote: > > >>> > > >>> There appears to be a timing issue where using a divider of 32 breaks > > >>> the DSS for OMAP36xx despite the TRM stating 32 is a valid > > >>> number. Through experimentation, it appears that 31 works. > > >>> > > >>> This same fix was issued for kernels 4.5+. However, between > > >>> kernels 4.4 and 4.5, the directory structure was changed when the > > >>> dss directory was moved inside the omapfb directory. That broke the > > >>> patch on kernels older than 4.5, because it didn't permit the patch > > >>> to apply cleanly for 4.4 and older. > > >>> > > >>> A similar patch was applied to the 3.16 kernel already, but not to 4.4. > > >>> Commit 4b911101a5cd ("drm/omap: fix max fclk divider for omap36xx") is > > >>> on the 3.16 stable branch with notes from Ben about the path change. > > >>> > > >>> Since this was applied for 3.16 already, this patch is for kernels > > >>> 3.17 through 4.4 only. > > >>> > > >>> Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev") > > >>> > > >>> Cc: <stable@vger.kernel.org <mailto:stable@vger.kernel.org>> #3.17 - 4.4 > > >>> CC: <tomi.valkeinen@ti.com <mailto:tomi.valkeinen@ti.com>> > > >>> Signed-off-by: Adam Ford <aford173@gmail.com <mailto:aford173@gmail.com>> > > >>> > > >>> > > >>> Tomi, > > >>> > > >>> Can you comment on this? The 4.4 is still waiting for this fix. The other branches are fixed. > > >> > > >> Looks good to me. > > >> > > >> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > > > > > I don't seem to have the original of this anymore, can someone please > > > resend it? > > > > I have attached the original. > > Greg, > > Do you have what you need? I see all the other kernels have been had > the corresponding patches pushed, but 4.4 needed something different > due to some path / naming changes. All good, now queued up, thanks! greg k-h ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <CGME20200630182652eucas1p1ce5e07b065127e32ab734f4447c2f735@eucas1p1.samsung.com>]
* [PATCH] omapfb: dss: Fix max fclk divider for omap36xx @ 2020-06-30 18:26 ` Adam Ford 2020-07-03 7:17 ` Tomi Valkeinen 2020-07-10 14:23 ` Bartlomiej Zolnierkiewicz 0 siblings, 2 replies; 14+ messages in thread From: Adam Ford @ 2020-06-30 18:26 UTC (permalink / raw) To: linux-fbdev Cc: Adam Ford, stable, Bartlomiej Zolnierkiewicz, Dave Airlie, Tomi Valkeinen, Rob Clark, linux-omap, dri-devel, linux-kernel The drm/omap driver was fixed to correct an issue where using a divider of 32 breaks the DSS despite the TRM stating 32 is a valid number. Through experimentation, it appears that 31 works, and it is consistent with the value used by the drm/omap driver. This patch fixes the divider for fbdev driver instead of the drm. Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") Cc: <stable@vger.kernel.org> #4.9+ Signed-off-by: Adam Ford <aford173@gmail.com> --- Linux 4.4 will need a similar patch, but it doesn't apply cleanly. The DRM version of this same fix is: e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c index 7252d22dd117..bfc5c4c5a26a 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { }; static const struct dss_features omap3630_dss_feats = { - .fck_div_max = 32, + .fck_div_max = 31, .dss_fck_multiplier = 1, .parent_clk_name = "dpll4_ck", .dpi_select_source = &dss_dpi_select_source_omap2_omap3, -- 2.25.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-06-30 18:26 ` Adam Ford @ 2020-07-03 7:17 ` Tomi Valkeinen 2020-07-03 19:36 ` Sam Ravnborg 2020-07-10 14:23 ` Bartlomiej Zolnierkiewicz 1 sibling, 1 reply; 14+ messages in thread From: Tomi Valkeinen @ 2020-07-03 7:17 UTC (permalink / raw) To: Adam Ford, linux-fbdev Cc: stable, Bartlomiej Zolnierkiewicz, Dave Airlie, Rob Clark, linux-omap, dri-devel, linux-kernel On 30/06/2020 21:26, Adam Ford wrote: > The drm/omap driver was fixed to correct an issue where using a > divider of 32 breaks the DSS despite the TRM stating 32 is a valid > number. Through experimentation, it appears that 31 works, and > it is consistent with the value used by the drm/omap driver. > > This patch fixes the divider for fbdev driver instead of the drm. > > Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > Cc: <stable@vger.kernel.org> #4.9+ > Signed-off-by: Adam Ford <aford173@gmail.com> > --- > Linux 4.4 will need a similar patch, but it doesn't apply cleanly. > > The DRM version of this same fix is: > e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") > > > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > index 7252d22dd117..bfc5c4c5a26a 100644 > --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c > +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { > }; > > static const struct dss_features omap3630_dss_feats = { > - .fck_div_max = 32, > + .fck_div_max = 31, > .dss_fck_multiplier = 1, > .parent_clk_name = "dpll4_ck", > .dpi_select_source = &dss_dpi_select_source_omap2_omap3, > Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-07-03 7:17 ` Tomi Valkeinen @ 2020-07-03 19:36 ` Sam Ravnborg 2020-07-06 6:02 ` Tomi Valkeinen 0 siblings, 1 reply; 14+ messages in thread From: Sam Ravnborg @ 2020-07-03 19:36 UTC (permalink / raw) To: Tomi Valkeinen Cc: Adam Ford, linux-fbdev, Bartlomiej Zolnierkiewicz, linux-kernel, dri-devel, stable, linux-omap Hi Tomi. On Fri, Jul 03, 2020 at 10:17:29AM +0300, Tomi Valkeinen wrote: > On 30/06/2020 21:26, Adam Ford wrote: > > The drm/omap driver was fixed to correct an issue where using a > > divider of 32 breaks the DSS despite the TRM stating 32 is a valid > > number. Through experimentation, it appears that 31 works, and > > it is consistent with the value used by the drm/omap driver. > > > > This patch fixes the divider for fbdev driver instead of the drm. > > > > Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > > > Cc: <stable@vger.kernel.org> #4.9+ > > Signed-off-by: Adam Ford <aford173@gmail.com> > > --- > > Linux 4.4 will need a similar patch, but it doesn't apply cleanly. > > > > The DRM version of this same fix is: > > e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") > > > > > > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > index 7252d22dd117..bfc5c4c5a26a 100644 > > --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { > > }; > > static const struct dss_features omap3630_dss_feats = { > > - .fck_div_max = 32, > > + .fck_div_max = 31, > > .dss_fck_multiplier = 1, > > .parent_clk_name = "dpll4_ck", > > .dpi_select_source = &dss_dpi_select_source_omap2_omap3, > > > > Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Will you apply to drm-misc? Note following output from "dim fixes": $ dim fixes f76ee892a99e Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Dave Airlie <airlied@gmail.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Jason Yan <yanaijie@huawei.com> Cc: "Andrew F. Davis" <afd@ti.com> Cc: YueHaibing <yuehaibing@huawei.com> Cc: <stable@vger.kernel.org> # v4.5+ Here it says the fix is valid from v4.5 onwards. Sam > > Tomi > > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-07-03 19:36 ` Sam Ravnborg @ 2020-07-06 6:02 ` Tomi Valkeinen 2020-07-06 11:18 ` Adam Ford 0 siblings, 1 reply; 14+ messages in thread From: Tomi Valkeinen @ 2020-07-06 6:02 UTC (permalink / raw) To: Sam Ravnborg, Bartlomiej Zolnierkiewicz Cc: Adam Ford, linux-fbdev, linux-kernel, dri-devel, stable, linux-omap Hi, On 03/07/2020 22:36, Sam Ravnborg wrote: > Hi Tomi. > > On Fri, Jul 03, 2020 at 10:17:29AM +0300, Tomi Valkeinen wrote: >> On 30/06/2020 21:26, Adam Ford wrote: >>> The drm/omap driver was fixed to correct an issue where using a >>> divider of 32 breaks the DSS despite the TRM stating 32 is a valid >>> number. Through experimentation, it appears that 31 works, and >>> it is consistent with the value used by the drm/omap driver. >>> >>> This patch fixes the divider for fbdev driver instead of the drm. >>> >>> Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") >>> >>> Cc: <stable@vger.kernel.org> #4.9+ >>> Signed-off-by: Adam Ford <aford173@gmail.com> >>> --- >>> Linux 4.4 will need a similar patch, but it doesn't apply cleanly. >>> >>> The DRM version of this same fix is: >>> e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") >>> >>> >>> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c >>> index 7252d22dd117..bfc5c4c5a26a 100644 >>> --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c >>> +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c >>> @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { >>> }; >>> static const struct dss_features omap3630_dss_feats = { >>> - .fck_div_max = 32, >>> + .fck_div_max = 31, >>> .dss_fck_multiplier = 1, >>> .parent_clk_name = "dpll4_ck", >>> .dpi_select_source = &dss_dpi_select_source_omap2_omap3, >>> >> >> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Will you apply to drm-misc? This is for fbdev, so I presume Bartlomiej will pick this one. > Note following output from "dim fixes": > $ dim fixes f76ee892a99e > Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Dave Airlie <airlied@gmail.com> > Cc: Rob Clark <robdclark@gmail.com> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Cc: Jason Yan <yanaijie@huawei.com> > Cc: "Andrew F. Davis" <afd@ti.com> > Cc: YueHaibing <yuehaibing@huawei.com> > Cc: <stable@vger.kernel.org> # v4.5+ > > Here it says the fix is valid from v4.5 onwards. Hmm... Adam, you marked the fix to apply to v4.9+, and then you said v4.4 needs a new patch (that's before the big copy/rename). Did you check the versions between 4.4 and 4.9? I would guess this one applies to v4.5+. Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-07-06 6:02 ` Tomi Valkeinen @ 2020-07-06 11:18 ` Adam Ford 2020-07-08 23:37 ` Adam Ford 0 siblings, 1 reply; 14+ messages in thread From: Adam Ford @ 2020-07-06 11:18 UTC (permalink / raw) To: Tomi Valkeinen Cc: Sam Ravnborg, Bartlomiej Zolnierkiewicz, linux-fbdev, Linux Kernel Mailing List, dri-devel, stable, Linux-OMAP On Mon, Jul 6, 2020 at 1:02 AM Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > > Hi, > > On 03/07/2020 22:36, Sam Ravnborg wrote: > > Hi Tomi. > > > > On Fri, Jul 03, 2020 at 10:17:29AM +0300, Tomi Valkeinen wrote: > >> On 30/06/2020 21:26, Adam Ford wrote: > >>> The drm/omap driver was fixed to correct an issue where using a > >>> divider of 32 breaks the DSS despite the TRM stating 32 is a valid > >>> number. Through experimentation, it appears that 31 works, and > >>> it is consistent with the value used by the drm/omap driver. > >>> > >>> This patch fixes the divider for fbdev driver instead of the drm. > >>> > >>> Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > >>> > >>> Cc: <stable@vger.kernel.org> #4.9+ > >>> Signed-off-by: Adam Ford <aford173@gmail.com> > >>> --- > >>> Linux 4.4 will need a similar patch, but it doesn't apply cleanly. > >>> > >>> The DRM version of this same fix is: > >>> e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") > >>> > >>> > >>> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > >>> index 7252d22dd117..bfc5c4c5a26a 100644 > >>> --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c > >>> +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > >>> @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { > >>> }; > >>> static const struct dss_features omap3630_dss_feats = { > >>> - .fck_div_max = 32, > >>> + .fck_div_max = 31, > >>> .dss_fck_multiplier = 1, > >>> .parent_clk_name = "dpll4_ck", > >>> .dpi_select_source = &dss_dpi_select_source_omap2_omap3, > >>> > >> > >> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > Will you apply to drm-misc? > > This is for fbdev, so I presume Bartlomiej will pick this one. > > > Note following output from "dim fixes": > > $ dim fixes f76ee892a99e > > Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > > Cc: Dave Airlie <airlied@gmail.com> > > Cc: Rob Clark <robdclark@gmail.com> > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > Cc: Jason Yan <yanaijie@huawei.com> > > Cc: "Andrew F. Davis" <afd@ti.com> > > Cc: YueHaibing <yuehaibing@huawei.com> > > Cc: <stable@vger.kernel.org> # v4.5+ > > > > Here it says the fix is valid from v4.5 onwards. > > Hmm... Adam, you marked the fix to apply to v4.9+, and then you said > v4.4 needs a new patch (that's before the big copy/rename). Did you > check the versions between 4.4 and 4.9? I would guess this one applies > to v4.5+. I only tried 4.9 because it's listed as an LTS kernel. The stuff between 4.4 and 4.9 were EOL, so I didn't go back further. The 4.5+ is probably more accurate. I would like to do the same thing for the 4.4 kernel, but I am not sure the proper way to do that. adam > > Tomi > > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-07-06 11:18 ` Adam Ford @ 2020-07-08 23:37 ` Adam Ford 2020-07-09 6:10 ` Greg KH 0 siblings, 1 reply; 14+ messages in thread From: Adam Ford @ 2020-07-08 23:37 UTC (permalink / raw) To: Tomi Valkeinen Cc: Sam Ravnborg, Bartlomiej Zolnierkiewicz, linux-fbdev, Linux Kernel Mailing List, dri-devel, stable, Linux-OMAP On Mon, Jul 6, 2020 at 6:18 AM Adam Ford <aford173@gmail.com> wrote: > > On Mon, Jul 6, 2020 at 1:02 AM Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > > > > Hi, > > > > On 03/07/2020 22:36, Sam Ravnborg wrote: > > > Hi Tomi. > > > > > > On Fri, Jul 03, 2020 at 10:17:29AM +0300, Tomi Valkeinen wrote: > > >> On 30/06/2020 21:26, Adam Ford wrote: > > >>> The drm/omap driver was fixed to correct an issue where using a > > >>> divider of 32 breaks the DSS despite the TRM stating 32 is a valid > > >>> number. Through experimentation, it appears that 31 works, and > > >>> it is consistent with the value used by the drm/omap driver. > > >>> > > >>> This patch fixes the divider for fbdev driver instead of the drm. > > >>> > > >>> Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > >>> > > >>> Cc: <stable@vger.kernel.org> #4.9+ > > >>> Signed-off-by: Adam Ford <aford173@gmail.com> > > >>> --- > > >>> Linux 4.4 will need a similar patch, but it doesn't apply cleanly. > > >>> > > >>> The DRM version of this same fix is: > > >>> e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") > > >>> > > >>> > > >>> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > >>> index 7252d22dd117..bfc5c4c5a26a 100644 > > >>> --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > >>> +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > >>> @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { > > >>> }; > > >>> static const struct dss_features omap3630_dss_feats = { > > >>> - .fck_div_max = 32, > > >>> + .fck_div_max = 31, > > >>> .dss_fck_multiplier = 1, > > >>> .parent_clk_name = "dpll4_ck", > > >>> .dpi_select_source = &dss_dpi_select_source_omap2_omap3, > > >>> > > >> > > >> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > > Will you apply to drm-misc? > > > > This is for fbdev, so I presume Bartlomiej will pick this one. > > > > > Note following output from "dim fixes": > > > $ dim fixes f76ee892a99e > > > Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > > > Cc: Dave Airlie <airlied@gmail.com> > > > Cc: Rob Clark <robdclark@gmail.com> > > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > Cc: Sam Ravnborg <sam@ravnborg.org> > > > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > > Cc: Jason Yan <yanaijie@huawei.com> > > > Cc: "Andrew F. Davis" <afd@ti.com> > > > Cc: YueHaibing <yuehaibing@huawei.com> > > > Cc: <stable@vger.kernel.org> # v4.5+ > > > > > > Here it says the fix is valid from v4.5 onwards. > > > > Hmm... Adam, you marked the fix to apply to v4.9+, and then you said > > v4.4 needs a new patch (that's before the big copy/rename). Did you > > check the versions between 4.4 and 4.9? I would guess this one applies > > to v4.5+. > > I only tried 4.9 because it's listed as an LTS kernel. The stuff > between 4.4 and 4.9 were EOL, so I didn't go back further. The 4.5+ > is probably more accurate. I would like to do the same thing for the > 4.4 kernel, but I am not sure the proper way to do that. What is the correct protocol for patching 4.4? I'd like to do that, but the patch would be unique to the 4.4. Should I just submit the patch directly to stable and cc Tomi? adam > > adam > > > > Tomi > > > > -- > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-07-08 23:37 ` Adam Ford @ 2020-07-09 6:10 ` Greg KH 0 siblings, 0 replies; 14+ messages in thread From: Greg KH @ 2020-07-09 6:10 UTC (permalink / raw) To: Adam Ford Cc: Tomi Valkeinen, Sam Ravnborg, Bartlomiej Zolnierkiewicz, linux-fbdev, Linux Kernel Mailing List, dri-devel, stable, Linux-OMAP On Wed, Jul 08, 2020 at 06:37:51PM -0500, Adam Ford wrote: > On Mon, Jul 6, 2020 at 6:18 AM Adam Ford <aford173@gmail.com> wrote: > > > > On Mon, Jul 6, 2020 at 1:02 AM Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > > > > > > Hi, > > > > > > On 03/07/2020 22:36, Sam Ravnborg wrote: > > > > Hi Tomi. > > > > > > > > On Fri, Jul 03, 2020 at 10:17:29AM +0300, Tomi Valkeinen wrote: > > > >> On 30/06/2020 21:26, Adam Ford wrote: > > > >>> The drm/omap driver was fixed to correct an issue where using a > > > >>> divider of 32 breaks the DSS despite the TRM stating 32 is a valid > > > >>> number. Through experimentation, it appears that 31 works, and > > > >>> it is consistent with the value used by the drm/omap driver. > > > >>> > > > >>> This patch fixes the divider for fbdev driver instead of the drm. > > > >>> > > > >>> Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > > >>> > > > >>> Cc: <stable@vger.kernel.org> #4.9+ > > > >>> Signed-off-by: Adam Ford <aford173@gmail.com> > > > >>> --- > > > >>> Linux 4.4 will need a similar patch, but it doesn't apply cleanly. > > > >>> > > > >>> The DRM version of this same fix is: > > > >>> e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") > > > >>> > > > >>> > > > >>> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > > >>> index 7252d22dd117..bfc5c4c5a26a 100644 > > > >>> --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > > >>> +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > > > >>> @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { > > > >>> }; > > > >>> static const struct dss_features omap3630_dss_feats = { > > > >>> - .fck_div_max = 32, > > > >>> + .fck_div_max = 31, > > > >>> .dss_fck_multiplier = 1, > > > >>> .parent_clk_name = "dpll4_ck", > > > >>> .dpi_select_source = &dss_dpi_select_source_omap2_omap3, > > > >>> > > > >> > > > >> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > > > Will you apply to drm-misc? > > > > > > This is for fbdev, so I presume Bartlomiej will pick this one. > > > > > > > Note following output from "dim fixes": > > > > $ dim fixes f76ee892a99e > > > > Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > > > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > > > > Cc: Dave Airlie <airlied@gmail.com> > > > > Cc: Rob Clark <robdclark@gmail.com> > > > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Cc: Sam Ravnborg <sam@ravnborg.org> > > > > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > > > Cc: Jason Yan <yanaijie@huawei.com> > > > > Cc: "Andrew F. Davis" <afd@ti.com> > > > > Cc: YueHaibing <yuehaibing@huawei.com> > > > > Cc: <stable@vger.kernel.org> # v4.5+ > > > > > > > > Here it says the fix is valid from v4.5 onwards. > > > > > > Hmm... Adam, you marked the fix to apply to v4.9+, and then you said > > > v4.4 needs a new patch (that's before the big copy/rename). Did you > > > check the versions between 4.4 and 4.9? I would guess this one applies > > > to v4.5+. > > > > I only tried 4.9 because it's listed as an LTS kernel. The stuff > > between 4.4 and 4.9 were EOL, so I didn't go back further. The 4.5+ > > is probably more accurate. I would like to do the same thing for the > > 4.4 kernel, but I am not sure the proper way to do that. > > What is the correct protocol for patching 4.4? I'd like to do that, > but the patch would be unique to the 4.4. Should I just submit the > patch directly to stable and cc Tomi? Yes, and document the heck out of why this is a 4.4-only patch, and why we can't take whatever happened in newer kernels instead. thanks, greg k-h ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] omapfb: dss: Fix max fclk divider for omap36xx 2020-06-30 18:26 ` Adam Ford 2020-07-03 7:17 ` Tomi Valkeinen @ 2020-07-10 14:23 ` Bartlomiej Zolnierkiewicz 1 sibling, 0 replies; 14+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2020-07-10 14:23 UTC (permalink / raw) To: Adam Ford Cc: linux-fbdev, stable, Dave Airlie, Tomi Valkeinen, Rob Clark, linux-omap, dri-devel, linux-kernel On 6/30/20 8:26 PM, Adam Ford wrote: > The drm/omap driver was fixed to correct an issue where using a > divider of 32 breaks the DSS despite the TRM stating 32 is a valid > number. Through experimentation, it appears that 31 works, and > it is consistent with the value used by the drm/omap driver. > > This patch fixes the divider for fbdev driver instead of the drm. > > Fixes: f76ee892a99e ("omapfb: copy omapdss & displays for omapfb") > > Cc: <stable@vger.kernel.org> #4.9+ > Signed-off-by: Adam Ford <aford173@gmail.com> Applied to drm-misc-next tree, thanks. (I marked patch as applicable to stable 4.5+ while merging) Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > Linux 4.4 will need a similar patch, but it doesn't apply cleanly. > > The DRM version of this same fix is: > e2c4ed148cf3 ("drm/omap: fix max fclk divider for omap36xx") > > > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > index 7252d22dd117..bfc5c4c5a26a 100644 > --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c > +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c > @@ -833,7 +833,7 @@ static const struct dss_features omap34xx_dss_feats = { > }; > > static const struct dss_features omap3630_dss_feats = { > - .fck_div_max = 32, > + .fck_div_max = 31, > .dss_fck_multiplier = 1, > .parent_clk_name = "dpll4_ck", > .dpi_select_source = &dss_dpi_select_source_omap2_omap3, > ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-08-24 8:15 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-09 12:12 [PATCH] omapfb: dss: Fix max fclk divider for omap36xx Adam Ford
[not found] ` <CAHCN7x+crwfE4pfufad_WEUhiJQXccSZHot+YNDZzZKvqhrmWA@mail.gmail.com>
2020-08-04 13:19 ` Tomi Valkeinen
2020-08-05 14:33 ` Greg KH
2020-08-06 9:46 ` Tomi Valkeinen
2020-08-13 16:41 ` Adam Ford
2020-08-24 8:16 ` Greg KH
[not found] <CGME20200630182652eucas1p1ce5e07b065127e32ab734f4447c2f735@eucas1p1.samsung.com>
2020-06-30 18:26 ` Adam Ford
2020-07-03 7:17 ` Tomi Valkeinen
2020-07-03 19:36 ` Sam Ravnborg
2020-07-06 6:02 ` Tomi Valkeinen
2020-07-06 11:18 ` Adam Ford
2020-07-08 23:37 ` Adam Ford
2020-07-09 6:10 ` Greg KH
2020-07-10 14:23 ` Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox