summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew F. Davis2018-09-26 16:46:43 -0500
committerAndrew F. Davis2018-09-26 16:46:43 -0500
commitb9687c951b4da2a80237fadf07441e5246d1dae8 (patch)
tree007c907a333083acbdfe6a8803055ed0e9152ff7
parent106740891996a6c05fb06570a2d8b76a1a7b48fa (diff)
downloadhardware-ti-am65x-b9687c951b4da2a80237fadf07441e5246d1dae8.tar.gz
hardware-ti-am65x-b9687c951b4da2a80237fadf07441e5246d1dae8.tar.xz
hardware-ti-am65x-b9687c951b4da2a80237fadf07441e5246d1dae8.zip
libhwcomposer: Remove use of properties not available with tidss
The current DSS does not have multiple overlays and so blending and layering are not supported or needed in tidss. Remove use of these properties. Signed-off-by: Andrew F. Davis <afd@ti.com>
-rw-r--r--libhwcomposer/display.cpp6
-rw-r--r--libhwcomposer/display.h4
-rw-r--r--libhwcomposer/hwc.cpp10
3 files changed, 2 insertions, 18 deletions
diff --git a/libhwcomposer/display.cpp b/libhwcomposer/display.cpp
index f881a84..53d73ce 100644
--- a/libhwcomposer/display.cpp
+++ b/libhwcomposer/display.cpp
@@ -149,12 +149,6 @@ static void set_plane_properties(kms::AtomicReq& req, drm_plane_props_t* plane_p
149 { "CRTC_W", plane_props->crtc_w }, 149 { "CRTC_W", plane_props->crtc_w },
150 { "CRTC_H", plane_props->crtc_h }, 150 { "CRTC_H", plane_props->crtc_h },
151 }); 151 });
152
153 /* optional props */
154 req.add(plane, {
155 { "zorder", plane_props->zorder },
156 { "pre_mult_alpha", plane_props->pre_mult_alpha },
157 });
158} 152}
159 153
160int HWCDisplay::update_display(drm_plane_props_t* planeProp) 154int HWCDisplay::update_display(drm_plane_props_t* planeProp)
diff --git a/libhwcomposer/display.h b/libhwcomposer/display.h
index 5df923f..e1e4ef3 100644
--- a/libhwcomposer/display.h
+++ b/libhwcomposer/display.h
@@ -61,10 +61,6 @@ typedef struct drm_plane_props {
61 uint64_t src_w; 61 uint64_t src_w;
62 uint64_t src_h; 62 uint64_t src_h;
63 63
64 uint64_t rotation;
65 uint64_t zorder;
66 uint64_t pre_mult_alpha;
67
68 DRMFramebuffer* fb_info; 64 DRMFramebuffer* fb_info;
69} drm_plane_props_t; 65} drm_plane_props_t;
70 66
diff --git a/libhwcomposer/hwc.cpp b/libhwcomposer/hwc.cpp
index a213313..d201e29 100644
--- a/libhwcomposer/hwc.cpp
+++ b/libhwcomposer/hwc.cpp
@@ -395,7 +395,7 @@ static void hwc_drm_event_thread(void* data)
395 ALOGE("DRM event polling thread exiting\n"); 395 ALOGE("DRM event polling thread exiting\n");
396} 396}
397 397
398static void adjust_drm_plane_to_layer(hwc_layer_1_t* layer, int zorder, drm_plane_props_t* plane) 398static void adjust_drm_plane_to_layer(hwc_layer_1_t* layer, drm_plane_props_t* plane)
399{ 399{
400 if (!layer || !plane) { 400 if (!layer || !plane) {
401 ALOGE("Bad layer or plane"); 401 ALOGE("Bad layer or plane");
@@ -414,13 +414,7 @@ static void adjust_drm_plane_to_layer(hwc_layer_1_t* layer, int zorder, drm_plan
414 plane->src_w = WIDTH(layer->sourceCrop); 414 plane->src_w = WIDTH(layer->sourceCrop);
415 plane->src_h = HEIGHT(layer->sourceCrop); 415 plane->src_h = HEIGHT(layer->sourceCrop);
416 416
417 plane->zorder = zorder;
418 plane->layer = layer; 417 plane->layer = layer;
419
420 if (layer->blending == HWC_BLENDING_PREMULT)
421 plane->pre_mult_alpha = 1;
422 else
423 plane->pre_mult_alpha = 0;
424} 418}
425 419
426static int hwc_prepare_for_display(omap_hwc_device_t* hwc_dev, int disp, hwc_display_contents_1_t* content) 420static int hwc_prepare_for_display(omap_hwc_device_t* hwc_dev, int disp, hwc_display_contents_1_t* content)
@@ -439,7 +433,7 @@ static int hwc_prepare_for_display(omap_hwc_device_t* hwc_dev, int disp, hwc_dis
439 } 433 }
440 434
441 /* Set the FB_TARGET layer */ 435 /* Set the FB_TARGET layer */
442 adjust_drm_plane_to_layer(&content->hwLayers[content->numHwLayers - 1], 0, &display->planeProps[disp]); 436 adjust_drm_plane_to_layer(&content->hwLayers[content->numHwLayers - 1], &display->planeProps[disp]);
443 437
444 return 0; 438 return 0;
445} 439}