Add support for drm sharpness property

[volkov0aa]

Describe the feature

https://patchwork.freedesktop.org/series/138754/

Intel has come up with Display Engine based adaptive sharpening filter
with minimal power and performance impact. From LNL onwards, the Display
hardware can use one of the pipe scaler for adaptive sharpness filter.
This can be used for both gaming and non-gaming use cases like photos,
image viewing. It works on a region of pixels depending on the tap size.

Sharpness is set by setting SHARPNESS_STRENGTH property for crtc.
See, for example, implementation in kwin: https://invent.kde.org/plasma/kwin/-/merge_requests/7689

It should be implemented because

This is a cool feature which is quite simple to implement.

What are the alternatives?

No response

Additional context

No response

Extra fields

• I have checked the existing issues
• I have read the Contributing Guidelines
• I'd like to work on this issue

[metux]

Does that require extending randr protocol ?

[volkov0aa]

No, RRChangeOutputProperty can be used (https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/blob/master/randrproto.txt#L864)

[stefan11111]

I also see this in that kde patch:

    , degammaLut(this, QByteArrayLiteral("DEGAMMA_LUT"))
    , degammaLutSize(this, QByteArrayLiteral("DEGAMMA_LUT_SIZE"))

Is that another name for GAMMA_LUT{,_SIZE}, or is that something else?

[stefan11111]

@volkov0aa Before I try plugging this into RandR, can you confirm this works:

diff --git a/hw/xfree86/drivers/video/modesetting/driver.c b/hw/xfree86/drivers/video/modesetting/driver.c
index 701d28047..f80a0324b 100644
--- a/hw/xfree86/drivers/video/modesetting/driver.c
+++ b/hw/xfree86/drivers/video/modesetting/driver.c
@@ -154,6 +154,7 @@ static const OptionInfoRec Options[] = {
     {OPTION_USE_GAMMA_LUT, "UseGammaLUT", OPTV_BOOLEAN, {0}, FALSE},
     {OPTION_ASYNC_FLIP_SECONDARIES, "AsyncFlipSecondaries", OPTV_BOOLEAN, {0}, FALSE},
     {OPTION_TEARFREE, "TearFree", OPTV_BOOLEAN, {0}, FALSE},
+    {OPTION_SHARPNESS_STRENGTH, "SHARPNESS_STRENGTH", OPTV_INTEGER, {0}, FALSE},
     {-1, NULL, OPTV_NONE, {0}, FALSE}
 };
 
diff --git a/hw/xfree86/drivers/video/modesetting/driver.h b/hw/xfree86/drivers/video/modesetting/driver.h
index 81b97a4a0..5e001910a 100644
--- a/hw/xfree86/drivers/video/modesetting/driver.h
+++ b/hw/xfree86/drivers/video/modesetting/driver.h
@@ -71,6 +71,7 @@ typedef enum {
     OPTION_USE_GAMMA_LUT,
     OPTION_ASYNC_FLIP_SECONDARIES,
     OPTION_TEARFREE,
+    OPTION_SHARPNESS_STRENGTH,
 } modesettingOpts;
 
 typedef struct
diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.c b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
index 357946e41..e1204b3fc 100644
--- a/hw/xfree86/drivers/video/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
@@ -2924,6 +2924,28 @@ drmmode_cursor_get_fallback(drmmode_crtc_private_ptr drmmode_crtc)
     return fallback;
 }
 
+static void
+drmmode_crtc_set_sharpness_strength(drmmode_ptr drmmode, drmmode_crtc_private_ptr drmmode_crtc)
+{
+    uint32_t prop_id = drmmode_crtc->props[DRMMODE_CRTC_SHARPNESS_STRENGTH].prop_id;
+    if (!prop_id) {
+        return;
+    }
+
+    const uint32_t crtc_id = drmmode_crtc->mode_crtc->crtc_id;
+    uint32_t blob_id;
+    uint8_t value =  xf86ReturnOptValBool(drmmode->Options, OPTION_SHARPNESS_STRENGTH,
+                                          drmmode_crtc->props[DRMMODE_CRTC_GAMMA_LUT_SIZE].value);
+
+    if (drmModeCreatePropertyBlob(drmmode->fd, &value, sizeof(value), &blob_id)) {
+        return;
+    }
+
+    drmModeObjectSetProperty(drmmode->fd, crtc_id, DRM_MODE_OBJECT_CRTC, prop_id, blob_id);
+
+    drmModeDestroyPropertyBlob(drmmode->fd, blob_id);
+}
+
 static unsigned int
 drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res, int num)
 {
@@ -2937,6 +2959,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res
         [DRMMODE_CRTC_GAMMA_LUT] = { .name = "GAMMA_LUT" },
         [DRMMODE_CRTC_GAMMA_LUT_SIZE] = { .name = "GAMMA_LUT_SIZE" },
         [DRMMODE_CRTC_CTM] = { .name = "CTM" },
+        [DRMMODE_CRTC_SHARPNESS_STRENGTH] = { .name = "SHARPNESS_STRENGTH" },
     };
 
     crtc = xf86CrtcCreate(pScrn, &drmmode_crtc_funcs);
@@ -2984,6 +3007,8 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res
 
     drmmode_crtc_vrr_init(drmmode->fd, crtc);
 
+    drmmode_crtc_set_sharpness_strength(drmmode, drmmode_crtc);
+
     /* Mark num'th crtc as in use on this device. */
     ms_ent->assigned_crtcs |= (1 << num);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, MS_LOGLEVEL_DEBUG,
@@ -3087,7 +3112,6 @@ drmmode_output_update_properties(xf86OutputPtr output)
                        "RRChangeOutputProperty error, %d\n", err);
         }
     }
-
 }
 
 static xf86OutputStatus
diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.h b/hw/xfree86/drivers/video/modesetting/drmmode_display.h
index 468f35877..604082041 100644
--- a/hw/xfree86/drivers/video/modesetting/drmmode_display.h
+++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.h
@@ -74,6 +74,7 @@ enum drmmode_crtc_property {
     DRMMODE_CRTC_GAMMA_LUT,
     DRMMODE_CRTC_GAMMA_LUT_SIZE,
     DRMMODE_CRTC_CTM,
+    DRMMODE_CRTC_SHARPNESS_STRENGTH,
     DRMMODE_CRTC__COUNT
 };

The kernel patch still hasn't been merged, so it looks like it will take some time before it gets into a release.
I won't be able to test this until the kernel patch gets into a release.

[volkov0aa]

Great!
Thanks for working on it!
Actually, I created this issue for the future so that I don't forget about it, but I'll check the patch functionality when possible.
Currently using DRMMODE_CRTC_GAMMA_LUT_SIZE here looks incorrect:

+    uint8_t value =  xf86ReturnOptValBool(drmmode->Options, OPTION_SHARPNESS_STRENGTH,
+                                          drmmode_crtc->props[DRMMODE_CRTC_GAMMA_LUT_SIZE].value);

As for DEGAMMA_LUT, it's not used in kwin anymore: https://invent.kde.org/plasma/kwin/-/merge_requests/7867
I guess that degamma is the inverse gamma.

[stefan11111]

Currently using DRMMODE_CRTC_GAMMA_LUT_SIZE here looks incorrect:

+    uint8_t value =  xf86ReturnOptValBool(drmmode->Options, OPTION_SHARPNESS_STRENGTH,
+                                          drmmode_crtc->props[DRMMODE_CRTC_GAMMA_LUT_SIZE].value);

Yes, it should be DRMMODE_CRTC_SHARPNESS_STRENGTH instead.