korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-27 04:54:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/armada: use __drm_atomic_helper_plane_reset in overlay reset

Browse Source 
Use the __drm_atomic_helper_plane_reset() helper in the overlay reset
code to ensure that generic features are correctly reset in future.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King 2019-01-25 09:55:28 +00:00
parent 768f719ab7
commit ad52f53ff4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/armada/armada_overlay.c
View File

@ -307,13 +307,10 @@ static void armada_overlay_reset(struct drm_plane *plane)
if (plane->state) if (plane->state)
__drm_atomic_helper_plane_destroy_state(plane->state); __drm_atomic_helper_plane_destroy_state(plane->state);
kfree(plane->state); kfree(plane->state);
plane->state = NULL;
state = kzalloc(sizeof(*state), GFP_KERNEL); state = kzalloc(sizeof(*state), GFP_KERNEL);
if (state) { if (state) {
state->base.plane = plane;
state->base.color_encoding = DEFAULT_ENCODING;
state->base.color_range = DRM_COLOR_YCBCR_LIMITED_RANGE;
state->base.rotation = DRM_MODE_ROTATE_0;
state->colorkey_yr = 0xfefefe00; state->colorkey_yr = 0xfefefe00;
state->colorkey_ug = 0x01010100; state->colorkey_ug = 0x01010100;
state->colorkey_vb = 0x01010100; state->colorkey_vb = 0x01010100;
@ -323,8 +320,10 @@ static void armada_overlay_reset(struct drm_plane *plane)
state->brightness = DEFAULT_BRIGHTNESS; state->brightness = DEFAULT_BRIGHTNESS;
state->contrast = DEFAULT_CONTRAST; state->contrast = DEFAULT_CONTRAST;
state->saturation = DEFAULT_SATURATION; state->saturation = DEFAULT_SATURATION;
__drm_atomic_helper_plane_reset(plane, &state->base);
state->base.color_encoding = DEFAULT_ENCODING;
state->base.color_range = DRM_COLOR_YCBCR_LIMITED_RANGE;
} }
plane->state = &state->base;
} }
struct drm_plane_state * struct drm_plane_state *