CINXE.COM
LKML: Jernej =?utf-8?B?xaBrcmFiZWM=?=: Re: [PATCH 2/3] drm/sun4i: Add more parameters to sunxi_engine commit callback
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Jernej =?utf-8?B?xaBrcmFiZWM=?=: Re: [PATCH 2/3] drm/sun4i: Add more parameters to sunxi_engine commit callback</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Jernej =?utf-8?B?xaBrcmFiZWM=?=" href="/groupie.php?aid=" /><!--Matomo--><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script><!--End Matomo Code--></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2024"> [2024]</a> 聽 <a class="nb" href="/lkml/2024/2"> [Feb]</a> 聽 <a class="nb" href="/lkml/2024/2/22"> [22]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2024/2/22/1376" onclick="this.href='/lkml/headers'+'/2024/2/22/1376';">[headers]</a>聽 <a href="/lkml/bounce/2024/2/22/1376">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2024/2/16/1166">First message in thread</a></li><li><a href="/lkml/2024/2/16/1166">=?UTF-8?q?Ond=C5=99ej=20Jirman?=</a><ul><li><a href="/lkml/2024/2/16/1165">=?UTF-8?q?Ond=C5=99ej=20Jirman?=</a><ul><li class="origin"><a href="">Jernej =?utf-8?B?xaBrcmFiZWM=?=</a></li></ul></li><li><a href="/lkml/2024/2/16/1167">=?UTF-8?q?Ond=C5=99ej=20Jirman?=</a><ul><li><a href="/lkml/2024/2/22/1396">Jernej =?utf-8?B?xaBrcmFiZWM=?=</a></li></ul></li><li><a href="/lkml/2024/2/16/1168">=?UTF-8?q?Ond=C5=99ej=20Jirman?=</a><ul><li><a href="/lkml/2024/2/21/822">Maxime Ripard</a><ul><li><a href="/lkml/2024/2/21/886">=?utf-8?Q?Ond=C5=99ej?= Jirman</a></li><li><a href="/lkml/2024/2/22/1401">Jernej =?utf-8?B?xaBrcmFiZWM=?=</a><ul><li><a href="/lkml/2024/2/24/66">=?utf-8?Q?Ond=C5=99ej?= Jirman</a></li></ul></li></ul></li></ul></li></ul></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">From</td><td class="rp" itemprop="author">Jernej 艩krabec <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">Re: [PATCH 2/3] drm/sun4i: Add more parameters to sunxi_engine commit callback</td></tr><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Thu, 22 Feb 2024 20:18:13 +0100</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Dne petek, 16. februar 2024 ob 20:04:25 CET je Ond艡ej Jirman napisal(a):<br />> From: Ondrej Jirman <megi@xff.cz><br />> <br />> These will be needed later on when we move layer configuration to<br />> crtc update.<br />> <br />> Signed-off-by: Ondrej Jirman <megi@xff.cz><br /><br />Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com><br /><br />Best regards,<br />Jernej<br /><br />> ---<br />> drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +++-<br />> drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +-<br />> drivers/gpu/drm/sun4i/sun8i_mixer.c | 5 ++++-<br />> drivers/gpu/drm/sun4i/sunxi_engine.h | 13 ++++++++++---<br />> 4 files changed, 18 insertions(+), 6 deletions(-)<br />> <br />> diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c<br />> index 335fd0edb904..e89eb96d3131 100644<br />> --- a/drivers/gpu/drm/sun4i/sun4i_backend.c<br />> +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c<br />> @@ -69,7 +69,9 @@ static void sun4i_backend_disable_color_correction(struct sunxi_engine *engine)<br />> SUN4I_BACKEND_OCCTL_ENABLE, 0);<br />> }<br />> <br />> -static void sun4i_backend_commit(struct sunxi_engine *engine)<br />> +static void sun4i_backend_commit(struct sunxi_engine *engine,<br />> + struct drm_crtc *crtc,<br />> + struct drm_atomic_state *state)<br />> {<br />> DRM_DEBUG_DRIVER("Committing changes\n");<br />> <br />> diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c<br />> index c06d7cd45388..18e74047b0f5 100644<br />> --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c<br />> +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c<br />> @@ -91,7 +91,7 @@ static void sun4i_crtc_atomic_flush(struct drm_crtc *crtc,<br />> <br />> DRM_DEBUG_DRIVER("Committing plane changes\n");<br />> <br />> - sunxi_engine_commit(scrtc->engine);<br />> + sunxi_engine_commit(scrtc->engine, crtc, state);<br />> <br />> if (event) {<br />> crtc->state->event = NULL;<br />> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c<br />> index 1e681314e379..bdeb9b80e038 100644<br />> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c<br />> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c<br />> @@ -16,6 +16,7 @@<br />> #include <linux/platform_device.h><br />> #include <linux/reset.h><br />> <br />> +#include <drm/drm_atomic.h><br />> #include <drm/drm_atomic_helper.h><br />> #include <drm/drm_crtc.h><br />> #include <drm/drm_framebuffer.h><br />> @@ -249,7 +250,9 @@ int sun8i_mixer_drm_format_to_hw(u32 format, u32 *hw_format)<br />> return -EINVAL;<br />> }<br />> <br />> -static void sun8i_mixer_commit(struct sunxi_engine *engine)<br />> +static void sun8i_mixer_commit(struct sunxi_engine *engine,<br />> + struct drm_crtc *crtc,<br />> + struct drm_atomic_state *state)<br />> {<br />> DRM_DEBUG_DRIVER("Committing changes\n");<br />> <br />> diff --git a/drivers/gpu/drm/sun4i/sunxi_engine.h b/drivers/gpu/drm/sun4i/sunxi_engine.h<br />> index ec8cf9b2bda4..ec0c4932f15c 100644<br />> --- a/drivers/gpu/drm/sun4i/sunxi_engine.h<br />> +++ b/drivers/gpu/drm/sun4i/sunxi_engine.h<br />> @@ -7,6 +7,7 @@<br />> #define _SUNXI_ENGINE_H_<br />> <br />> struct drm_plane;<br />> +struct drm_crtc;<br />> struct drm_device;<br />> struct drm_crtc_state;<br />> struct drm_display_mode;<br />> @@ -59,7 +60,9 @@ struct sunxi_engine_ops {<br />> *<br />> * This function is optional.<br />> */<br />> - void (*commit)(struct sunxi_engine *engine);<br />> + void (*commit)(struct sunxi_engine *engine,<br />> + struct drm_crtc *crtc,<br />> + struct drm_atomic_state *state);<br />> <br />> /**<br />> * @layers_init:<br />> @@ -144,12 +147,16 @@ struct sunxi_engine {<br />> /**<br />> * sunxi_engine_commit() - commit all changes of the engine<br />> * @engine: pointer to the engine<br />> + * @crtc: pointer to crtc the engine is associated with<br />> + * @state: atomic state<br />> */<br />> static inline void<br />> -sunxi_engine_commit(struct sunxi_engine *engine)<br />> +sunxi_engine_commit(struct sunxi_engine *engine,<br />> + struct drm_crtc *crtc,<br />> + struct drm_atomic_state *state)<br />> {<br />> if (engine->ops && engine->ops->commit)<br />> - engine->ops->commit(engine);<br />> + engine->ops->commit(engine, crtc, state);<br />> }<br />> <br />> /**<br />> <br /><br /><br /><br /><br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2024-05-27 15:17 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>