Re: [PATCH v3 30/56] drm/omap: dsi: move panel refresh function to host
Hi,
On Mon, Nov 16, 2020 at 11:22:53AM +0200, Laurent Pinchart wrote:
> On Thu, Nov 12, 2020 at 10:08:21AM +0200, Tomi Valkeinen wrote:
> > On 11/11/2020 17:58, Laurent Pinchart wrote:
> >
> > diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> > b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> > index 030a8fa140db..1582960f9e90 100644
> > --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> > +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> > @@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data
> > *ddata, u8 *id1, u8 *id2, u8 *id3)
> > return 0;
> > }
> >
> > -static int dsicm_set_update_window(struct panel_drv_data *ddata,
> > - u16 x, u16 y, u16 w, u16 h)
> > -{
> > - struct mipi_dsi_device *dsi = ddata->dsi;
> > - int r;
> > - u16 x1 = x;
> > - u16 x2 = x + w - 1;
> > - u16 y1 = y;
> > - u16 y2 = y + h - 1;
> > -
> > - r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
> > - if (r < 0)
> > - return r;
> > -
> > - r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
> > - if (r < 0)
> > - return r;
> > -
> > - return 0;
> > -}
> > -
> > >>>
> > >>> I can't tell whether this is common to all command-mode panels, or if
> > >>> there could be a need for panel-specific update procedures, so I can't
> > >>> really ack this patch.
> > >>
> > >> I can't say either, but all the command mode panels I know need and
> > >> support this. And, afaik, we
> > >> have only the single cmd mode panel driver which we add in this series.
> > >
> > > Now that I think about it again, isn't it a layering violation ?
> > > Shouldn't the DSI host handle DSI commands transfers, with the panel
> > > driver taking care of specific DSI commands ?
> >
> > Well, the DSI host (the HW) already handles specific DSI commands, as it
> > does the update with DCS
> > Write Start/Continue commands. The update is initiated from omap_crtc, via
> > dssdev->dsi_ops->update().
> >
> > We could perhaps add a new function to drm_panel_funcs, say,
> > prepare_update, which could then do the
> > above.
> >
> > Although I think the above code is not strictly speaking required, as the
> > panel should remember the
> > column and page address, and as such, they could be set just once at config
> > time.
> >
> > However, I remember debugging issues related to this. And with a quick
> > test, I can see that things
> > break down if I just do the above once in the panel's setup. But things
> > work if I send a DSI NOP
> > instead in the dsi host. So looks to me that either the OMAP DSI or the
> > panel I have need some
> > command transmitted there. It probably has to happen between two frame
> > transfers.
> >
> > There are also other things related to update which I'm not so happy about:
> > 1) the TE gpio irq is
> > handled in the dsi host driver now, even if it's a panel gpio, 2) the dsi
> > host driver snoops the DSI
> > packets sent by the panel, and catches TEAR_ON/OFF packets, and then change
> > internal state accordingly.
> >
> > So... I could change the dsi host driver to only send a NOP, and do the
> > page/column call from the
> > panel's setup. That simplifies the code.
> >
> > Or I could add the new function to drm_panel_funcs, and send a NOP from
> > there. But if this "needs a
> > NOP" is an OMAP DSI feature, the panel driver is not the right place for
> > it. I also think that
> > managing the TE cleanly needs more thought, and probably requires some more
> > interaction between the
> > dsi host and the panel. It might be better to look at both the update
> > callback and the TE at the
> > same time.
>
> I'm fine addressing both issues on top of this series. My concern is
> that an incorrect split of responsibilities between the panel driver and
> the DSI host driver will result in panel drivers being compatible only
> with specific DSI hosts. It's a difficult issue, but I think we need to
> extend the DSI API to handle this cleanly.
Just some background info, since I looked into this while moving
the driver to the common drm/dsi infrastructure (I used existing
DSI drivers as reference):
IIRC most DSI host drivers do not seem support command mode at all.
Some seemed to support it from within the host driver, though. I
remember Exynos getting the TE gpio in the host driver and using
the IRQ routine to self-refresh (which would effectively always
refresh wasting lots of power compared to only refreshing on page
flip).
Also there are some command mode panel drivers (can be found by
looking for drivers _not_ setting the MIPI_DSI_MODE_VIDEO flag):
* panel-novatek-nt35510.c
* panel-samsung-s6d16d0.c
* panel-samsung-s6e63j0x03.c
* panel-samsung-s6e3ha2.c
* panel-sharp-lq101r1sx01.c
* panel-sony-acx424akp.c
So
Re: [PATCH v3 30/56] drm/omap: dsi: move panel refresh function to host
Hi Tomi,
On Thu, Nov 12, 2020 at 10:08:21AM +0200, Tomi Valkeinen wrote:
> On 11/11/2020 17:58, Laurent Pinchart wrote:
>
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> index 030a8fa140db..1582960f9e90 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> @@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data
> *ddata, u8 *id1, u8 *id2, u8 *id3)
> return 0;
> }
>
> -static int dsicm_set_update_window(struct panel_drv_data *ddata,
> -u16 x, u16 y, u16 w, u16 h)
> -{
> -struct mipi_dsi_device *dsi = ddata->dsi;
> -int r;
> -u16 x1 = x;
> -u16 x2 = x + w - 1;
> -u16 y1 = y;
> -u16 y2 = y + h - 1;
> -
> -r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
> -if (r < 0)
> -return r;
> -
> -r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
> -if (r < 0)
> -return r;
> -
> -return 0;
> -}
> -
> >>>
> >>> I can't tell whether this is common to all command-mode panels, or if
> >>> there could be a need for panel-specific update procedures, so I can't
> >>> really ack this patch.
> >>
> >> I can't say either, but all the command mode panels I know need and
> >> support this. And, afaik, we
> >> have only the single cmd mode panel driver which we add in this series.
> >
> > Now that I think about it again, isn't it a layering violation ?
> > Shouldn't the DSI host handle DSI commands transfers, with the panel
> > driver taking care of specific DSI commands ?
>
> Well, the DSI host (the HW) already handles specific DSI commands, as it does
> the update with DCS
> Write Start/Continue commands. The update is initiated from omap_crtc, via
> dssdev->dsi_ops->update().
>
> We could perhaps add a new function to drm_panel_funcs, say, prepare_update,
> which could then do the
> above.
>
> Although I think the above code is not strictly speaking required, as the
> panel should remember the
> column and page address, and as such, they could be set just once at config
> time.
>
> However, I remember debugging issues related to this. And with a quick test,
> I can see that things
> break down if I just do the above once in the panel's setup. But things work
> if I send a DSI NOP
> instead in the dsi host. So looks to me that either the OMAP DSI or the panel
> I have need some
> command transmitted there. It probably has to happen between two frame
> transfers.
>
> There are also other things related to update which I'm not so happy about:
> 1) the TE gpio irq is
> handled in the dsi host driver now, even if it's a panel gpio, 2) the dsi
> host driver snoops the DSI
> packets sent by the panel, and catches TEAR_ON/OFF packets, and then change
> internal state accordingly.
>
> So... I could change the dsi host driver to only send a NOP, and do the
> page/column call from the
> panel's setup. That simplifies the code.
>
> Or I could add the new function to drm_panel_funcs, and send a NOP from
> there. But if this "needs a
> NOP" is an OMAP DSI feature, the panel driver is not the right place for it.
> I also think that
> managing the TE cleanly needs more thought, and probably requires some more
> interaction between the
> dsi host and the panel. It might be better to look at both the update
> callback and the TE at the
> same time.
I'm fine addressing both issues on top of this series. My concern is
that an incorrect split of responsibilities between the panel driver and
the DSI host driver will result in panel drivers being compatible only
with specific DSI hosts. It's a difficult issue, but I think we need to
extend the DSI API to handle this cleanly.
--
Regards,
Laurent Pinchart
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 30/56] drm/omap: dsi: move panel refresh function to host
On 11/11/2020 17:58, Laurent Pinchart wrote:
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 030a8fa140db..1582960f9e90 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data *ddata,
u8 *id1, u8 *id2, u8 *id3)
return 0;
}
-static int dsicm_set_update_window(struct panel_drv_data *ddata,
- u16 x, u16 y, u16 w, u16 h)
-{
- struct mipi_dsi_device *dsi = ddata->dsi;
- int r;
- u16 x1 = x;
- u16 x2 = x + w - 1;
- u16 y1 = y;
- u16 y2 = y + h - 1;
-
- r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
- if (r < 0)
- return r;
-
- r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
- if (r < 0)
- return r;
-
- return 0;
-}
-
>>>
>>> I can't tell whether this is common to all command-mode panels, or if
>>> there could be a need for panel-specific update procedures, so I can't
>>> really ack this patch.
>>
>> I can't say either, but all the command mode panels I know need and support
>> this. And, afaik, we
>> have only the single cmd mode panel driver which we add in this series.
>
> Now that I think about it again, isn't it a layering violation ?
> Shouldn't the DSI host handle DSI commands transfers, with the panel
> driver taking care of specific DSI commands ?
Well, the DSI host (the HW) already handles specific DSI commands, as it does
the update with DCS
Write Start/Continue commands. The update is initiated from omap_crtc, via
dssdev->dsi_ops->update().
We could perhaps add a new function to drm_panel_funcs, say, prepare_update,
which could then do the
above.
Although I think the above code is not strictly speaking required, as the panel
should remember the
column and page address, and as such, they could be set just once at config
time.
However, I remember debugging issues related to this. And with a quick test, I
can see that things
break down if I just do the above once in the panel's setup. But things work if
I send a DSI NOP
instead in the dsi host. So looks to me that either the OMAP DSI or the panel I
have need some
command transmitted there. It probably has to happen between two frame
transfers.
There are also other things related to update which I'm not so happy about: 1)
the TE gpio irq is
handled in the dsi host driver now, even if it's a panel gpio, 2) the dsi host
driver snoops the DSI
packets sent by the panel, and catches TEAR_ON/OFF packets, and then change
internal state accordingly.
So... I could change the dsi host driver to only send a NOP, and do the
page/column call from the
panel's setup. That simplifies the code.
Or I could add the new function to drm_panel_funcs, and send a NOP from there.
But if this "needs a
NOP" is an OMAP DSI feature, the panel driver is not the right place for it. I
also think that
managing the TE cleanly needs more thought, and probably requires some more
interaction between the
dsi host and the panel. It might be better to look at both the update callback
and the TE at the
same time.
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
Re: [PATCH v3 30/56] drm/omap: dsi: move panel refresh function to host
On 09/11/2020 12:10, Laurent Pinchart wrote:
> Hi Tomi and Sebastian,
>
> Thank you for the patch.
>
> On Thu, Nov 05, 2020 at 02:03:07PM +0200, Tomi Valkeinen wrote:
>> From: Sebastian Reichel
>>
>> This moves the panel refresh/update function from the panel
>> driver into the DSI host driver to prepare for common drm_panel
>> support.
>>
>> Signed-off-by: Sebastian Reichel
>> Signed-off-by: Tomi Valkeinen
>> ---
>> .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 68
>> drivers/gpu/drm/omapdrm/dss/dsi.c | 101 --
>> drivers/gpu/drm/omapdrm/dss/omapdss.h | 13 +--
>> drivers/gpu/drm/omapdrm/omap_crtc.c | 11 +-
>> 4 files changed, 97 insertions(+), 96 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
>> b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
>> index 030a8fa140db..1582960f9e90 100644
>> --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
>> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
>> @@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data *ddata,
>> u8 *id1, u8 *id2, u8 *id3)
>> return 0;
>> }
>>
>> -static int dsicm_set_update_window(struct panel_drv_data *ddata,
>> -u16 x, u16 y, u16 w, u16 h)
>> -{
>> -struct mipi_dsi_device *dsi = ddata->dsi;
>> -int r;
>> -u16 x1 = x;
>> -u16 x2 = x + w - 1;
>> -u16 y1 = y;
>> -u16 y2 = y + h - 1;
>> -
>> -r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
>> -if (r < 0)
>> -return r;
>> -
>> -r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
>> -if (r < 0)
>> -return r;
>> -
>> -return 0;
>> -}
>> -
>
> I can't tell whether this is common to all command-mode panels, or if
> there could be a need for panel-specific update procedures, so I can't
> really ack this patch.
I can't say either, but all the command mode panels I know need and support
this. And, afaik, we
have only the single cmd mode panel driver which we add in this series.
>> static int dsicm_bl_update_status(struct backlight_device *dev)
>> {
>> struct panel_drv_data *ddata = dev_get_drvdata(>dev);
>> @@ -470,48 +449,6 @@ static void dsicm_disable(struct omap_dss_device
>> *dssdev)
>> mutex_unlock(>lock);
>> }
>>
>> -static void dsicm_framedone_cb(int err, void *data)
>> -{
>> -struct panel_drv_data *ddata = data;
>> -
>> -dev_dbg(>dsi->dev, "framedone, err %d\n", err);
>> -mutex_unlock(>lock);
>> -}
>> -
>> -static int dsicm_update(struct omap_dss_device *dssdev,
>> -u16 x, u16 y, u16 w, u16 h)
>> -{
>> -struct panel_drv_data *ddata = to_panel_data(dssdev);
>> -struct omap_dss_device *src = ddata->src;
>> -int r;
>> -
>> -dev_dbg(>dsi->dev, "update %d, %d, %d x %d\n", x, y, w, h);
>> -
>> -mutex_lock(>lock);
>> -
>> -if (!ddata->enabled) {
>> -r = 0;
>> -goto err;
>> -}
>> -
>> -/* XXX no need to send this every frame, but dsi break if not done */
>> -r = dsicm_set_update_window(ddata, 0, 0, ddata->vm.hactive,
>> -ddata->vm.vactive);
>> -if (r)
>> -goto err;
>> -
>> -r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb,
>> -ddata);
>> -if (r)
>> -goto err;
>> -
>> -/* note: no unlock here. unlock is src framedone_cb */
>> -return 0;
>> -err:
>> -mutex_unlock(>lock);
>> -return r;
>> -}
>> -
>> static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable)
>> {
>> struct mipi_dsi_device *dsi = ddata->dsi;
>> @@ -572,10 +509,6 @@ static const struct omap_dss_device_ops dsicm_ops = {
>> .check_timings = dsicm_check_timings,
>> };
>>
>> -static const struct omap_dss_driver dsicm_dss_driver = {
>> -.update = dsicm_update,
>> -};
>> -
>> static int dsicm_probe_of(struct mipi_dsi_device *dsi)
>> {
>> struct device_node *node = dsi->dev.of_node;
>> @@ -658,7 +591,6 @@ static int dsicm_probe(struct mipi_dsi_device *dsi)
>> dssdev = >dssdev;
>> dssdev->dev = dev;
>> dssdev->ops = _ops;
>> -dssdev->driver = _dss_driver;
>> dssdev->type = OMAP_DISPLAY_TYPE_DSI;
>> dssdev->display = true;
>> dssdev->owner = THIS_MODULE;
>> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
>> b/drivers/gpu/drm/omapdrm/dss/dsi.c
>> index 0f264654792d..0aa0d21cf896 100644
>> --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
>> +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
>> @@ -214,6 +214,9 @@ static void dsi_display_uninit_dispc(struct dsi_data
>> *dsi);
>>
>> static int dsi_vc_send_null(struct dsi_data *dsi, int channel);
>>
>> +static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi,
>> + const struct mipi_dsi_msg *msg);
>> +
>> /* DSI PLL HSDIV indices */
>> #define HSDIV_DISPC 0
>> #define HSDIV_DSI 1
>> @@ -383,9 +386,6 @@ struct dsi_data {
>>
>> struct
Re: [PATCH v3 30/56] drm/omap: dsi: move panel refresh function to host
Hi Tomi,
On Wed, Nov 11, 2020 at 05:34:52PM +0200, Tomi Valkeinen wrote:
> On 09/11/2020 12:10, Laurent Pinchart wrote:
> > On Thu, Nov 05, 2020 at 02:03:07PM +0200, Tomi Valkeinen wrote:
> >> From: Sebastian Reichel
> >>
> >> This moves the panel refresh/update function from the panel
> >> driver into the DSI host driver to prepare for common drm_panel
> >> support.
> >>
> >> Signed-off-by: Sebastian Reichel
> >> Signed-off-by: Tomi Valkeinen
> >> ---
> >> .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 68
> >> drivers/gpu/drm/omapdrm/dss/dsi.c | 101 --
> >> drivers/gpu/drm/omapdrm/dss/omapdss.h | 13 +--
> >> drivers/gpu/drm/omapdrm/omap_crtc.c | 11 +-
> >> 4 files changed, 97 insertions(+), 96 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> >> b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> >> index 030a8fa140db..1582960f9e90 100644
> >> --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> >> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> >> @@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data *ddata,
> >> u8 *id1, u8 *id2, u8 *id3)
> >>return 0;
> >> }
> >>
> >> -static int dsicm_set_update_window(struct panel_drv_data *ddata,
> >> - u16 x, u16 y, u16 w, u16 h)
> >> -{
> >> - struct mipi_dsi_device *dsi = ddata->dsi;
> >> - int r;
> >> - u16 x1 = x;
> >> - u16 x2 = x + w - 1;
> >> - u16 y1 = y;
> >> - u16 y2 = y + h - 1;
> >> -
> >> - r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
> >> - if (r < 0)
> >> - return r;
> >> -
> >> - r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
> >> - if (r < 0)
> >> - return r;
> >> -
> >> - return 0;
> >> -}
> >> -
> >
> > I can't tell whether this is common to all command-mode panels, or if
> > there could be a need for panel-specific update procedures, so I can't
> > really ack this patch.
>
> I can't say either, but all the command mode panels I know need and support
> this. And, afaik, we
> have only the single cmd mode panel driver which we add in this series.
Now that I think about it again, isn't it a layering violation ?
Shouldn't the DSI host handle DSI commands transfers, with the panel
driver taking care of specific DSI commands ?
If keeping this code in the panel driver causes lots of rebase conflicts
I'm fine fixing this on top, but it looks like it belongs to the panel
driver.
> >> static int dsicm_bl_update_status(struct backlight_device *dev)
> >> {
> >>struct panel_drv_data *ddata = dev_get_drvdata(>dev);
> >> @@ -470,48 +449,6 @@ static void dsicm_disable(struct omap_dss_device
> >> *dssdev)
> >>mutex_unlock(>lock);
> >> }
> >>
> >> -static void dsicm_framedone_cb(int err, void *data)
> >> -{
> >> - struct panel_drv_data *ddata = data;
> >> -
> >> - dev_dbg(>dsi->dev, "framedone, err %d\n", err);
> >> - mutex_unlock(>lock);
> >> -}
> >> -
> >> -static int dsicm_update(struct omap_dss_device *dssdev,
> >> - u16 x, u16 y, u16 w, u16 h)
> >> -{
> >> - struct panel_drv_data *ddata = to_panel_data(dssdev);
> >> - struct omap_dss_device *src = ddata->src;
> >> - int r;
> >> -
> >> - dev_dbg(>dsi->dev, "update %d, %d, %d x %d\n", x, y, w, h);
> >> -
> >> - mutex_lock(>lock);
> >> -
> >> - if (!ddata->enabled) {
> >> - r = 0;
> >> - goto err;
> >> - }
> >> -
> >> - /* XXX no need to send this every frame, but dsi break if not done */
> >> - r = dsicm_set_update_window(ddata, 0, 0, ddata->vm.hactive,
> >> - ddata->vm.vactive);
> >> - if (r)
> >> - goto err;
> >> -
> >> - r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb,
> >> - ddata);
> >> - if (r)
> >> - goto err;
> >> -
> >> - /* note: no unlock here. unlock is src framedone_cb */
> >> - return 0;
> >> -err:
> >> - mutex_unlock(>lock);
> >> - return r;
> >> -}
> >> -
> >> static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable)
> >> {
> >>struct mipi_dsi_device *dsi = ddata->dsi;
> >> @@ -572,10 +509,6 @@ static const struct omap_dss_device_ops dsicm_ops = {
> >>.check_timings = dsicm_check_timings,
> >> };
> >>
> >> -static const struct omap_dss_driver dsicm_dss_driver = {
> >> - .update = dsicm_update,
> >> -};
> >> -
> >> static int dsicm_probe_of(struct mipi_dsi_device *dsi)
> >> {
> >>struct device_node *node = dsi->dev.of_node;
> >> @@ -658,7 +591,6 @@ static int dsicm_probe(struct mipi_dsi_device *dsi)
> >>dssdev = >dssdev;
> >>dssdev->dev = dev;
> >>dssdev->ops = _ops;
> >> - dssdev->driver = _dss_driver;
> >>dssdev->type = OMAP_DISPLAY_TYPE_DSI;
> >>dssdev->display = true;
> >>dssdev->owner = THIS_MODULE;
> >> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
> >> b/drivers/gpu/drm/omapdrm/dss/dsi.c
> >> index 0f264654792d..0aa0d21cf896 100644
> >> ---
Re: [PATCH v3 30/56] drm/omap: dsi: move panel refresh function to host
Hi Tomi and Sebastian,
Thank you for the patch.
On Thu, Nov 05, 2020 at 02:03:07PM +0200, Tomi Valkeinen wrote:
> From: Sebastian Reichel
>
> This moves the panel refresh/update function from the panel
> driver into the DSI host driver to prepare for common drm_panel
> support.
>
> Signed-off-by: Sebastian Reichel
> Signed-off-by: Tomi Valkeinen
> ---
> .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 68
> drivers/gpu/drm/omapdrm/dss/dsi.c | 101 --
> drivers/gpu/drm/omapdrm/dss/omapdss.h | 13 +--
> drivers/gpu/drm/omapdrm/omap_crtc.c | 11 +-
> 4 files changed, 97 insertions(+), 96 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> index 030a8fa140db..1582960f9e90 100644
> --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
> @@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data *ddata, u8
> *id1, u8 *id2, u8 *id3)
> return 0;
> }
>
> -static int dsicm_set_update_window(struct panel_drv_data *ddata,
> - u16 x, u16 y, u16 w, u16 h)
> -{
> - struct mipi_dsi_device *dsi = ddata->dsi;
> - int r;
> - u16 x1 = x;
> - u16 x2 = x + w - 1;
> - u16 y1 = y;
> - u16 y2 = y + h - 1;
> -
> - r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
> - if (r < 0)
> - return r;
> -
> - r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
> - if (r < 0)
> - return r;
> -
> - return 0;
> -}
> -
I can't tell whether this is common to all command-mode panels, or if
there could be a need for panel-specific update procedures, so I can't
really ack this patch.
> static int dsicm_bl_update_status(struct backlight_device *dev)
> {
> struct panel_drv_data *ddata = dev_get_drvdata(>dev);
> @@ -470,48 +449,6 @@ static void dsicm_disable(struct omap_dss_device *dssdev)
> mutex_unlock(>lock);
> }
>
> -static void dsicm_framedone_cb(int err, void *data)
> -{
> - struct panel_drv_data *ddata = data;
> -
> - dev_dbg(>dsi->dev, "framedone, err %d\n", err);
> - mutex_unlock(>lock);
> -}
> -
> -static int dsicm_update(struct omap_dss_device *dssdev,
> - u16 x, u16 y, u16 w, u16 h)
> -{
> - struct panel_drv_data *ddata = to_panel_data(dssdev);
> - struct omap_dss_device *src = ddata->src;
> - int r;
> -
> - dev_dbg(>dsi->dev, "update %d, %d, %d x %d\n", x, y, w, h);
> -
> - mutex_lock(>lock);
> -
> - if (!ddata->enabled) {
> - r = 0;
> - goto err;
> - }
> -
> - /* XXX no need to send this every frame, but dsi break if not done */
> - r = dsicm_set_update_window(ddata, 0, 0, ddata->vm.hactive,
> - ddata->vm.vactive);
> - if (r)
> - goto err;
> -
> - r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb,
> - ddata);
> - if (r)
> - goto err;
> -
> - /* note: no unlock here. unlock is src framedone_cb */
> - return 0;
> -err:
> - mutex_unlock(>lock);
> - return r;
> -}
> -
> static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable)
> {
> struct mipi_dsi_device *dsi = ddata->dsi;
> @@ -572,10 +509,6 @@ static const struct omap_dss_device_ops dsicm_ops = {
> .check_timings = dsicm_check_timings,
> };
>
> -static const struct omap_dss_driver dsicm_dss_driver = {
> - .update = dsicm_update,
> -};
> -
> static int dsicm_probe_of(struct mipi_dsi_device *dsi)
> {
> struct device_node *node = dsi->dev.of_node;
> @@ -658,7 +591,6 @@ static int dsicm_probe(struct mipi_dsi_device *dsi)
> dssdev = >dssdev;
> dssdev->dev = dev;
> dssdev->ops = _ops;
> - dssdev->driver = _dss_driver;
> dssdev->type = OMAP_DISPLAY_TYPE_DSI;
> dssdev->display = true;
> dssdev->owner = THIS_MODULE;
> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
> b/drivers/gpu/drm/omapdrm/dss/dsi.c
> index 0f264654792d..0aa0d21cf896 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
> @@ -214,6 +214,9 @@ static void dsi_display_uninit_dispc(struct dsi_data
> *dsi);
>
> static int dsi_vc_send_null(struct dsi_data *dsi, int channel);
>
> +static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi,
> +const struct mipi_dsi_msg *msg);
> +
> /* DSI PLL HSDIV indices */
> #define HSDIV_DISPC 0
> #define HSDIV_DSI1
> @@ -383,9 +386,6 @@ struct dsi_data {
>
> struct delayed_work ulps_work;
>
> - void (*framedone_callback)(int, void *);
> - void *framedone_data;
> -
> struct delayed_work framedone_timeout_work;
>
> #ifdef DSI_CATCH_MISSING_TE
> @@ -3802,8 +3802,6 @@ static void dsi_handle_framedone(struct dsi_data *dsi,
> int error)
>
[PATCH v3 30/56] drm/omap: dsi: move panel refresh function to host
From: Sebastian Reichel
This moves the panel refresh/update function from the panel
driver into the DSI host driver to prepare for common drm_panel
support.
Signed-off-by: Sebastian Reichel
Signed-off-by: Tomi Valkeinen
---
.../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 68
drivers/gpu/drm/omapdrm/dss/dsi.c | 101 --
drivers/gpu/drm/omapdrm/dss/omapdss.h | 13 +--
drivers/gpu/drm/omapdrm/omap_crtc.c | 11 +-
4 files changed, 97 insertions(+), 96 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
index 030a8fa140db..1582960f9e90 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
@@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data *ddata, u8
*id1, u8 *id2, u8 *id3)
return 0;
}
-static int dsicm_set_update_window(struct panel_drv_data *ddata,
- u16 x, u16 y, u16 w, u16 h)
-{
- struct mipi_dsi_device *dsi = ddata->dsi;
- int r;
- u16 x1 = x;
- u16 x2 = x + w - 1;
- u16 y1 = y;
- u16 y2 = y + h - 1;
-
- r = mipi_dsi_dcs_set_column_address(dsi, x1, x2);
- if (r < 0)
- return r;
-
- r = mipi_dsi_dcs_set_page_address(dsi, y1, y2);
- if (r < 0)
- return r;
-
- return 0;
-}
-
static int dsicm_bl_update_status(struct backlight_device *dev)
{
struct panel_drv_data *ddata = dev_get_drvdata(>dev);
@@ -470,48 +449,6 @@ static void dsicm_disable(struct omap_dss_device *dssdev)
mutex_unlock(>lock);
}
-static void dsicm_framedone_cb(int err, void *data)
-{
- struct panel_drv_data *ddata = data;
-
- dev_dbg(>dsi->dev, "framedone, err %d\n", err);
- mutex_unlock(>lock);
-}
-
-static int dsicm_update(struct omap_dss_device *dssdev,
- u16 x, u16 y, u16 w, u16 h)
-{
- struct panel_drv_data *ddata = to_panel_data(dssdev);
- struct omap_dss_device *src = ddata->src;
- int r;
-
- dev_dbg(>dsi->dev, "update %d, %d, %d x %d\n", x, y, w, h);
-
- mutex_lock(>lock);
-
- if (!ddata->enabled) {
- r = 0;
- goto err;
- }
-
- /* XXX no need to send this every frame, but dsi break if not done */
- r = dsicm_set_update_window(ddata, 0, 0, ddata->vm.hactive,
- ddata->vm.vactive);
- if (r)
- goto err;
-
- r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb,
- ddata);
- if (r)
- goto err;
-
- /* note: no unlock here. unlock is src framedone_cb */
- return 0;
-err:
- mutex_unlock(>lock);
- return r;
-}
-
static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable)
{
struct mipi_dsi_device *dsi = ddata->dsi;
@@ -572,10 +509,6 @@ static const struct omap_dss_device_ops dsicm_ops = {
.check_timings = dsicm_check_timings,
};
-static const struct omap_dss_driver dsicm_dss_driver = {
- .update = dsicm_update,
-};
-
static int dsicm_probe_of(struct mipi_dsi_device *dsi)
{
struct device_node *node = dsi->dev.of_node;
@@ -658,7 +591,6 @@ static int dsicm_probe(struct mipi_dsi_device *dsi)
dssdev = >dssdev;
dssdev->dev = dev;
dssdev->ops = _ops;
- dssdev->driver = _dss_driver;
dssdev->type = OMAP_DISPLAY_TYPE_DSI;
dssdev->display = true;
dssdev->owner = THIS_MODULE;
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 0f264654792d..0aa0d21cf896 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -214,6 +214,9 @@ static void dsi_display_uninit_dispc(struct dsi_data *dsi);
static int dsi_vc_send_null(struct dsi_data *dsi, int channel);
+static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi,
+ const struct mipi_dsi_msg *msg);
+
/* DSI PLL HSDIV indices */
#define HSDIV_DISPC0
#define HSDIV_DSI 1
@@ -383,9 +386,6 @@ struct dsi_data {
struct delayed_work ulps_work;
- void (*framedone_callback)(int, void *);
- void *framedone_data;
-
struct delayed_work framedone_timeout_work;
#ifdef DSI_CATCH_MISSING_TE
@@ -3802,8 +3802,6 @@ static void dsi_handle_framedone(struct dsi_data *dsi,
int error)
dsi_set_ulps_auto(dsi, true);
dsi_bus_unlock(dsi);
- dsi->framedone_callback(error, dsi->framedone_data);
-
if (!error)
dsi_perf_show(dsi, "DISPC");
}
@@ -3835,6 +3833,8 @@ static void dsi_framedone_irq_callback(void *data)
cancel_delayed_work(>framedone_timeout_work);
+ DSSDBG("Framedone received!\n");
+
dsi_handle_framedone(dsi, 0);
}
@@ -3856,17 +3856,69 @@ static int _dsi_update(struct
