OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
clear-pkgs-linux-iot-lts2018/0870-Revert-drm-Add-per-pla...

244 lines
8.3 KiB
Diff
Raw Permalink Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Pan, Kris" <kris.pan@intel.com>
Date: Thu, 17 Jan 2019 01:02:59 -0800
Subject: [PATCH] Revert "drm: Add per-plane pixel blend mode property"
This reverts commit 702d282a946bc51096db62f3a100f19a35e4264e.
It caused a regression that SOS image can't boot to GUI.
Change-Id: Iaf099c8176df7d7d654d32047192165f4ddb2b1d
Tracked-On: PKT-1679
---
drivers/gpu/drm/drm_atomic.c | 4 -
drivers/gpu/drm/drm_atomic_helper.c | 1 -
drivers/gpu/drm/drm_blend.c | 123 ----------------------------
include/drm/drm_blend.h | 6 --
include/drm/drm_plane.h | 9 --
5 files changed, 143 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index f2b173d07e41..d3c3c65bf5b7 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -910,8 +910,6 @@ 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)) {
DRM_DEBUG_ATOMIC("[PLANE:%d:%s] bad rotation bitmask: 0x%llx\n",
@@ -987,8 +985,6 @@ drm_atomic_plane_get_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 915def756af8..198de948bb3f 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3632,7 +3632,6 @@ 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 e0bbd1b004a5..183a7f6488c7 100644
--- a/drivers/gpu/drm/drm_blend.c
+++ b/drivers/gpu/drm/drm_blend.c
@@ -107,52 +107,6 @@
* 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).
@@ -526,80 +480,3 @@ 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 anything else.
- *
- * This creates a new property describing the blend mode.
- *
- * The property exposed to userspace is an enumeration property (see
- * drm_property_create_enum()) called "pixel blend mode" and has the
- * following enumeration values:
- *
- * "None":
- * Blend formula that ignores the pixel alpha.
- *
- * "Pre-multiplied":
- * Blend formula that assumes the pixel color values have been already
- * pre-multiplied with the alpha channel values.
- *
- * "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.
- *
- * RETURNS:
- * Zero for success or -errno
- */
-int drm_plane_create_blend_mode_property(struct drm_plane *plane,
- unsigned int supported_modes)
-{
- struct drm_device *dev = plane->dev;
- struct drm_property *prop;
- static const struct drm_prop_enum_list props[] = {
- { DRM_MODE_BLEND_PIXEL_NONE, "None" },
- { DRM_MODE_BLEND_PREMULTI, "Pre-multiplied" },
- { DRM_MODE_BLEND_COVERAGE, "Coverage" },
- };
- unsigned int valid_mode_mask = BIT(DRM_MODE_BLEND_PIXEL_NONE) |
- BIT(DRM_MODE_BLEND_PREMULTI) |
- BIT(DRM_MODE_BLEND_COVERAGE);
- int i;
-
- if (WARN_ON((supported_modes & ~valid_mode_mask) ||
- ((supported_modes & BIT(DRM_MODE_BLEND_PREMULTI)) == 0)))
- return -EINVAL;
-
- prop = drm_property_create(dev, DRM_MODE_PROP_ENUM,
- "pixel blend mode",
- hweight32(supported_modes));
- if (!prop)
- return -ENOMEM;
-
- for (i = 0; i < ARRAY_SIZE(props); i++) {
- int ret;
-
- if (!(BIT(props[i].type) & supported_modes))
- continue;
-
- ret = drm_property_add_enum(prop, props[i].type,
- props[i].name);
-
- if (ret) {
- drm_property_destroy(dev, prop);
-
- return ret;
- }
- }
-
- drm_object_attach_property(&plane->base, prop, DRM_MODE_BLEND_PREMULTI);
- plane->blend_mode_property = prop;
-
- return 0;
-}
-EXPORT_SYMBOL(drm_plane_create_blend_mode_property);
diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h
index 12912656ef08..74ba3e10b3a9 100644
--- a/include/drm/drm_blend.h
+++ b/include/drm/drm_blend.h
@@ -27,10 +27,6 @@
#include <linux/ctype.h>
#include <drm/drm_mode.h>
-#define DRM_MODE_BLEND_PREMULTI 0
-#define DRM_MODE_BLEND_COVERAGE 1
-#define DRM_MODE_BLEND_PIXEL_NONE 2
-
struct drm_device;
struct drm_atomic_state;
struct drm_plane;
@@ -57,6 +53,4 @@ int drm_plane_create_zpos_immutable_property(struct drm_plane *plane,
unsigned int zpos);
int drm_atomic_normalize_zpos(struct drm_device *dev,
struct drm_atomic_state *state);
-int drm_plane_create_blend_mode_property(struct drm_plane *plane,
- unsigned int supported_modes);
#endif
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 95c550a64ee8..47d018e31bce 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -117,7 +117,6 @@ struct drm_plane_state {
* details.
*/
u16 alpha;
- uint16_t pixel_blend_mode;
/**
* @rotation:
@@ -674,14 +673,6 @@ struct drm_plane {
* drm_plane_create_rotation_property().
*/
struct drm_property *rotation_property;
- /**
- * @blend_mode_property:
- * Optional "pixel blend mode" enum property for this plane.
- * Blend mode property represents the alpha blending equation selection,
- * describing how the pixels from the current plane are composited with
- * the background.
- */
- struct drm_property *blend_mode_property;
/**
* @color_encoding_property:
--
https://clearlinux.org
Reference in New Issue View Git Blame Copy Permalink