drm: Conslidate blending properties in drm_blend.[hc]
Imo zpos, rotatation, blending eq (once we have it) and all that should be in drm_blend.c, since those are all about how exactly the pixels are rendered onto the CRTC's visible area. Also noticed that one exported function accidentally ended up in drm_crtc_internal.h, move it to the right place too. Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: http://patchwork.freedesktop.org/patch/msgid/1474448370-32227-3-git-send-email-daniel.vetter@ffwll.ch
Этот коммит содержится в:
Daniel Vetter
коммит произвёл
Sean Paul
Sean Paul
родитель
532b36712d
Коммит
1873380246
59
include/drm/drm_blend.h
Обычный файл
59
include/drm/drm_blend.h
Обычный файл
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright (c) 2016 Intel Corporation
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
* documentation for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice appear in all copies and that both that copyright
|
||||
* notice and this permission notice appear in supporting documentation, and
|
||||
* that the name of the copyright holders not be used in advertising or
|
||||
* publicity pertaining to distribution of the software without specific,
|
||||
* written prior permission. The copyright holders make no representations
|
||||
* about the suitability of this software for any purpose. It is provided "as
|
||||
* is" without express or implied warranty.
|
||||
*
|
||||
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
||||
* OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef __DRM_BLEND_H__
|
||||
#define __DRM_BLEND_H__
|
||||
|
||||
#include <linux/list.h>
|
||||
#include <linux/ctype.h>
|
||||
|
||||
struct drm_device;
|
||||
struct drm_atomic_state;
|
||||
|
||||
/*
|
||||
* Rotation property bits. DRM_ROTATE_<degrees> rotates the image by the
|
||||
* specified amount in degrees in counter clockwise direction. DRM_REFLECT_X and
|
||||
* DRM_REFLECT_Y reflects the image along the specified axis prior to rotation
|
||||
*/
|
||||
#define DRM_ROTATE_0 BIT(0)
|
||||
#define DRM_ROTATE_90 BIT(1)
|
||||
#define DRM_ROTATE_180 BIT(2)
|
||||
#define DRM_ROTATE_270 BIT(3)
|
||||
#define DRM_ROTATE_MASK (DRM_ROTATE_0 | DRM_ROTATE_90 | \
|
||||
DRM_ROTATE_180 | DRM_ROTATE_270)
|
||||
#define DRM_REFLECT_X BIT(4)
|
||||
#define DRM_REFLECT_Y BIT(5)
|
||||
#define DRM_REFLECT_MASK (DRM_REFLECT_X | DRM_REFLECT_Y)
|
||||
|
||||
struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
|
||||
unsigned int supported_rotations);
|
||||
unsigned int drm_rotation_simplify(unsigned int rotation,
|
||||
unsigned int supported_rotations);
|
||||
|
||||
int drm_plane_create_zpos_property(struct drm_plane *plane,
|
||||
unsigned int zpos,
|
||||
unsigned int min, unsigned int max);
|
||||
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);
|
||||
#endif
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <drm/drm_bridge.h>
|
||||
#include <drm/drm_edid.h>
|
||||
#include <drm/drm_plane.h>
|
||||
#include <drm/drm_blend.h>
|
||||
|
||||
struct drm_device;
|
||||
struct drm_mode_set;
|
||||
@@ -63,21 +64,6 @@ static inline uint64_t I642U64(int64_t val)
|
||||
return (uint64_t)*((uint64_t *)&val);
|
||||
}
|
||||
|
||||
/*
|
||||
* Rotation property bits. DRM_ROTATE_<degrees> rotates the image by the
|
||||
* specified amount in degrees in counter clockwise direction. DRM_REFLECT_X and
|
||||
* DRM_REFLECT_Y reflects the image along the specified axis prior to rotation
|
||||
*/
|
||||
#define DRM_ROTATE_0 BIT(0)
|
||||
#define DRM_ROTATE_90 BIT(1)
|
||||
#define DRM_ROTATE_180 BIT(2)
|
||||
#define DRM_ROTATE_270 BIT(3)
|
||||
#define DRM_ROTATE_MASK (DRM_ROTATE_0 | DRM_ROTATE_90 | \
|
||||
DRM_ROTATE_180 | DRM_ROTATE_270)
|
||||
#define DRM_REFLECT_X BIT(4)
|
||||
#define DRM_REFLECT_Y BIT(5)
|
||||
#define DRM_REFLECT_MASK (DRM_REFLECT_X | DRM_REFLECT_Y)
|
||||
|
||||
/* data corresponds to displayid vend/prod/serial */
|
||||
struct drm_tile_group {
|
||||
struct kref refcount;
|
||||
@@ -1363,22 +1349,11 @@ extern struct drm_tile_group *drm_mode_get_tile_group(struct drm_device *dev,
|
||||
extern void drm_mode_put_tile_group(struct drm_device *dev,
|
||||
struct drm_tile_group *tg);
|
||||
|
||||
extern struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
|
||||
unsigned int supported_rotations);
|
||||
extern unsigned int drm_rotation_simplify(unsigned int rotation,
|
||||
unsigned int supported_rotations);
|
||||
extern void drm_crtc_enable_color_mgmt(struct drm_crtc *crtc,
|
||||
uint degamma_lut_size,
|
||||
bool has_ctm,
|
||||
uint gamma_lut_size);
|
||||
|
||||
int drm_plane_create_zpos_property(struct drm_plane *plane,
|
||||
unsigned int zpos,
|
||||
unsigned int min, unsigned int max);
|
||||
|
||||
int drm_plane_create_zpos_immutable_property(struct drm_plane *plane,
|
||||
unsigned int zpos);
|
||||
|
||||
/* Helpers */
|
||||
static inline struct drm_crtc *drm_crtc_find(struct drm_device *dev,
|
||||
uint32_t id)
|
||||
|
||||
Ссылка в новой задаче
Block a user