projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/i915: Move rotation from intel_plane to drm_plane_state
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_drv.h
diff --git
a/drivers/gpu/drm/i915/intel_drv.h
b/drivers/gpu/drm/i915/intel_drv.h
index 59a7b82cb9d745ad59d2512fb689b413a5ac24f0..a9c00bd5c8aba3dee89bd57c584e1b10265e316f 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_drv.h
+++ b/
drivers/gpu/drm/i915/intel_drv.h
@@
-509,7
+509,6
@@
struct intel_plane {
struct drm_i915_gem_object *obj;
bool can_scale;
int max_downscale;
struct drm_i915_gem_object *obj;
bool can_scale;
int max_downscale;
- unsigned int rotation;
/* Since we need to change the watermarks before/after
* enabling/disabling the planes, we need to store the parameters here
/* Since we need to change the watermarks before/after
* enabling/disabling the planes, we need to store the parameters here
@@
-518,6
+517,12
@@
struct intel_plane {
*/
struct intel_plane_wm_parameters wm;
*/
struct intel_plane_wm_parameters wm;
+ /*
+ * NOTE: Do not place new plane state fields here (e.g., when adding
+ * new plane properties). New runtime state should now be placed in
+ * the intel_plane_state structure and accessed via drm_plane->state.
+ */
+
void (*update_plane)(struct drm_plane *plane,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
void (*update_plane)(struct drm_plane *plane,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
@@
-1235,6
+1240,7
@@
void intel_pre_disable_primary(struct drm_crtc *crtc);
void intel_tv_init(struct drm_device *dev);
/* intel_atomic.c */
void intel_tv_init(struct drm_device *dev);
/* intel_atomic.c */
+struct intel_plane_state *intel_create_plane_state(struct drm_plane *plane);
struct drm_plane_state *intel_plane_duplicate_state(struct drm_plane *plane);
void intel_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state);
struct drm_plane_state *intel_plane_duplicate_state(struct drm_plane *plane);
void intel_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state);
This page took
0.030013 seconds
and
5
git commands to generate.