[lkml]   [2018]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
SubjectRe: [PATCH v2] drm/msm/display: negative x/y in cursor move
<div dir="ltr"><div><span style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Hi,</span></div><div><span style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline"><br></span></div>

<span style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">&gt; Thanks for the patch. Could you tell how to reproduce this issue</span><br style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">&gt; on a db410c?</span><br style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial">&gt;<br style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">&gt; I was playing with xrandr&#39;s --rotate and --reflect options to get</span><br style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">&gt; a rotated output, but wasn&#39;t able to generate negative x/y</span><br style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:12.8px;text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">&gt; co-ordinates. I&#39;m using linaro&#39;s debian userspace, running lxqt.</span>

<br><div><br></div><div>I used Yocto Rocko from 96Boards</div><div><br></div><div><a href=""></a><br></div><div><br></div><div>MACHINE=dragonboard-410c</div><div>DISTRO=rpb</div><div><br></div><div>rpb-desktop-image</div><div><br></div><div>Connect HDMI monitor and USB mouse, then</div><div><br></div><div>1.) Just boot. Wait for X-Server up.</div><div>2.) From my serial console:</div><div>     DISPLAY=:0.0 xrandr -o 2</div><div>3.) Try to move the mouse to the upper (the rotated lower) border.</div><div><br></div><div>Interesting to know that your debian user space is ok. The yocto X11 configuration is very basic.</div><div>There may be a X11 configuration or extension that does the trick on Debian.</div><div><br></div><div>Therefore, I asked the X11 people where to fix:</div><div><br></div><div><a href=""></a></div><div><br></div><div>Best regards</div><div>-Carsten</div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">2018-07-24 19:33 GMT+02:00 Archit Taneja <span dir="ltr">&lt;<a href="" target="_blank"></a>&gt;</span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<span class=""><br>
On Tuesday 17 July 2018 04:33 AM, Carsten Behling wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
modesetting X11 driver may provide negative x/y cordinates in<br>
mdp5_crtc_cursor_move call when rotation is enabled.<br>
Cursor buffer can overlap down to its negative width/height.<br>
ROI has to be recalculated for negative x/y indicating using the<br>
lower/right corner of the cursor buffer and hotspot must be set<br>
Thanks for the patch. Could you tell how to reproduce this issue<br>
on a db410c?<br>
I was playing with xrandr&#39;s --rotate and --reflect options to get<br>
a rotated output, but wasn&#39;t able to generate negative x/y<br>
co-ordinates. I&#39;m using linaro&#39;s debian userspace, running lxqt.<br>
Archit<div class="HOEnZb"><div class="h5"><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Carsten Behling &lt;<a href="" target="_blank"></a>&gt;<br>
Changes in v2:<br>
- fixed format specifier in debug message<br>
  drivers/gpu/drm/msm/disp/mdp5/<wbr>mdp5_crtc.c | 51 ++++++++++++++++++++++++++----<wbr>-<br>
  1 file changed, 43 insertions(+), 8 deletions(-)<br>
diff --git a/drivers/gpu/drm/msm/disp/mdp<wbr>5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp<wbr>5/mdp5_crtc.c<br>
index 10271359789e..a7f4a6688fec 100644<br>
--- a/drivers/gpu/drm/msm/disp/mdp<wbr>5/mdp5_crtc.c<br>
+++ b/drivers/gpu/drm/msm/disp/mdp<wbr>5/mdp5_crtc.c<br>
@@ -65,7 +65,7 @@ struct mdp5_crtc {<br>
                struct drm_gem_object *scanout_bo;<br>
                uint64_t iova;<br>
                uint32_t width, height;<br>
-               uint32_t x, y;<br>
+               int x, y;<br>
        } cursor;<br>
  #define to_mdp5_crtc(x) container_of(x, struct mdp5_crtc, base)<br>
@@ -760,20 +760,31 @@ static void get_roi(struct drm_crtc *crtc, uint32_t *roi_w, uint32_t *roi_h)<br>
         * Cursor Region Of Interest (ROI) is a plane read from cursor<br>
         * buffer to render. The ROI region is determined by the visibility of<br>
         * the cursor point. In the default Cursor image the cursor point will<br>
-        * be at the top left of the cursor image, unless it is specified<br>
-        * otherwise using hotspot feature.<br>
+        * be at the top left of the cursor image.<br>
+        * Without rotation:<br>
         * If the cursor point reaches the right (xres - x &lt; cursor.width) or<br>
         * bottom (yres - y &lt; cursor.height) boundary of the screen, then ROI<br>
         * width and ROI height need to be evaluated to crop the cursor image<br>
         * accordingly.<br>
         * (xres-x) will be new cursor width when x &gt; (xres - cursor.width)<br>
         * (yres-y) will be new cursor height when y &gt; (yres - cursor.height)<br>
+        *<br>
+        * With rotation:<br>
+        * We get negative x and/or y coordinates.<br>
+        * (cursor.width - abs(x)) will be new cursor width when x &lt; 0<br>
+        * (cursor.height - abs(y)) will be new cursor width when y &lt; 0<br>
-       *roi_w = min(mdp5_crtc-&gt;cursor.width, xres -<br>
+       if (mdp5_crtc-&gt;cursor.x &gt;= 0)<br>
+               *roi_w = min(mdp5_crtc-&gt;cursor.width, xres -<br>
-       *roi_h = min(mdp5_crtc-&gt;cursor.height, yres -<br>
+       else<br>
+               *roi_w = mdp5_crtc-&gt;cursor.width - abs(mdp5_crtc-&gt;cursor.x);<br>
+       if (mdp5_crtc-&gt;cursor.y &gt;= 0)<br>
+               *roi_h = min(mdp5_crtc-&gt;cursor.height, yres -<br>
+       else<br>
+               *roi_h = mdp5_crtc-&gt;cursor.height - abs(mdp5_crtc-&gt;cursor.y);<br>
    static void mdp5_crtc_restore_cursor(struc<wbr>t drm_crtc *crtc)<br>
@@ -783,7 +794,7 @@ static void mdp5_crtc_restore_cursor(struc<wbr>t drm_crtc *crtc)<br>
        struct mdp5_kms *mdp5_kms = get_kms(crtc);<br>
        const enum mdp5_cursor_alpha cur_alpha = CURSOR_ALPHA_PER_PIXEL;<br>
        uint32_t blendcfg, stride;<br>
-       uint32_t x, y, width, height;<br>
+       uint32_t x, y, src_x, src_y, width, height;<br>
        uint32_t roi_w, roi_h;<br>
        int lm;<br>
  @@ -800,6 +811,26 @@ static void mdp5_crtc_restore_cursor(struc<wbr>t drm_crtc *crtc)<br>
        get_roi(crtc, &amp;roi_w, &amp;roi_h);<br>
  +     /* If cusror buffer overlaps due to rotation on the<br>
+        * upper or left screen border the pixel offset inside<br>
+        * the cursor buffer of the ROI is the positive overlap<br>
+        * distance.<br>
+        */<br>
+       if (mdp5_crtc-&gt;cursor.x &lt; 0) {<br>
+               src_x = abs(mdp5_crtc-&gt;cursor.x);<br>
+               x = 0;<br>
+       } else {<br>
+               src_x = 0;<br>
+       }<br>
+       if (mdp5_crtc-&gt;cursor.y &lt; 0) {<br>
+               src_y = abs(mdp5_crtc-&gt;cursor.y);<br>
+               y = 0;<br>
+       } else {<br>
+               src_y = 0;<br>
+       }<br>
+       DBG(&quot;%s: x=%u, y=%u roi_w=%u roi_h=%u src_x=%u src_y=%u&quot;,<br>
+               crtc-&gt;name, x, y, roi_w, roi_h, src_x, src_y);<br>
        mdp5_write(mdp5_kms, REG_MDP5_LM_CURSOR_STRIDE(lm), stride);<br>
        mdp5_write(mdp5_kms, REG_MDP5_LM_CURSOR_FORMAT(lm),<br>
@@ -812,6 +843,9 @@ static void mdp5_crtc_restore_cursor(struc<wbr>t drm_crtc *crtc)<br>
        mdp5_write(mdp5_kms, REG_MDP5_LM_CURSOR_START_XY(lm<wbr>),<br>
                        MDP5_LM_CURSOR_START_XY_Y_STAR<wbr>T(y) |<br>
+       mdp5_write(mdp5_kms, REG_MDP5_LM_CURSOR_XY(lm),<br>
+                       MDP5_LM_CURSOR_XY_SRC_Y(src_<wbr>y) |<br>
+                       MDP5_LM_CURSOR_XY_SRC_X(src_<wbr>x));<br>
        mdp5_write(mdp5_kms, REG_MDP5_LM_CURSOR_BASE_ADDR(l<wbr>m),<br>
  @@ -932,8 +966,9 @@ static int mdp5_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)<br>
        if (unlikely(!crtc-&gt;state-&gt;enable<wbr>))<br>
                return 0;<br>
  -     mdp5_crtc-&gt;cursor.x = x = max(x, 0);<br>
-       mdp5_crtc-&gt;cursor.y = y = max(y, 0);<br>
+       /* accept negative x/y coordinates up to maximum cursor overlap */<br>
+       mdp5_crtc-&gt;cursor.x = x = max(x, -(int)mdp5_crtc-&gt;cursor.width)<wbr>;<br>
+       mdp5_crtc-&gt;cursor.y = y = max(y, -(int)mdp5_crtc-&gt;cursor.height<wbr>);<br>
        get_roi(crtc, &amp;roi_w, &amp;roi_h);<br>
 \ /
  Last update: 2018-07-25 17:11    [W:0.103 / U:0.632 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site