From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbeBAKnN (ORCPT ); Thu, 1 Feb 2018 05:43:13 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:37287 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbeBAKnH (ORCPT ); Thu, 1 Feb 2018 05:43:07 -0500 From: Philippe Cornu To: Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Vincent Abriou , David Airlie , , CC: Fabien Dessenne , Mickael Reulier , Alexandre Torgue Subject: [PATCH v1 1/2] drm/stm: ltdc: add non-alpha color formats Date: Thu, 1 Feb 2018 11:42:42 +0100 Message-ID: <20180201104243.20726-2-philippe.cornu@st.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180201104243.20726-1-philippe.cornu@st.com> References: <20180201104243.20726-1-philippe.cornu@st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.201.23.32] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-02-01_03:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ltdc supports natively some color formats with alpha (like ARGB8888, ARGB1555, ARGB4444...). Related non-alpha formats are supported too (ARGB8888->XRGB8888, ARGB4444->XRGB4444...) by adjusting ltdc blending factors. Note: Wayland/Weston requests by default the non-alpha XRGB8888 color format. Signed-off-by: Philippe Cornu --- drivers/gpu/drm/stm/ltdc.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 90b3de516c91..f6f26fc0ae9e 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -328,6 +328,26 @@ static inline u32 to_drm_pixelformat(enum ltdc_pix_fmt pf) } } +static inline u32 get_pixelformat_without_alpha(u32 drm) +{ + switch (drm) { + case DRM_FORMAT_ARGB4444: + return DRM_FORMAT_XRGB4444; + case DRM_FORMAT_RGBA4444: + return DRM_FORMAT_RGBX4444; + case DRM_FORMAT_ARGB1555: + return DRM_FORMAT_XRGB1555; + case DRM_FORMAT_RGBA5551: + return DRM_FORMAT_RGBX5551; + case DRM_FORMAT_ARGB8888: + return DRM_FORMAT_XRGB8888; + case DRM_FORMAT_RGBA8888: + return DRM_FORMAT_RGBX8888; + default: + return 0; + } +} + static irqreturn_t ltdc_irq_thread(int irq, void *arg) { struct drm_device *ddev = arg; @@ -680,6 +700,9 @@ static void ltdc_plane_atomic_update(struct drm_plane *plane, /* Specifies the blending factors */ val = BF1_PAXCA | BF2_1PAXCA; + if (!fb->format->has_alpha) + val = BF1_CA | BF2_1CA; + reg_update_bits(ldev->regs, LTDC_L1BFCR + lofs, LXBFCR_BF2 | LXBFCR_BF1, val); @@ -747,8 +770,8 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev, struct device *dev = ddev->dev; struct drm_plane *plane; unsigned int i, nb_fmt = 0; - u32 formats[NB_PF]; - u32 drm_fmt; + u32 formats[NB_PF * 2]; + u32 drm_fmt, drm_fmt_no_alpha; int ret; /* Get supported pixel formats */ @@ -757,6 +780,12 @@ static struct drm_plane *ltdc_plane_create(struct drm_device *ddev, if (!drm_fmt) continue; formats[nb_fmt++] = drm_fmt; + + /* Add the no-alpha related format if any & supported */ + drm_fmt_no_alpha = get_pixelformat_without_alpha(drm_fmt); + if (!drm_fmt_no_alpha) + continue; + formats[nb_fmt++] = drm_fmt_no_alpha; } plane = devm_kzalloc(dev, sizeof(*plane), GFP_KERNEL); -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philippe Cornu Subject: [PATCH v1 1/2] drm/stm: ltdc: add non-alpha color formats Date: Thu, 1 Feb 2018 11:42:42 +0100 Message-ID: <20180201104243.20726-2-philippe.cornu@st.com> References: <20180201104243.20726-1-philippe.cornu@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [62.209.51.94]) by gabe.freedesktop.org (Postfix) with ESMTPS id 003836ECBA for ; Thu, 1 Feb 2018 10:43:05 +0000 (UTC) In-Reply-To: <20180201104243.20726-1-philippe.cornu@st.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Yannick Fertre , Philippe Cornu , Benjamin Gaignard , Vincent Abriou , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Mickael Reulier , Alexandre Torgue , Fabien Dessenne List-Id: dri-devel@lists.freedesktop.org bHRkYyBzdXBwb3J0cyBuYXRpdmVseSBzb21lIGNvbG9yIGZvcm1hdHMgd2l0aCBhbHBoYSAobGlr ZQpBUkdCODg4OCwgQVJHQjE1NTUsIEFSR0I0NDQ0Li4uKS4gUmVsYXRlZCBub24tYWxwaGEgZm9y bWF0cyBhcmUKc3VwcG9ydGVkIHRvbyAoQVJHQjg4ODgtPlhSR0I4ODg4LCBBUkdCNDQ0NC0+WFJH QjQ0NDQuLi4pIGJ5CmFkanVzdGluZyBsdGRjIGJsZW5kaW5nIGZhY3RvcnMuCgpOb3RlOiBXYXls YW5kL1dlc3RvbiByZXF1ZXN0cyBieSBkZWZhdWx0IHRoZSBub24tYWxwaGEgWFJHQjg4ODgKY29s b3IgZm9ybWF0LgoKU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgQ29ybnUgPHBoaWxpcHBlLmNvcm51 QHN0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vc3RtL2x0ZGMuYyB8IDMzICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vc3RtL2x0ZGMuYwppbmRleCA5MGIzZGU1MTZjOTEuLmY2ZjI2ZmMw YWU5ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3N0bS9sdGRjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3N0bS9sdGRjLmMKQEAgLTMyOCw2ICszMjgsMjYgQEAgc3RhdGljIGlubGluZSB1 MzIgdG9fZHJtX3BpeGVsZm9ybWF0KGVudW0gbHRkY19waXhfZm10IHBmKQogCX0KIH0KIAorc3Rh dGljIGlubGluZSB1MzIgZ2V0X3BpeGVsZm9ybWF0X3dpdGhvdXRfYWxwaGEodTMyIGRybSkKK3sK Kwlzd2l0Y2ggKGRybSkgeworCWNhc2UgRFJNX0ZPUk1BVF9BUkdCNDQ0NDoKKwkJcmV0dXJuIERS TV9GT1JNQVRfWFJHQjQ0NDQ7CisJY2FzZSBEUk1fRk9STUFUX1JHQkE0NDQ0OgorCQlyZXR1cm4g RFJNX0ZPUk1BVF9SR0JYNDQ0NDsKKwljYXNlIERSTV9GT1JNQVRfQVJHQjE1NTU6CisJCXJldHVy biBEUk1fRk9STUFUX1hSR0IxNTU1OworCWNhc2UgRFJNX0ZPUk1BVF9SR0JBNTU1MToKKwkJcmV0 dXJuIERSTV9GT1JNQVRfUkdCWDU1NTE7CisJY2FzZSBEUk1fRk9STUFUX0FSR0I4ODg4OgorCQly ZXR1cm4gRFJNX0ZPUk1BVF9YUkdCODg4ODsKKwljYXNlIERSTV9GT1JNQVRfUkdCQTg4ODg6CisJ CXJldHVybiBEUk1fRk9STUFUX1JHQlg4ODg4OworCWRlZmF1bHQ6CisJCXJldHVybiAwOworCX0K K30KKwogc3RhdGljIGlycXJldHVybl90IGx0ZGNfaXJxX3RocmVhZChpbnQgaXJxLCB2b2lkICph cmcpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRkZXYgPSBhcmc7CkBAIC02ODAsNiArNzAwLDkg QEAgc3RhdGljIHZvaWQgbHRkY19wbGFuZV9hdG9taWNfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCiAJLyogU3BlY2lmaWVzIHRoZSBibGVuZGluZyBmYWN0b3JzICovCiAJdmFsID0g QkYxX1BBWENBIHwgQkYyXzFQQVhDQTsKKwlpZiAoIWZiLT5mb3JtYXQtPmhhc19hbHBoYSkKKwkJ dmFsID0gQkYxX0NBIHwgQkYyXzFDQTsKKwogCXJlZ191cGRhdGVfYml0cyhsZGV2LT5yZWdzLCBM VERDX0wxQkZDUiArIGxvZnMsCiAJCQlMWEJGQ1JfQkYyIHwgTFhCRkNSX0JGMSwgdmFsKTsKIApA QCAtNzQ3LDggKzc3MCw4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICpsdGRjX3BsYW5lX2Ny ZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGRldiwKIAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSBkZGV2 LT5kZXY7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAJdW5zaWduZWQgaW50IGksIG5iX2Zt dCA9IDA7Ci0JdTMyIGZvcm1hdHNbTkJfUEZdOwotCXUzMiBkcm1fZm10OworCXUzMiBmb3JtYXRz W05CX1BGICogMl07CisJdTMyIGRybV9mbXQsIGRybV9mbXRfbm9fYWxwaGE7CiAJaW50IHJldDsK IAogCS8qIEdldCBzdXBwb3J0ZWQgcGl4ZWwgZm9ybWF0cyAqLwpAQCAtNzU3LDYgKzc4MCwxMiBA QCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqbHRkY19wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRkZXYsCiAJCWlmICghZHJtX2ZtdCkKIAkJCWNvbnRpbnVlOwogCQlmb3JtYXRzW25i X2ZtdCsrXSA9IGRybV9mbXQ7CisKKwkJLyogQWRkIHRoZSBuby1hbHBoYSByZWxhdGVkIGZvcm1h dCBpZiBhbnkgJiBzdXBwb3J0ZWQgKi8KKwkJZHJtX2ZtdF9ub19hbHBoYSA9IGdldF9waXhlbGZv cm1hdF93aXRob3V0X2FscGhhKGRybV9mbXQpOworCQlpZiAoIWRybV9mbXRfbm9fYWxwaGEpCisJ CQljb250aW51ZTsKKwkJZm9ybWF0c1tuYl9mbXQrK10gPSBkcm1fZm10X25vX2FscGhhOwogCX0K IAogCXBsYW5lID0gZGV2bV9remFsbG9jKGRldiwgc2l6ZW9mKCpwbGFuZSksIEdGUF9LRVJORUwp OwotLSAKMi4xNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK