Received: by 2002:a4a:311b:0:0:0:0:0 with SMTP id k27-v6csp4183464ooa; Tue, 14 Aug 2018 02:17:14 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxAruu03v15kKf08mD4TKdJw+XklYdBhBLDsrhj9AO+crgG8K8bYzOdi/n0Jk/PJRKPG7Fj X-Received: by 2002:a62:569c:: with SMTP id h28-v6mr22581886pfj.201.1534238234587; Tue, 14 Aug 2018 02:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534238234; cv=none; d=google.com; s=arc-20160816; b=Grt9qvqKxfqr/5r6d1WDnX8r3mdVC0cKWktlwZkiKmeUjqmZUqRMALKBA4S0ph6ybJ ukMMddspyqhkE0cvo9rEmzzMZZQJnD9tTGFtSnGBxGjcyNRDx28y5WmGK2FAo26yYtuN VLta+hrJQBrvBkFTT2x26q5athISd3gP/pSKRpGkNLFWO+HVBRKy+0uGduRF0gvBev1n 1wRY13upENaoCO8tVyZUzWyvRaADfunfDZiqRRSAcSpbNWEDKYJdBfW03CXymyThSpe9 DVuWURoA4675RVsngmbWGrKipVxGqu5QEMVELFfYKfao5AoXdyPlgQ7XCArPumIHYfnQ ysdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:arc-authentication-results; bh=AZlYwwx9RClhEUcsjekd08lstZ6i26RsYNf29rQ+cdU=; b=T1TAfST5/kGrJkBt4bRjA9PYhayh3NhTTv+4eeV6K9LWlBryD+Mq4vtxNvrV8WWC8x PFjdeUPoITd6IsNnCJFUAPuy6jTBVLECwBbKOfBDYP7D9HGXK7l0IM9/SrckVz/WbEaz od9T3XFUCFAnTaFZImGfB/05d09UFl3P1SQYUWqKURBNaSxyjMggcPpFDj5h1dlH11jt c+F8foj/tVrNL0Eq4eLjrX/BTjwzEY/tQUh7Isqce8uimEEVJTYr+2wMiFm7rpFFybB5 G3jNum9e4QoplvghhF48oeuHOUkyeoHpJ05Da54KueLrHqRlhuQN86smADDsMVAQDCBN +w4Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i184-v6si20294647pge.405.2018.08.14.02.16.59; Tue, 14 Aug 2018 02:17:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731314AbeHNMCG (ORCPT + 99 others); Tue, 14 Aug 2018 08:02:06 -0400 Received: from mga09.intel.com ([134.134.136.24]:14770 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728101AbeHNMCF (ORCPT ); Tue, 14 Aug 2018 08:02:05 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Aug 2018 02:15:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,237,1531810800"; d="scan'208";a="66021292" Received: from sneaga-mobl.ger.corp.intel.com (HELO [10.252.51.111]) ([10.252.51.111]) by orsmga006.jf.intel.com with ESMTP; 14 Aug 2018 02:15:44 -0700 Subject: Re: [PATCH v3 1/2] drm: Add per-plane pixel blend mode property To: Lowry Li Cc: Emil Velikov , Liviu Dudau , Gustavo Padovan , "Vetter, Daniel" , Sean Paul , David Airlie , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= , ML dri-devel , "Linux-Kernel@Vger. Kernel. Org" , Brian Starkey , Mali DP Maintainers , nd@arm.com References: <1527856871-3007-1-git-send-email-lowry.li@arm.com> <1527856871-3007-2-git-send-email-lowry.li@arm.com> <20180605090729.GA2686@lowry.li@arm.com> <325674b0-d100-4e38-3963-0e458e6dec80@linux.intel.com> <20180814031102.GA8541@lowry.li@arm.com> From: Maarten Lankhorst Message-ID: Date: Tue, 14 Aug 2018 11:15:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180814031102.GA8541@lowry.li@arm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Op 14-08-18 om 05:11 schreef Lowry Li: > On Mon, Aug 13, 2018 at 12:49:13PM +0200, Maarten Lankhorst wrote: >> Op 05-06-18 om 11:07 schreef Lowry Li: >>> On Mon, Jun 04, 2018 at 02:49:26PM +0100, Emil Velikov wrote: >>>> On 1 June 2018 at 13:41, Lowry Li wrote: >>>>> Pixel blend modes represent the alpha blending equation >>>>> selection, describing how the pixels from the current >>>>> plane are composited with the background. >>>>> >>>>> Add a pixel_blend_mode to drm_plane_state and a >>>>> blend_mode_property to drm_plane, and related support >>>>> functions. >>>>> >>>>> Defines three blend modes in drm_blend.h. >>>>> >>>>> Signed-off-by: Lowry Li >>>>> --- >>>>> drivers/gpu/drm/drm_atomic.c | 4 ++ >>>>> drivers/gpu/drm/drm_atomic_helper.c | 1 + >>>>> drivers/gpu/drm/drm_blend.c | 126 ++++++++++++++++++++++++++++++++++++ >>>>> include/drm/drm_blend.h | 6 ++ >>>>> include/drm/drm_plane.h | 5 ++ >>>>> 5 files changed, 142 insertions(+) >>>>> >>>>> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c >>>>> index 07fef42..1d18389 100644 >>>>> --- a/drivers/gpu/drm/drm_atomic.c >>>>> +++ b/drivers/gpu/drm/drm_atomic.c >>>>> @@ -785,6 +785,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, >>>>> state->src_h = val; >>>>> } else if (property == plane->alpha_property) { >>>>> state->alpha = val; >>>>> + } else if (property == plane->blend_mode_property) { >>>>> + state->pixel_blend_mode = val; >>>>> } else if (property == plane->rotation_property) { >>>>> if (!is_power_of_2(val & DRM_MODE_ROTATE_MASK)) >>>>> return -EINVAL; >>>>> @@ -852,6 +854,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, >>>>> *val = state->src_h; >>>>> } else if (property == plane->alpha_property) { >>>>> *val = state->alpha; >>>>> + } else if (property == plane->blend_mode_property) { >>>>> + *val = state->pixel_blend_mode; >>>>> } else if (property == plane->rotation_property) { >>>>> *val = state->rotation; >>>>> } else if (property == plane->zpos_property) { >>>>> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c >>>>> index 130da51..7f5d463 100644 >>>>> --- a/drivers/gpu/drm/drm_atomic_helper.c >>>>> +++ b/drivers/gpu/drm/drm_atomic_helper.c >>>>> @@ -3515,6 +3515,7 @@ void drm_atomic_helper_plane_reset(struct drm_plane *plane) >>>>> /* Reset the alpha value to fully opaque if it matters */ >>>>> if (plane->alpha_property) >>>>> plane->state->alpha = plane->alpha_property->values[1]; >>>>> + plane->state->pixel_blend_mode = DRM_MODE_BLEND_PREMULTI; >>>>> } >>>>> } >>>>> EXPORT_SYMBOL(drm_atomic_helper_plane_reset); >>>>> diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c >>>>> index a16a74d..ac6f19c 100644 >>>>> --- a/drivers/gpu/drm/drm_blend.c >>>>> +++ b/drivers/gpu/drm/drm_blend.c >>>>> @@ -107,6 +107,52 @@ >>>>> * planes. Without this property the primary plane is always below the cursor >>>>> * plane, and ordering between all other planes is undefined. >>>>> * >>>>> + * pixel blend mode: >>>>> + * Pixel blend mode is set up with drm_plane_create_blend_mode_property(). >>>>> + * It adds a blend mode for alpha blending equation selection, describing >>>>> + * how the pixels from the current plane are composited with the >>>>> + * background. >>>>> + * >>>>> + * Three alpha blending equations are defined: >>>>> + * >>>>> + * "None": >>>>> + * Blend formula that ignores the pixel alpha:: >>>>> + * >>>>> + * out.rgb = plane_alpha * fg.rgb + >>>>> + * (1 - plane_alpha) * bg.rgb >>>>> + * >>>>> + * "Pre-multiplied": >>>>> + * Blend formula that assumes the pixel color values >>>>> + * have been already pre-multiplied with the alpha >>>>> + * channel values:: >>>>> + * >>>>> + * out.rgb = plane_alpha * fg.rgb + >>>>> + * (1 - (plane_alpha * fg.alpha)) * bg.rgb >>>>> + * >>>>> + * "Coverage": >>>>> + * Blend formula that assumes the pixel color values have not >>>>> + * been pre-multiplied and will do so when blending them to the >>>>> + * background color values:: >>>>> + * >>>>> + * out.rgb = plane_alpha * fg.alpha * fg.rgb + >>>>> + * (1 - (plane_alpha * fg.alpha)) * bg.rgb >>>>> + * >>>>> + * Using the following symbols: >>>>> + * >>>>> + * ``fg.rgb``: >>>>> + * Each of the RGB component values from the plane's pixel >>>>> + * ``fg.alpha``: >>>>> + * Alpha component value from the plane's pixel. If the plane's >>>>> + * pixel format has no alpha component, then this is assumed to be >>>>> + * 1.0. In these cases, this property has no effect, as all three >>>>> + * equations become equivalent. >>>>> + * ``bg.rgb``: >>>>> + * Each of the RGB component values from the background >>>>> + * ``plane_alpha``: >>>>> + * Plane alpha value set by the plane "alpha" property. If the >>>>> + * plane does not expose the "alpha" property, then this is >>>>> + * assumed to be 1.0 >>>>> + * >>>>> * Note that all the property extensions described here apply either to the >>>>> * plane or the CRTC (e.g. for the background color, which currently is not >>>>> * exposed and assumed to be black). >>>>> @@ -448,3 +494,83 @@ int drm_atomic_normalize_zpos(struct drm_device *dev, >>>>> return 0; >>>>> } >>>>> EXPORT_SYMBOL(drm_atomic_normalize_zpos); >>>>> + >>>>> +/** >>>>> + * drm_plane_create_blend_mode_property - create a new blend mode property >>>>> + * @plane: drm plane >>>>> + * @supported_modes: bitmask of supported modes, must include >>>>> + * BIT(DRM_MODE_BLEND_PREMULTI). Current DRM assumption is >>>>> + * that alpha is premultiplied, and old userspace can break if >>>>> + * the property defaults to coverage. >>>>> + * >>>> Thanks for the explanation Lowry. >>>> Sigh, old userspace :-\ >>>> >>>> One pedantic suggestion s/defaults to coverage/defaults to anything else/ >>>> Since defaulting to "none" or any future blend mode is also a no-go. >>>> >>>> I wouldn't bother resending solely for ^^. Perhaps squash locally >>>> before merging? >>>> >>>> With that, the patch is >>>> Reviewed-by: Emil Velikov >>>> >>>> -Emil >>> Hi Emil, >>> >>> Thanks a lot for your review and will change that. >> Ping? Any updates? >> >> ~Maarten > Hi Maarten, > > So far the merge request on user space patch has been verified by John > Stultz. The comments from Sean has been fixed and now we are waiting the > reviewed-tag from Sean. Once it merged, we'll send a new kernel patch to > review. > Hey, In general the kernel patch should be merged first, because userspace cannot rely on the behavior until the next -rc1 that integrates it. However, in order to merge the kernel patch, a userspace proof of concept for validation is needed first. Since you're close to merging, I would say the userspace requirement is satisfied. It's safe to send the kernel patch. :) ~Maarten