archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-17 23:34:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/linux-gru to 4.4.52-4

Browse source
This commit is contained in:
Kevin Mihelich 2017-04-23 23:19:28 +00:00
parent cd1c4fcb68
commit 8375916cac
7 changed files with 152 additions and 505 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/linux-gru/0001-Input-atmel_mxt_ts-Use-KERN_DEBUG-loglevel-for-statu.patch
View file

@ -1,4 +1,4 @@
From 886b1c7c3588f365127e7119885bfd2b7fc1032d Mon Sep 17 00:00:00 2001
From f743d19646e09522664ef5ca48549d32f7f42bbf Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 15 Feb 2017 18:32:55 -0700
Subject: [PATCH 1/4] Input: atmel_mxt_ts: Use KERN_DEBUG loglevel for status
@ -23,5 +23,5 @@ index 6a13f44e4cd8..4ee0679c5516 100644
if (status == 0x00)
complete(&data->auto_cal_completion);
--
2.12.1
2.12.2

4
core/linux-gru/0002-Revert-CHROMIUM-drm-rockchip-Add-PSR-residency-debug.patch
View file

@ -1,4 +1,4 @@
From e070341ce4eed1ccaab532704f42a1026aaecd1a Mon Sep 17 00:00:00 2001
From ab0985215b2a3440bedff7b07a38c720a9ea1b47 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 5 Apr 2017 22:55:05 -0600
Subject: [PATCH 2/4] Revert "CHROMIUM: drm: rockchip: Add PSR residency debug
@ -85,5 +85,5 @@ index f2766cafd0b4..acd31ea3825d 100644
dp->adp = ERR_PTR(-ENODEV);
}
--
2.12.1
2.12.2

4
core/linux-gru/0003-temporary-hack-to-fix-console-output.patch
View file

@ -1,4 +1,4 @@
From 0b864ff26059532ec58e430f7cd6e011f9ca353e Mon Sep 17 00:00:00 2001
From b926a0837eb5b744568fc2eca1d63a3692e1b25c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 26 Feb 2017 19:14:10 -0700
Subject: [PATCH 3/4] temporary hack to fix console output
@ -33,5 +33,5 @@ index acd31ea3825d..383129f82093 100644
return 0;
}
--
2.12.1
2.12.2

488
core/linux-gru/0004-Revert-CHROMIUM-drm-rockchip-cdn-dp-add-HDCP-1.4-sup.patch
View file

@ -1,488 +0,0 @@
From 8cb2f6088d8d6076d9ff0fd7b2a8639080887cae Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 6 Apr 2017 00:05:00 -0600
Subject: [PATCH 4/4] Revert "CHROMIUM: drm/rockchip: cdn-dp: add HDCP 1.4
support"
This reverts commit 0a2145692ed04ff3aab64c0e3ef6d230caa99105.
---
drivers/gpu/drm/rockchip/cdn-dp-core.c | 198 ---------------------------------
drivers/gpu/drm/rockchip/cdn-dp-core.h | 1 -
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 112 -------------------
drivers/gpu/drm/rockchip/cdn-dp-reg.h | 35 ------
4 files changed, 346 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index c951d2280866..48cbad5963b5 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -26,7 +26,6 @@
#include <linux/extcon.h>
#include <linux/firmware.h>
#include <linux/hdmi-notifier.h>
-#include <linux/iopoll.h>
#include <linux/regmap.h>
#include <linux/reset.h>
#include <linux/mfd/syscon.h>
@@ -39,15 +38,10 @@
#include "cdn-dp-reg.h"
#include "rockchip_drm_vop.h"
-#define HDCP_RETRY_INTERVAL_MS 100
-#define HDCP_EVENT_TIMEOUT_MS 500
-#define HDCP_AUTHENTICATE_DELAY_MS 100
-
#define HDCP_KEY_DATA_START_TRANSFER 0
#define HDCP_KEY_DATA_START_DECRYPT 1
#define RK_SIP_HDCP_CONTROL 0x82000009
-#define RK_SIP_HDCP_KEY_DATA64 0xC200000A
#define connector_to_dp(c) \
container_of(c, struct cdn_dp_device, connector)
@@ -196,50 +190,6 @@ static int cdn_dp_get_sink_count(struct cdn_dp_device *dp, u8 *sink_count)
return 0;
}
-static int cdn_dp_start_hdcp1x_auth(struct cdn_dp_device *dp)
-{
- int ret;
- struct arm_smccc_res res;
- uint64_t *buf;
-
- mutex_lock(&dp->lock);
- if (!dp->active) {
- dev_err(dp->dev, "firmware is not active\n");
- goto out;
- }
-
- arm_smccc_smc(RK_SIP_HDCP_CONTROL, HDCP_KEY_DATA_START_TRANSFER,
- 0, 0, 0, 0, 0, 0, &res);
-
- buf = (uint64_t *)&dp->key;
-
- for (; !res.a0 && (u8 *)buf - (u8 *)&dp->key < sizeof(dp->key);
- buf += 6)
- arm_smccc_smc(RK_SIP_HDCP_KEY_DATA64, buf[0], buf[1],
- buf[2], buf[3], buf[4], buf[5], 0, &res);
-
- if (res.a0) {
- dev_err(dp->dev, "send hdcp keys failed: %ld\n", res.a0);
- ret = -EIO;
- goto out;
- }
- arm_smccc_smc(RK_SIP_HDCP_CONTROL, HDCP_KEY_DATA_START_DECRYPT,
- 0, 0, 0, 0, 0, 0, &res);
-
- ret = cdn_dp_hdcp_tx_configuration(dp, HDCP_TX_1, true);
- if (ret) {
- dev_err(dp->dev, "start hdcp authentication failed: %d\n", ret);
- goto out;
- }
-
- schedule_delayed_work(&dp->hdcp_event_work,
- msecs_to_jiffies(HDCP_AUTHENTICATE_DELAY_MS));
-
-out:
- mutex_unlock(&dp->lock);
- return ret;
-}
-
static struct cdn_dp_port *cdn_dp_connected_port(struct cdn_dp_device *dp)
{
struct cdn_dp_port *port;
@@ -307,71 +257,12 @@ static void cdn_dp_connector_destroy(struct drm_connector *connector)
drm_connector_cleanup(connector);
}
-static int cdn_dp_set_content_protection(struct cdn_dp_device *dp,
- struct drm_mode_object *obj,
- struct drm_property *property,
- uint64_t val)
-{
- int ret;
-
- switch (val) {
- case DRM_MODE_CONTENT_PROTECTION_UNDESIRED:
- ret = cdn_dp_hdcp_tx_configuration(dp, HDCP_TX_1, false);
- break;
-
- case DRM_MODE_CONTENT_PROTECTION_DESIRED:
- ret = cdn_dp_start_hdcp1x_auth(dp);
- break;
-
- case DRM_MODE_CONTENT_PROTECTION_ENABLED:
- ret = -EINVAL;
- }
- return ret;
-}
-
-static int cdn_dp_connector_set_property(struct drm_connector *connector,
- struct drm_property *property,
- uint64_t val)
-{
- struct cdn_dp_device *dp = connector_to_dp(connector);
- int ret = 0;
-
- if (strcmp(property->name, "Content Protection") == 0)
- ret = cdn_dp_set_content_protection(dp, &connector->base,
- property, val);
-
- return ret;
-}
-
-static int cdn_dp_connector_atomic_get_property(
- struct drm_connector *connector,
- const struct drm_connector_state *state,
- struct drm_property *property,
- uint64_t *val)
-{
- struct drm_mode_config *mc = &connector->dev->mode_config;
- int i;
-
- if (property == mc->content_protection_property) {
- for (i = 0; i < connector->properties.count; i++) {
- if (connector->properties.properties[i] == property) {
- *val = connector->properties.values[i];
- return 0;
- }
- }
- }
-
- return -EINVAL;
-}
-
static struct drm_connector_funcs cdn_dp_atomic_connector_funcs = {
.dpms = drm_atomic_helper_connector_dpms,
.detect = cdn_dp_connector_detect,
.destroy = cdn_dp_connector_destroy,
.fill_modes = drm_helper_probe_single_connector_modes,
.reset = drm_atomic_helper_connector_reset,
- .set_property = cdn_dp_connector_set_property,
- .atomic_get_property = cdn_dp_connector_atomic_get_property,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
@@ -1148,88 +1039,6 @@ static int cdn_dp_pd_event(struct notifier_block *nb,
return NOTIFY_DONE;
}
-static int cdn_dp_set_hdcp_drm_property(struct cdn_dp_device *dp, uint64_t val)
-{
- struct drm_connector *connector = &dp->connector;
- struct drm_mode_config *mc = &connector->dev->mode_config;
-
- return drm_object_property_set_value(&connector->base,
- mc->content_protection_property,
- val);
-}
-
-static bool cdn_dp_hdcp_authorize(struct cdn_dp_device *dp)
-{
- bool auth_done = false;
- u16 tx_status;
- u32 sw_event;
- int ret;
-
- mutex_lock(&dp->lock);
-
- /*
- * HDCP authentication might cause the disconnect hpd event, just
- * stop the hdcp event SM.
- */
- if (!dp->connected) {
- auth_done = true;
- goto out;
- }
-
- sw_event = cdn_dp_get_event(dp);
-
- if (sw_event & HDCP_TX_STATUS_EVENT) {
- auth_done = true;
-
- ret = cdn_dp_hdcp_tx_status_req(dp, &tx_status);
- if (ret)
- goto out;
- if (HDCP_TX_STATUS_ERROR(tx_status)) {
- dev_err(dp->dev, "hdcp status error: %x\n",
- HDCP_TX_STATUS_ERROR(tx_status));
- goto out;
- } else if (tx_status & HDCP_TX_STATUS_AUTHENTICATED) {
- cdn_dp_set_hdcp_drm_property(dp,
- DRM_MODE_CONTENT_PROTECTION_ENABLED);
- goto out;
- } else {
- auth_done = false;
- }
- }
-
- if (sw_event & HDCP_TX_IS_RECEIVER_ID_VALID_EVENT) {
- ret = cdn_dp_hdcp_tx_is_receiver_id_valid_req(dp);
- if (ret) {
- auth_done = true;
- goto out;
- }
- ret = cdn_dp_hdcp_tx_respond_id_valid(dp, true);
- if (ret)
- auth_done = true;
- }
-
-out:
- mutex_unlock(&dp->lock);
-
- return auth_done;
-}
-
-static void cdn_dp_hdcp_event_work(struct work_struct *work)
-{
- struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
- hdcp_event_work.work);
- unsigned long timeout = jiffies +
- msecs_to_jiffies(HDCP_EVENT_TIMEOUT_MS);
-
- while (time_before(jiffies, timeout)) {
- if (cdn_dp_hdcp_authorize(dp))
- return;
- msleep(HDCP_RETRY_INTERVAL_MS);
- }
-
- dev_err(dp->dev, "Failed to authorize hdcp\n");
-}
-
static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
@@ -1237,7 +1046,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
struct drm_connector *connector;
struct cdn_dp_port *port;
struct drm_device *drm_dev = data;
- struct drm_mode_config *mode_config;
int ret, i;
ret = cdn_dp_parse_dt(dp);
@@ -1250,7 +1058,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
dp->active_port = -1;
INIT_WORK(&dp->event_work, cdn_dp_pd_event_work);
- INIT_DELAYED_WORK(&dp->hdcp_event_work, cdn_dp_hdcp_event_work);
encoder = &dp->encoder;
@@ -1307,11 +1114,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
schedule_work(&dp->event_work);
- mode_config = &connector->dev->mode_config;
- drm_object_attach_property(&connector->base,
- mode_config->content_protection_property,
- DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
-
return 0;
err_free_connector:
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index bd9f31183241..53778c769840 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -127,6 +127,5 @@ struct cdn_dp_device {
bool sink_has_audio;
struct cdn_dp_hdcp_key_1x key;
- struct delayed_work hdcp_event_work;
};
#endif /* _CDN_DP_CORE_H */
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
index 63b35796fe26..39581986e722 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
@@ -12,7 +12,6 @@
* GNU General Public License for more details.
*/
-#include <linux/arm-smccc.h>
#include <linux/clk.h>
#include <linux/device.h>
#include <linux/delay.h>
@@ -978,114 +977,3 @@ err_audio_config:
DRM_DEV_ERROR(dp->dev, "audio config failed: %d\n", ret);
return ret;
}
-
-int cdn_dp_hdcp_tx_configuration(struct cdn_dp_device *dp, int tx_mode,
- bool active)
-{
- u8 msg;
-
- msg = tx_mode;
- if (active)
- msg |= HDCP_TX_ACTIVATE;
-
- return cdn_dp_mailbox_send(dp, MB_MODULE_ID_HDCP_TX,
- HDCP_TX_CONFIGURATION, sizeof(msg), &msg);
-}
-
-int cdn_dp_hdcp_tx_status_req(struct cdn_dp_device *dp, uint16_t *tx_status)
-{
- u8 status[5];
- int ret;
-
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_HDCP_TX,
- HDCP_TX_STATUS_CHANGE, 0, NULL);
- if (ret)
- goto err_hdcp_tx_status_rq;
-
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_HDCP_TX,
- HDCP_TX_STATUS_CHANGE,
- sizeof(status));
- if (ret)
- goto err_hdcp_tx_status_rq;
-
- ret = cdn_dp_mailbox_read_receive(dp, status, sizeof(status));
- if (ret)
- goto err_hdcp_tx_status_rq;
-
- *tx_status = status[0] << 8 | status[1];
-
-err_hdcp_tx_status_rq:
- if (ret)
- DRM_DEV_ERROR(dp->dev, "hdcp tx status failed: %d\n", ret);
- return ret;
-}
-
-int cdn_dp_hdcp_tx_is_receiver_id_valid_req(struct cdn_dp_device *dp)
-{
- int ret;
- u32 mbox_size, i;
- u8 header[4], *resp;
-
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_HDCP_TX,
- HDCP_TX_IS_RECEIVER_ID_VALID,
- 0, NULL);
- if (ret)
- goto err_hdcp_tx_is_receiver_id_valid_req;
-
- /*
- * The size of HDCP_TX_IS_RECEIVER_ID_VALID_RESP is variable, which
- * is dependent on HDCP device type. It will response receiver ID
- * list if the device is a repeater.
- * So we need to distinguish the size.
- */
- for (i = 0; i < 4; i++) {
- ret = cdn_dp_mailbox_read(dp);
- if (ret < 0)
- goto err_hdcp_tx_is_receiver_id_valid_req;
-
- header[i] = ret;
- }
-
- mbox_size = (header[2] << 8) | header[3];
-
- if (header[0] != HDCP_TX_IS_RECEIVER_ID_VALID ||
- header[1] != MB_MODULE_ID_HDCP_TX ||
- !IS_HDCP_TX_RECEIVER_ID_VALID_RESP_SIZE_VALID(mbox_size)) {
- ret = -EINVAL;
- for (i = 0; i < mbox_size; i++)
- if (cdn_dp_mailbox_read(dp) < 0)
- break;
-
- goto err_hdcp_tx_is_receiver_id_valid_req;
- }
-
- resp = kzalloc(mbox_size, GFP_KERNEL);
- if (IS_ERR(resp) || IS_ERR_OR_NULL(resp)) {
- ret = -ENOMEM;
- goto err_hdcp_tx_is_receiver_id_valid_req;
- }
-
- ret = cdn_dp_mailbox_read_receive(dp, resp, mbox_size);
-
- /* TODO judge the all receivers are in revocation list. */
- kfree(resp);
-
-err_hdcp_tx_is_receiver_id_valid_req:
- if (ret)
- DRM_DEV_ERROR(dp->dev,
- "hdcp receivers id verification failed: %d\n",
- ret);
- return ret;
-}
-
-int cdn_dp_hdcp_tx_respond_id_valid(struct cdn_dp_device *dp, bool valid)
-{
- u8 msg = 0;
-
- if (valid)
- msg = 0x01;
- return cdn_dp_mailbox_send(dp, MB_MODULE_ID_HDCP_TX,
- HDCP_TX_RESPOND_RECEIVER_ID_VALID,
- sizeof(msg), &msg);
-}
-
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
index d8935c0bcf87..a295b899450c 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
@@ -329,22 +329,6 @@
#define GENERAL_BUS_SETTINGS 0x03
#define GENERAL_TEST_ACCESS 0x04
-/* hdcp opcode */
-#define HDCP_TX_CONFIGURATION 0x00
-#define HDCP2_TX_SET_PUBLIC_KEY_PARAMS 0x01
-#define HDCP2_TX_SET_DEBUG_RANDOM_NUMBERS 0x02
-#define HDCP2_TX_RESPOND_KM 0x03
-#define HDCP1_TX_SEND_KEYS 0x04
-#define HDCP1_TX_SEND_RANDOM_AN 0x05
-#define HDCP_TX_STATUS_CHANGE 0x06
-#define HDCP2_TX_IS_KM_STORED 0x07
-#define HDCP2_TX_STORE_KM 0x08
-#define HDCP_TX_IS_RECEIVER_ID_VALID 0x09
-#define HDCP_TX_RESPOND_RECEIVER_ID_VALID 0x0a
-
-#define IS_HDCP_TX_RECEIVER_ID_VALID_RESP_SIZE_VALID(x) \
- (((((x) - 2) % 5) == 0) || ((((x) - 4) % 5) == 0))
-
#define DPTX_SET_POWER_MNG 0x00
#define DPTX_SET_HOST_CAPABILITIES 0x01
#define DPTX_GET_EDID 0x02
@@ -411,14 +395,6 @@
#define HDCP2_TX_STORE_KM_EVENT BIT(6)
#define HDCP_TX_IS_RECEIVER_ID_VALID_EVENT BIT(7)
-#define HDCP_TX_ACTIVATE BIT(2)
-
-#define HDCP_TX_STATUS_AUTHENTICATED BIT(0)
-#define HDCP_TX_STATUS_RECEIVER_IS_REPEATER BIT(1)
-#define HDCP_TX_STATUS_RX_HDCP1 (0x01 << 2)
-#define HDCP_TX_STATUS_RX_HDCP2 (0x02 << 2)
-#define HDCP_TX_STATUS_ERROR(x) (((x) >> 5) & 0xf)
-
#define TU_SIZE 30
#define CDN_DP_MAX_LINK_RATE DP_LINK_BW_5_4
@@ -484,12 +460,6 @@ enum vic_bt_type {
BT_709 = 0x1,
};
-enum HDCP_TX_SUPPORT {
- HDCP_TX_2,
- HDCP_TX_1,
- HDCP_TX_BOTH,
-};
-
void cdn_dp_clock_reset(struct cdn_dp_device *dp);
void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, u32 clk);
@@ -510,9 +480,4 @@ int cdn_dp_config_video(struct cdn_dp_device *dp);
int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio);
int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable);
int cdn_dp_audio_config(struct cdn_dp_device *dp, struct audio_info *audio);
-int cdn_dp_hdcp_tx_configuration(struct cdn_dp_device *dp, int tx_mode,
- bool active);
-int cdn_dp_hdcp_tx_status_req(struct cdn_dp_device *dp, uint16_t *tx_status);
-int cdn_dp_hdcp_tx_is_receiver_id_valid_req(struct cdn_dp_device *dp);
-int cdn_dp_hdcp_tx_respond_id_valid(struct cdn_dp_device *dp, bool valid);
#endif /* _CDN_DP_REG_H */
--
2.12.1

134
core/linux-gru/0004-skip-HDCP-setup.patch Normal file
View file

@ -0,0 +1,134 @@
From fb997ad6c00fcd16102805aa1cd98ede592dc577 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 23 Apr 2017 13:42:34 -0600
Subject: [PATCH 4/4] skip HDCP setup
This causes a lockup immediately upon starting X.
---
drivers/gpu/drm/rockchip/cdn-dp-core.c | 89 ----------------------------------
1 file changed, 89 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index e10ac220ef4b..c9d94e17b13c 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1151,88 +1151,6 @@ static int cdn_dp_pd_event(struct notifier_block *nb,
return NOTIFY_DONE;
}
-static int cdn_dp_set_hdcp_drm_property(struct cdn_dp_device *dp, uint64_t val)
-{
- struct drm_connector *connector = &dp->connector;
- struct drm_mode_config *mc = &connector->dev->mode_config;
-
- return drm_object_property_set_value(&connector->base,
- mc->content_protection_property,
- val);
-}
-
-static bool cdn_dp_hdcp_authorize(struct cdn_dp_device *dp)
-{
- bool auth_done = false;
- u16 tx_status;
- u32 sw_event;
- int ret;
-
- mutex_lock(&dp->lock);
-
- /*
- * HDCP authentication might cause the disconnect hpd event, just
- * stop the hdcp event SM.
- */
- if (!dp->connected) {
- auth_done = true;
- goto out;
- }
-
- sw_event = cdn_dp_get_event(dp);
-
- if (sw_event & HDCP_TX_STATUS_EVENT) {
- auth_done = true;
-
- ret = cdn_dp_hdcp_tx_status_req(dp, &tx_status);
- if (ret)
- goto out;
- if (HDCP_TX_STATUS_ERROR(tx_status)) {
- dev_err(dp->dev, "hdcp status error: %x\n",
- HDCP_TX_STATUS_ERROR(tx_status));
- goto out;
- } else if (tx_status & HDCP_TX_STATUS_AUTHENTICATED) {
- cdn_dp_set_hdcp_drm_property(dp,
- DRM_MODE_CONTENT_PROTECTION_ENABLED);
- goto out;
- } else {
- auth_done = false;
- }
- }
-
- if (sw_event & HDCP_TX_IS_RECEIVER_ID_VALID_EVENT) {
- ret = cdn_dp_hdcp_tx_is_receiver_id_valid_req(dp);
- if (ret) {
- auth_done = true;
- goto out;
- }
- ret = cdn_dp_hdcp_tx_respond_id_valid(dp, true);
- if (ret)
- auth_done = true;
- }
-
-out:
- mutex_unlock(&dp->lock);
-
- return auth_done;
-}
-
-static void cdn_dp_hdcp_event_work(struct work_struct *work)
-{
- struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
- hdcp_event_work.work);
- unsigned long timeout = jiffies +
- msecs_to_jiffies(HDCP_EVENT_TIMEOUT_MS);
-
- while (time_before(jiffies, timeout)) {
- if (cdn_dp_hdcp_authorize(dp))
- return;
- msleep(HDCP_RETRY_INTERVAL_MS);
- }
-
- dev_err(dp->dev, "Failed to authorize hdcp\n");
-}
-
static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
@@ -1240,7 +1158,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
struct drm_connector *connector;
struct cdn_dp_port *port;
struct drm_device *drm_dev = data;
- struct drm_mode_config *mode_config;
int ret, i;
ret = cdn_dp_parse_dt(dp);
@@ -1253,7 +1170,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
dp->active_port = -1;
INIT_WORK(&dp->event_work, cdn_dp_pd_event_work);
- INIT_DELAYED_WORK(&dp->hdcp_event_work, cdn_dp_hdcp_event_work);
encoder = &dp->encoder;
@@ -1310,11 +1226,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
schedule_work(&dp->event_work);
- mode_config = &connector->dev->mode_config;
- drm_object_attach_property(&connector->base,
- mode_config->content_protection_property,
- DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
-
return 0;
err_free_connector:
--
2.12.2

20
core/linux-gru/PKGBUILD
View file

@ -7,8 +7,8 @@ pkgbase=linux-gru
_kernelname=${pkgbase#linux}
_desc="Gru Chromebooks"
pkgver=4.4.52
pkgrel=3
_commit=5a4b233ec6c1ca4291b3bcd2372e57b2b932738e
pkgrel=4
_commit=fb0e5f6ed779a218ace2839ef7a34a23830bd30b
arch=('aarch64')
url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4"
license=('GPL2')
@ -18,17 +18,17 @@ source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archiv
'0001-Input-atmel_mxt_ts-Use-KERN_DEBUG-loglevel-for-statu.patch'
'0002-Revert-CHROMIUM-drm-rockchip-Add-PSR-residency-debug.patch'
'0003-temporary-hack-to-fix-console-output.patch'
'0004-Revert-CHROMIUM-drm-rockchip-cdn-dp-add-HDCP-1.4-sup.patch'
'0004-skip-HDCP-setup.patch'
'config'
'kernel.its'
'kernel.keyblock'
'kernel_data_key.vbprivk')
md5sums=('e5459dbcd0197b41d654166ee9966df7'
'a7fc13e2f5b0a3a4252e0d5c41a6ed69'
'65353ad970d088e5d778c8dcf506ee30'
'4c7730ef38df0d5e688e4fb10220489b'
'a2d7572833eebdd2d36ef0f28dabf3e6'
'ac126814e05a91a7456856cd9b1e8733'
md5sums=('6d8a8aa615b78f5794b4028d0ad2c0be'
'84934e2f687a23f3f7160cdfe32bb211'
'39f5a13ccc90bd47e890e0e01a1343ec'
'f27e1cb28474d4882a9daec52d45becd'
'a2e62054e7b21c9055470db6a8c17ae8'
'ec598df9385f8c993e05238ec38e5b1f'
'ded019b1c1e32c53b98e602f46ea1ba0'
'61c5ff73c136ed07a7aadbf58db3d96a'
'584777ae88bce2c5659960151b64c7d8')
@ -37,7 +37,7 @@ prepare() {
git apply 0001-Input-atmel_mxt_ts-Use-KERN_DEBUG-loglevel-for-statu.patch
git apply 0002-Revert-CHROMIUM-drm-rockchip-Add-PSR-residency-debug.patch
git apply 0003-temporary-hack-to-fix-console-output.patch
git apply 0004-Revert-CHROMIUM-drm-rockchip-cdn-dp-add-HDCP-1.4-sup.patch
git apply 0004-skip-HDCP-setup.patch
cp config .config

3
core/linux-gru/config
View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.4.52-3 Kernel Configuration
# Linux/arm64 4.4.52-4 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@ -3510,6 +3510,7 @@ CONFIG_SND_SOC_HDMI_CODEC=y
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC_MAX98090=y
CONFIG_SND_SOC_MAX98357A=y
# CONFIG_SND_SOC_MAX98927 is not set
# CONFIG_SND_SOC_PCM1681 is not set
# CONFIG_SND_SOC_PCM1792A is not set
# CONFIG_SND_SOC_PCM512x_I2C is not set